From: Bjorn Helgaas <helgaas@kernel.org> To: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> Cc: devicetree@vger.kernel.org, Sudeep Holla <sudeep.holla@arm.com>, Catalin Marinas <catalin.marinas@arm.com>, Will Deacon <will@kernel.org>, "Rafael J. Wysocki" <rjw@rjwysocki.net>, Marc Zyngier <maz@kernel.org>, Hanjun Guo <guohanjun@huawei.com>, linux-pci@vger.kernel.org, Makarand Pawagi <makarand.pawagi@nxp.com>, linux-acpi@vger.kernel.org, iommu@lists.linux-foundation.org, Rob Herring <robh+dt@kernel.org>, Diana Craciun <diana.craciun@oss.nxp.com>, Bjorn Helgaas <bhelgaas@google.com>, Robin Murphy <robin.murphy@arm.com>, linux-arm-kernel@lists.infradead.org Subject: Re: [PATCH 08/12] of/irq: make of_msi_map_get_device_domain() bus agnostic Date: Thu, 21 May 2020 14:57:15 -0500 Message-ID: <20200521195715.GA1171267@bjorn-Precision-5520> (raw) In-Reply-To: <20200521130008.8266-9-lorenzo.pieralisi@arm.com> On Thu, May 21, 2020 at 02:00:04PM +0100, Lorenzo Pieralisi wrote: > From: Diana Craciun <diana.craciun@oss.nxp.com> > > of_msi_map_get_device_domain() is PCI specific but it need not be and > can be easily changed to be bus agnostic in order to be used by other > busses by adding an IRQ domain bus token as an input parameter. > > Signed-off-by: Diana Craciun <diana.craciun@oss.nxp.com> > Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> > Cc: Bjorn Helgaas <bhelgaas@google.com> > Cc: Rob Herring <robh+dt@kernel.org> > Cc: Marc Zyngier <maz@kernel.org> Acked-by: Bjorn Helgaas <bhelgaas@google.com> # pci/msi.c > --- > drivers/of/irq.c | 8 +++++--- > drivers/pci/msi.c | 2 +- > include/linux/of_irq.h | 5 +++-- > 3 files changed, 9 insertions(+), 6 deletions(-) > > diff --git a/drivers/of/irq.c b/drivers/of/irq.c > index a296eaf52a5b..48a40326984f 100644 > --- a/drivers/of/irq.c > +++ b/drivers/of/irq.c > @@ -613,18 +613,20 @@ u32 of_msi_map_rid(struct device *dev, struct device_node *msi_np, u32 rid_in) > * of_msi_map_get_device_domain - Use msi-map to find the relevant MSI domain > * @dev: device for which the mapping is to be done. > * @rid: Requester ID for the device. > + * @bus_token: Bus token > * > * Walk up the device hierarchy looking for devices with a "msi-map" > * property. > * > * Returns: the MSI domain for this device (or NULL on failure) > */ > -struct irq_domain *of_msi_map_get_device_domain(struct device *dev, u32 rid) > +struct irq_domain *of_msi_map_get_device_domain(struct device *dev, u32 id, > + u32 bus_token) > { > struct device_node *np = NULL; > > - __of_msi_map_rid(dev, &np, rid); > - return irq_find_matching_host(np, DOMAIN_BUS_PCI_MSI); > + __of_msi_map_rid(dev, &np, id); > + return irq_find_matching_host(np, bus_token); > } > > /** > diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c > index 74a91f52ecc0..9532e1d12d3f 100644 > --- a/drivers/pci/msi.c > +++ b/drivers/pci/msi.c > @@ -1556,7 +1556,7 @@ struct irq_domain *pci_msi_get_device_domain(struct pci_dev *pdev) > u32 rid = pci_dev_id(pdev); > > pci_for_each_dma_alias(pdev, get_msi_id_cb, &rid); > - dom = of_msi_map_get_device_domain(&pdev->dev, rid); > + dom = of_msi_map_get_device_domain(&pdev->dev, rid, DOMAIN_BUS_PCI_MSI); > if (!dom) > dom = iort_get_device_domain(&pdev->dev, rid, > DOMAIN_BUS_PCI_MSI); > diff --git a/include/linux/of_irq.h b/include/linux/of_irq.h > index 1214cabb2247..7142a3722758 100644 > --- a/include/linux/of_irq.h > +++ b/include/linux/of_irq.h > @@ -52,7 +52,8 @@ extern struct irq_domain *of_msi_get_domain(struct device *dev, > struct device_node *np, > enum irq_domain_bus_token token); > extern struct irq_domain *of_msi_map_get_device_domain(struct device *dev, > - u32 rid); > + u32 id, > + u32 bus_token); > extern void of_msi_configure(struct device *dev, struct device_node *np); > u32 of_msi_map_rid(struct device *dev, struct device_node *msi_np, u32 rid_in); > #else > @@ -85,7 +86,7 @@ static inline struct irq_domain *of_msi_get_domain(struct device *dev, > return NULL; > } > static inline struct irq_domain *of_msi_map_get_device_domain(struct device *dev, > - u32 rid) > + u32 id, u32 bus_token) > { > return NULL; > } > -- > 2.26.1 > _______________________________________________ iommu mailing list iommu@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/iommu
next prev parent reply index Thread overview: 82+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-05-21 12:59 [PATCH 00/12] ACPI/OF: Upgrade MSI/IOMMU ID mapping APIs Lorenzo Pieralisi 2020-05-21 12:59 ` [PATCH 01/12] ACPI/IORT: Make iort_match_node_callback walk the ACPI namespace for NC Lorenzo Pieralisi 2020-05-21 12:59 ` [PATCH 02/12] ACPI/IORT: Make iort_get_device_domain IRQ domain agnostic Lorenzo Pieralisi 2020-05-21 19:56 ` Bjorn Helgaas 2020-05-21 12:59 ` [PATCH 03/12] ACPI/IORT: Make iort_msi_map_rid() PCI agnostic Lorenzo Pieralisi 2020-05-21 13:00 ` [PATCH 04/12] ACPI/IORT: Remove useless PCI bus walk Lorenzo Pieralisi 2020-05-21 13:00 ` [PATCH 05/12] ACPI/IORT: Add an input ID to acpi_dma_configure() Lorenzo Pieralisi 2020-05-21 13:00 ` [PATCH 06/12] of/iommu: Make of_map_rid() PCI agnostic Lorenzo Pieralisi 2020-05-21 22:47 ` Rob Herring 2020-06-04 14:27 ` Lorenzo Pieralisi 2020-05-21 13:00 ` [PATCH 07/12] of/device: Add input id to of_dma_configure() Lorenzo Pieralisi 2020-05-21 23:02 ` Rob Herring 2020-06-04 14:49 ` Lorenzo Pieralisi 2020-05-21 13:00 ` [PATCH 08/12] of/irq: make of_msi_map_get_device_domain() bus agnostic Lorenzo Pieralisi 2020-05-21 19:57 ` Bjorn Helgaas [this message] 2020-05-21 13:00 ` [PATCH 09/12] dt-bindings: arm: fsl: Add msi-map device-tree binding for fsl-mc bus Lorenzo Pieralisi 2020-05-21 23:10 ` Rob Herring 2020-05-22 9:42 ` Robin Murphy 2020-05-22 9:57 ` Diana Craciun OSS 2020-05-22 14:08 ` Rob Herring 2020-05-22 14:34 ` Robin Murphy 2020-05-22 14:02 ` Rob Herring 2020-05-22 15:38 ` Laurentiu Tudor 2020-05-21 13:00 ` [PATCH 10/12] of/irq: Make of_msi_map_rid() PCI bus agnostic Lorenzo Pieralisi 2020-05-21 23:17 ` Rob Herring 2020-06-04 15:08 ` Lorenzo Pieralisi 2020-05-21 13:00 ` [PATCH 11/12] bus/fsl-mc: Refactor the MSI domain creation in the DPRC driver Lorenzo Pieralisi 2020-05-21 13:00 ` [PATCH 12/12] bus: fsl-mc: Add ACPI support for fsl-mc Lorenzo Pieralisi 2020-05-21 15:03 ` Laurentiu Tudor 2020-05-22 5:32 ` Makarand Pawagi 2020-05-22 9:53 ` Lorenzo Pieralisi 2020-06-19 8:20 ` [PATCH v2 00/12] ACPI/OF: Upgrade MSI/IOMMU ID mapping APIs Lorenzo Pieralisi 2020-06-19 8:20 ` [PATCH v2 01/12] ACPI/IORT: Make iort_match_node_callback walk the ACPI namespace for NC Lorenzo Pieralisi 2020-06-29 4:24 ` Hanjun Guo 2020-06-29 9:05 ` Lorenzo Pieralisi 2020-06-30 3:06 ` Hanjun Guo 2020-06-30 10:24 ` Lorenzo Pieralisi 2020-06-30 13:04 ` Hanjun Guo 2020-07-01 16:12 ` Robin Murphy 2020-07-02 8:22 ` Hanjun Guo 2020-07-09 9:21 ` Lorenzo Pieralisi 2020-07-09 12:48 ` Hanjun Guo 2020-08-18 0:49 ` Hanjun Guo 2020-06-19 8:20 ` [PATCH v2 02/12] ACPI/IORT: Make iort_get_device_domain IRQ domain agnostic Lorenzo Pieralisi 2020-06-19 8:20 ` [PATCH v2 03/12] ACPI/IORT: Make iort_msi_map_rid() PCI agnostic Lorenzo Pieralisi 2020-07-15 9:15 ` Lorenzo Pieralisi 2020-07-21 14:59 ` Bjorn Helgaas 2020-07-27 6:06 ` [EXT] " Makarand Pawagi 2020-06-19 8:20 ` [PATCH v2 04/12] ACPI/IORT: Remove useless PCI bus walk Lorenzo Pieralisi 2020-06-19 8:20 ` [PATCH v2 05/12] ACPI/IORT: Add an input ID to acpi_dma_configure() Lorenzo Pieralisi 2020-07-09 9:35 ` Lorenzo Pieralisi 2020-07-15 9:13 ` Lorenzo Pieralisi 2020-07-28 12:48 ` Lorenzo Pieralisi 2020-07-28 13:00 ` Rafael J. Wysocki 2020-06-19 8:20 ` [PATCH v2 06/12] of/iommu: Make of_map_rid() PCI agnostic Lorenzo Pieralisi 2020-06-22 13:26 ` Joerg Roedel 2020-07-13 23:57 ` Rob Herring 2020-06-19 8:20 ` [PATCH v2 07/12] of/device: Add input id to of_dma_configure() Lorenzo Pieralisi 2020-06-30 21:50 ` Rob Herring 2020-06-19 8:20 ` [PATCH v2 08/12] dt-bindings: arm: fsl: Add msi-map device-tree binding for fsl-mc bus Lorenzo Pieralisi 2020-06-30 21:55 ` Rob Herring 2020-06-19 8:20 ` [PATCH v2 09/12] of/irq: make of_msi_map_get_device_domain() bus agnostic Lorenzo Pieralisi 2020-06-30 21:50 ` Rob Herring 2020-06-19 8:20 ` [PATCH v2 10/12] of/irq: Make of_msi_map_rid() PCI " Lorenzo Pieralisi 2020-06-30 21:56 ` Rob Herring 2020-06-19 8:20 ` [PATCH v2 11/12] bus/fsl-mc: Refactor the MSI domain creation in the DPRC driver Lorenzo Pieralisi 2020-07-15 13:05 ` Marc Zyngier 2020-06-19 8:20 ` [PATCH v2 12/12] bus: fsl-mc: Add ACPI support for fsl-mc Lorenzo Pieralisi 2020-07-01 16:55 ` Laurentiu Tudor 2020-07-09 9:19 ` Lorenzo Pieralisi 2020-07-09 9:26 ` [EXT] " Makarand Pawagi 2020-07-09 10:14 ` Laurentiu Tudor 2020-07-09 10:37 ` Makarand Pawagi 2020-07-09 10:39 ` Laurentiu Tudor 2020-07-09 10:47 ` Diana Craciun OSS 2020-07-09 10:52 ` Makarand Pawagi 2020-07-15 10:06 ` Lorenzo Pieralisi 2020-07-16 3:23 ` Makarand Pawagi 2020-07-16 7:57 ` Marc Zyngier 2020-07-20 16:54 ` [PATCH v2 00/12] ACPI/OF: Upgrade MSI/IOMMU ID mapping APIs Lorenzo Pieralisi 2020-07-21 4:28 ` [EXT] " Makarand Pawagi 2020-07-28 17:01 ` Catalin Marinas
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20200521195715.GA1171267@bjorn-Precision-5520 \ --to=helgaas@kernel.org \ --cc=bhelgaas@google.com \ --cc=catalin.marinas@arm.com \ --cc=devicetree@vger.kernel.org \ --cc=diana.craciun@oss.nxp.com \ --cc=guohanjun@huawei.com \ --cc=iommu@lists.linux-foundation.org \ --cc=linux-acpi@vger.kernel.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-pci@vger.kernel.org \ --cc=lorenzo.pieralisi@arm.com \ --cc=makarand.pawagi@nxp.com \ --cc=maz@kernel.org \ --cc=rjw@rjwysocki.net \ --cc=robh+dt@kernel.org \ --cc=robin.murphy@arm.com \ --cc=sudeep.holla@arm.com \ --cc=will@kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
IOMMU Archive on lore.kernel.org Archives are clonable: git clone --mirror https://lore.kernel.org/linux-iommu/0 linux-iommu/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 linux-iommu linux-iommu/ https://lore.kernel.org/linux-iommu \ iommu@lists.linux-foundation.org public-inbox-index linux-iommu Example config snippet for mirrors Newsgroup available over NNTP: nntp://nntp.lore.kernel.org/org.linux-foundation.lists.iommu AGPL code for this site: git clone https://public-inbox.org/public-inbox.git