From: Robin Murphy <robin.murphy-5wv7dgnIgG8@public.gmane.org> To: iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org, devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Cc: Thomas.Lendacky-5C7GfCeVMHo@public.gmane.org, thunder.leizhen-hv44wF8Li93QT0dZR+AlfA@public.gmane.org, will.deacon-5wv7dgnIgG8@public.gmane.org, stuart.yoder-3arQi8VN3Tc@public.gmane.org, Rob Herring <robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>, tchalamarla-M3mlKVOIwJVv6pq1l3V1OdBPR1lH4CV8@public.gmane.org, Frank Rowand <frowand.list-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> Subject: [PATCH 03/12] iommu/of: Handle iommu-map property for PCI Date: Mon, 29 Feb 2016 13:46:12 +0000 [thread overview] Message-ID: <961e88620bc9c113dbafa72081f864517fa1043c.1456514380.git.robin.murphy@arm.com> (raw) In-Reply-To: <cover.1456514380.git.robin.murphy-5wv7dgnIgG8@public.gmane.org> Now that we have a way to pick up the RID translation and target IOMMU, hook up of_iommu_configure() to bring PCI devices into the of_xlate mechanism and allow them IOMMU-backed DMA ops without the need for driver-specific handling. CC: Rob Herring <robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> CC: Frank Rowand <frowand.list-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> Signed-off-by: Robin Murphy <robin.murphy-5wv7dgnIgG8@public.gmane.org> --- drivers/iommu/of_iommu.c | 43 ++++++++++++++++++++++++++++++++++++------- 1 file changed, 36 insertions(+), 7 deletions(-) diff --git a/drivers/iommu/of_iommu.c b/drivers/iommu/of_iommu.c index 5fea665..910826c 100644 --- a/drivers/iommu/of_iommu.c +++ b/drivers/iommu/of_iommu.c @@ -22,6 +22,7 @@ #include <linux/limits.h> #include <linux/of.h> #include <linux/of_iommu.h> +#include <linux/of_pci.h> #include <linux/slab.h> static const struct of_device_id __iommu_of_table_sentinel @@ -134,20 +135,48 @@ struct iommu_ops *of_iommu_get_ops(struct device_node *np) return ops; } +static int __get_pci_rid(struct pci_dev *pdev, u16 alias, void *data) +{ + struct of_phandle_args *iommu_spec = data; + struct device_node *np = pdev->bus->dev.of_node; + + iommu_spec->args[0] = alias; + return np == iommu_spec->np; +} + struct iommu_ops *of_iommu_configure(struct device *dev, struct device_node *master_np) { struct of_phandle_args iommu_spec; - struct device_node *np; + struct device_node *np = NULL; struct iommu_ops *ops = NULL; int idx = 0; - /* - * We can't do much for PCI devices without knowing how - * device IDs are wired up from the PCI bus to the IOMMU. - */ - if (dev_is_pci(dev)) - return NULL; + if (dev_is_pci(dev)) { + /* + * Start by tracing the RID alias down the PCI topology as + * far as the host bridge whose OF node we have... + */ + iommu_spec.np = master_np; + pci_for_each_dma_alias(to_pci_dev(dev), __get_pci_rid, + &iommu_spec); + /* + * ...then find out what that becomes once it escapes the PCI + * bus into the system beyond, and which IOMMU it ends up at. + */ + if (of_pci_map_rid(master_np, "iommu-map", iommu_spec.args[0], + &np, iommu_spec.args)) + return NULL; + + iommu_spec.np = np; + iommu_spec.args_count = 1; + ops = of_iommu_get_ops(np); + if (!ops || !ops->of_xlate || ops->of_xlate(dev, &iommu_spec)) + goto err_put_node; + + of_node_put(np); + return ops; + } /* * We don't currently walk up the tree looking for a parent IOMMU. -- 2.7.2.333.g70bd996.dirty
WARNING: multiple messages have this Message-ID (diff)
From: robin.murphy@arm.com (Robin Murphy) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 03/12] iommu/of: Handle iommu-map property for PCI Date: Mon, 29 Feb 2016 13:46:12 +0000 [thread overview] Message-ID: <961e88620bc9c113dbafa72081f864517fa1043c.1456514380.git.robin.murphy@arm.com> (raw) In-Reply-To: <cover.1456514380.git.robin.murphy@arm.com> Now that we have a way to pick up the RID translation and target IOMMU, hook up of_iommu_configure() to bring PCI devices into the of_xlate mechanism and allow them IOMMU-backed DMA ops without the need for driver-specific handling. CC: Rob Herring <robh+dt@kernel.org> CC: Frank Rowand <frowand.list@gmail.com> Signed-off-by: Robin Murphy <robin.murphy@arm.com> --- drivers/iommu/of_iommu.c | 43 ++++++++++++++++++++++++++++++++++++------- 1 file changed, 36 insertions(+), 7 deletions(-) diff --git a/drivers/iommu/of_iommu.c b/drivers/iommu/of_iommu.c index 5fea665..910826c 100644 --- a/drivers/iommu/of_iommu.c +++ b/drivers/iommu/of_iommu.c @@ -22,6 +22,7 @@ #include <linux/limits.h> #include <linux/of.h> #include <linux/of_iommu.h> +#include <linux/of_pci.h> #include <linux/slab.h> static const struct of_device_id __iommu_of_table_sentinel @@ -134,20 +135,48 @@ struct iommu_ops *of_iommu_get_ops(struct device_node *np) return ops; } +static int __get_pci_rid(struct pci_dev *pdev, u16 alias, void *data) +{ + struct of_phandle_args *iommu_spec = data; + struct device_node *np = pdev->bus->dev.of_node; + + iommu_spec->args[0] = alias; + return np == iommu_spec->np; +} + struct iommu_ops *of_iommu_configure(struct device *dev, struct device_node *master_np) { struct of_phandle_args iommu_spec; - struct device_node *np; + struct device_node *np = NULL; struct iommu_ops *ops = NULL; int idx = 0; - /* - * We can't do much for PCI devices without knowing how - * device IDs are wired up from the PCI bus to the IOMMU. - */ - if (dev_is_pci(dev)) - return NULL; + if (dev_is_pci(dev)) { + /* + * Start by tracing the RID alias down the PCI topology as + * far as the host bridge whose OF node we have... + */ + iommu_spec.np = master_np; + pci_for_each_dma_alias(to_pci_dev(dev), __get_pci_rid, + &iommu_spec); + /* + * ...then find out what that becomes once it escapes the PCI + * bus into the system beyond, and which IOMMU it ends up at. + */ + if (of_pci_map_rid(master_np, "iommu-map", iommu_spec.args[0], + &np, iommu_spec.args)) + return NULL; + + iommu_spec.np = np; + iommu_spec.args_count = 1; + ops = of_iommu_get_ops(np); + if (!ops || !ops->of_xlate || ops->of_xlate(dev, &iommu_spec)) + goto err_put_node; + + of_node_put(np); + return ops; + } /* * We don't currently walk up the tree looking for a parent IOMMU. -- 2.7.2.333.g70bd996.dirty
next prev parent reply other threads:[~2016-02-29 13:46 UTC|newest] Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-02-29 13:46 [PATCH 00/12] Generic DT bindings for PCI and ARM SMMU Robin Murphy 2016-02-29 13:46 ` Robin Murphy [not found] ` <cover.1456514380.git.robin.murphy-5wv7dgnIgG8@public.gmane.org> 2016-02-29 13:46 ` [PATCH 01/12] Docs: dt: add PCI IOMMU map bindings Robin Murphy 2016-02-29 13:46 ` Robin Murphy [not found] ` <5bcbc7c0c8825cb0a2ac216bac0ab99722a84618.1456514380.git.robin.murphy-5wv7dgnIgG8@public.gmane.org> 2016-03-03 22:27 ` Rob Herring 2016-03-03 22:27 ` Rob Herring 2016-02-29 13:46 ` [PATCH 02/12] of/irq: Break out msi-map lookup (again) Robin Murphy 2016-02-29 13:46 ` Robin Murphy 2016-02-29 13:46 ` Robin Murphy [this message] 2016-02-29 13:46 ` [PATCH 03/12] iommu/of: Handle iommu-map property for PCI Robin Murphy 2016-02-29 13:46 ` [PATCH 04/12] arm64/dma-mapping: Extend DMA ops workaround to PCI devices Robin Murphy 2016-02-29 13:46 ` Robin Murphy [not found] ` <ffcca878210c916962c562d3d1341aae93d593d0.1456514380.git.robin.murphy-5wv7dgnIgG8@public.gmane.org> 2016-02-29 16:47 ` Catalin Marinas 2016-02-29 16:47 ` Catalin Marinas 2016-02-29 13:46 ` [PATCH 05/12] arm64/dma-mapping: Remove default domain workaround Robin Murphy 2016-02-29 13:46 ` Robin Murphy [not found] ` <698ecf1450da8b56a8f297b83815d2fe866ca0e1.1456514380.git.robin.murphy-5wv7dgnIgG8@public.gmane.org> 2016-02-29 16:51 ` Catalin Marinas 2016-02-29 16:51 ` Catalin Marinas 2016-02-29 13:46 ` [PATCH 06/12] iommu/arm-smmu: Streamline SMMU data lookup Robin Murphy 2016-02-29 13:46 ` Robin Murphy 2016-02-29 13:46 ` [PATCH 07/12] iommu/arm-smmu: Factor out mmu-masters handling Robin Murphy 2016-02-29 13:46 ` Robin Murphy 2016-02-29 13:46 ` [PATCH 08/12] iommu/arm-smmu: Refactor master/group config handling Robin Murphy 2016-02-29 13:46 ` Robin Murphy 2016-02-29 13:46 ` [PATCH 09/12] iommu/arm-smmu: Simplify mmu-masters handling Robin Murphy 2016-02-29 13:46 ` Robin Murphy 2016-02-29 13:46 ` [PATCH 10/12] Docs: dt: document ARM SMMU generic binding usage Robin Murphy 2016-02-29 13:46 ` Robin Murphy [not found] ` <af1ce6d7d69e340ac839c69b475728f7aa50ff23.1456514380.git.robin.murphy-5wv7dgnIgG8@public.gmane.org> 2016-03-03 22:29 ` Rob Herring 2016-03-03 22:29 ` Rob Herring 2016-02-29 13:46 ` [PATCH 11/12] iommu/arm-smmu: Generic IOMMU DT bindings support Robin Murphy 2016-02-29 13:46 ` Robin Murphy [not found] ` <a3edd4225fe8b39440fb9b6a70a70883d3cb103b.1456514380.git.robin.murphy-5wv7dgnIgG8@public.gmane.org> 2016-02-29 18:09 ` Sricharan 2016-02-29 18:09 ` Sricharan 2016-03-02 13:30 ` Robin Murphy 2016-03-02 13:30 ` Robin Murphy 2016-02-29 13:46 ` [PATCH 12/12] iommu/arm-smmu: Group platform devices appropriately Robin Murphy 2016-02-29 13:46 ` Robin Murphy
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=961e88620bc9c113dbafa72081f864517fa1043c.1456514380.git.robin.murphy@arm.com \ --to=robin.murphy-5wv7dgnigg8@public.gmane.org \ --cc=Thomas.Lendacky-5C7GfCeVMHo@public.gmane.org \ --cc=devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \ --cc=frowand.list-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org \ --cc=iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org \ --cc=linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org \ --cc=robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org \ --cc=stuart.yoder-3arQi8VN3Tc@public.gmane.org \ --cc=tchalamarla-M3mlKVOIwJVv6pq1l3V1OdBPR1lH4CV8@public.gmane.org \ --cc=thunder.leizhen-hv44wF8Li93QT0dZR+AlfA@public.gmane.org \ --cc=will.deacon-5wv7dgnIgG8@public.gmane.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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.