From: Robin Murphy <robin.murphy-5wv7dgnIgG8@public.gmane.org> To: joro-zLv9SwRftAIdnm+yROfE0A@public.gmane.org, will.deacon-5wv7dgnIgG8@public.gmane.org Cc: iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org, devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org, frowand.list-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org Subject: [PATCH v2 7/7] iommu/arm-smmu: Support non-PCI devices with SMMUv3 Date: Fri, 3 Jun 2016 18:15:42 +0100 [thread overview] Message-ID: <42a8a71932f766d70ea9dcae5d11d5f33dcc3652.1464966939.git.robin.murphy@arm.com> (raw) In-Reply-To: <cover.1464966939.git.robin.murphy-5wv7dgnIgG8@public.gmane.org> With the device <-> stream ID relationship suitably abstracted and of_xlate() hooked up, we no longer have any PCI-specifics in play, so adding support for the simpler kinds of platform device (a single unique stream ID each) becomes trivial; let's do it! Signed-off-by: Robin Murphy <robin.murphy-5wv7dgnIgG8@public.gmane.org> --- v2: New. Consider this one "extra bonus material" as I'm not sure there are even any suitable devices on our model to test it with (it _should_ be OK, given that I know the basic infrastructure on either side works...) drivers/iommu/Kconfig | 2 +- drivers/iommu/arm-smmu-v3.c | 36 ++++++++++++++++++++++++++++++------ 2 files changed, 31 insertions(+), 7 deletions(-) diff --git a/drivers/iommu/Kconfig b/drivers/iommu/Kconfig index ad0860383cb3..d1c66afefeed 100644 --- a/drivers/iommu/Kconfig +++ b/drivers/iommu/Kconfig @@ -308,7 +308,7 @@ config ARM_SMMU config ARM_SMMU_V3 bool "ARM Ltd. System MMU Version 3 (SMMUv3) Support" - depends on ARM64 && PCI + depends on ARM64 select IOMMU_API select IOMMU_IO_PGTABLE_LPAE select GENERIC_MSI_IRQ_DOMAIN diff --git a/drivers/iommu/arm-smmu-v3.c b/drivers/iommu/arm-smmu-v3.c index 28dcc5ca237e..6379f0ab24fc 100644 --- a/drivers/iommu/arm-smmu-v3.c +++ b/drivers/iommu/arm-smmu-v3.c @@ -35,6 +35,8 @@ #include <linux/pci.h> #include <linux/platform_device.h> +#include <linux/amba/bus.h> + #include "io-pgtable.h" /* MMIO registers */ @@ -1773,6 +1775,22 @@ static void arm_smmu_remove_device(struct device *dev) iommu_group_remove_device(dev); } +static struct iommu_group *arm_smmu_device_group(struct device *dev) +{ + struct iommu_group *group; + + /* + * We've currently no means of grouping non-PCI masters, so + * there'd better not be any non-unique stream IDs in the DT... + */ + if (dev_is_pci(dev)) + group = pci_device_group(dev); + else + group = generic_device_group(dev); + + return group; +} + static int arm_smmu_domain_get_attr(struct iommu_domain *domain, enum iommu_attr attr, void *data) { @@ -1821,10 +1839,6 @@ static int arm_smmu_of_xlate(struct device *dev, struct of_phandle_args *args) { struct arm_smmu_master_data *data; - /* We only support PCI, for now */ - if (!dev_is_pci(dev)) - return -ENODEV; - if (dev->archdata.iommu) return -EEXIST; @@ -1855,7 +1869,7 @@ static struct iommu_ops arm_smmu_ops = { .iova_to_phys = arm_smmu_iova_to_phys, .add_device = arm_smmu_add_device, .remove_device = arm_smmu_remove_device, - .device_group = pci_device_group, + .device_group = arm_smmu_device_group, .domain_get_attr = arm_smmu_domain_get_attr, .domain_set_attr = arm_smmu_domain_set_attr, .of_xlate = arm_smmu_of_xlate, @@ -2598,7 +2612,17 @@ static int __init arm_smmu_init(void) if (ret) return ret; - return bus_set_iommu(&pci_bus_type, &arm_smmu_ops); +#ifdef CONFIG_PCI + ret = bus_set_iommu(&pci_bus_type, &arm_smmu_ops); + if (ret) + return ret; +#endif +#ifdef CONFIG_ARM_AMBA + ret = bus_set_iommu(&amba_bustype, &arm_smmu_ops); + if (ret) + return ret; +#endif + return bus_set_iommu(&platform_bus_type, &arm_smmu_ops); } static void __exit arm_smmu_exit(void) -- 2.8.1.dirty -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html
WARNING: multiple messages have this Message-ID (diff)
From: robin.murphy@arm.com (Robin Murphy) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v2 7/7] iommu/arm-smmu: Support non-PCI devices with SMMUv3 Date: Fri, 3 Jun 2016 18:15:42 +0100 [thread overview] Message-ID: <42a8a71932f766d70ea9dcae5d11d5f33dcc3652.1464966939.git.robin.murphy@arm.com> (raw) In-Reply-To: <cover.1464966939.git.robin.murphy@arm.com> With the device <-> stream ID relationship suitably abstracted and of_xlate() hooked up, we no longer have any PCI-specifics in play, so adding support for the simpler kinds of platform device (a single unique stream ID each) becomes trivial; let's do it! Signed-off-by: Robin Murphy <robin.murphy@arm.com> --- v2: New. Consider this one "extra bonus material" as I'm not sure there are even any suitable devices on our model to test it with (it _should_ be OK, given that I know the basic infrastructure on either side works...) drivers/iommu/Kconfig | 2 +- drivers/iommu/arm-smmu-v3.c | 36 ++++++++++++++++++++++++++++++------ 2 files changed, 31 insertions(+), 7 deletions(-) diff --git a/drivers/iommu/Kconfig b/drivers/iommu/Kconfig index ad0860383cb3..d1c66afefeed 100644 --- a/drivers/iommu/Kconfig +++ b/drivers/iommu/Kconfig @@ -308,7 +308,7 @@ config ARM_SMMU config ARM_SMMU_V3 bool "ARM Ltd. System MMU Version 3 (SMMUv3) Support" - depends on ARM64 && PCI + depends on ARM64 select IOMMU_API select IOMMU_IO_PGTABLE_LPAE select GENERIC_MSI_IRQ_DOMAIN diff --git a/drivers/iommu/arm-smmu-v3.c b/drivers/iommu/arm-smmu-v3.c index 28dcc5ca237e..6379f0ab24fc 100644 --- a/drivers/iommu/arm-smmu-v3.c +++ b/drivers/iommu/arm-smmu-v3.c @@ -35,6 +35,8 @@ #include <linux/pci.h> #include <linux/platform_device.h> +#include <linux/amba/bus.h> + #include "io-pgtable.h" /* MMIO registers */ @@ -1773,6 +1775,22 @@ static void arm_smmu_remove_device(struct device *dev) iommu_group_remove_device(dev); } +static struct iommu_group *arm_smmu_device_group(struct device *dev) +{ + struct iommu_group *group; + + /* + * We've currently no means of grouping non-PCI masters, so + * there'd better not be any non-unique stream IDs in the DT... + */ + if (dev_is_pci(dev)) + group = pci_device_group(dev); + else + group = generic_device_group(dev); + + return group; +} + static int arm_smmu_domain_get_attr(struct iommu_domain *domain, enum iommu_attr attr, void *data) { @@ -1821,10 +1839,6 @@ static int arm_smmu_of_xlate(struct device *dev, struct of_phandle_args *args) { struct arm_smmu_master_data *data; - /* We only support PCI, for now */ - if (!dev_is_pci(dev)) - return -ENODEV; - if (dev->archdata.iommu) return -EEXIST; @@ -1855,7 +1869,7 @@ static struct iommu_ops arm_smmu_ops = { .iova_to_phys = arm_smmu_iova_to_phys, .add_device = arm_smmu_add_device, .remove_device = arm_smmu_remove_device, - .device_group = pci_device_group, + .device_group = arm_smmu_device_group, .domain_get_attr = arm_smmu_domain_get_attr, .domain_set_attr = arm_smmu_domain_set_attr, .of_xlate = arm_smmu_of_xlate, @@ -2598,7 +2612,17 @@ static int __init arm_smmu_init(void) if (ret) return ret; - return bus_set_iommu(&pci_bus_type, &arm_smmu_ops); +#ifdef CONFIG_PCI + ret = bus_set_iommu(&pci_bus_type, &arm_smmu_ops); + if (ret) + return ret; +#endif +#ifdef CONFIG_ARM_AMBA + ret = bus_set_iommu(&amba_bustype, &arm_smmu_ops); + if (ret) + return ret; +#endif + return bus_set_iommu(&platform_bus_type, &arm_smmu_ops); } static void __exit arm_smmu_exit(void) -- 2.8.1.dirty
next prev parent reply other threads:[~2016-06-03 17:15 UTC|newest] Thread overview: 58+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-06-03 17:15 [PATCH v2 0/7] Generic DT bindings for PCI IOMMUs and ARM SMMUv3 Robin Murphy 2016-06-03 17:15 ` Robin Murphy [not found] ` <cover.1464966939.git.robin.murphy-5wv7dgnIgG8@public.gmane.org> 2016-06-03 17:15 ` [PATCH v2 1/7] iommu/of: Respect disabled IOMMUs Robin Murphy 2016-06-03 17:15 ` Robin Murphy [not found] ` <aca0b44206c87f6cb75d156a53e08aa968981119.1464966939.git.robin.murphy-5wv7dgnIgG8@public.gmane.org> 2016-06-14 14:11 ` Will Deacon 2016-06-14 14:11 ` Will Deacon [not found] ` <20160614141148.GH19407-5wv7dgnIgG8@public.gmane.org> 2016-06-14 15:04 ` Robin Murphy 2016-06-14 15:04 ` Robin Murphy 2016-06-03 17:15 ` [PATCH v2 2/7] Docs: dt: add PCI IOMMU map bindings Robin Murphy 2016-06-03 17:15 ` Robin Murphy [not found] ` <3a7e47d7b8839ff079568137b5b1b438cfbb44ac.1464966939.git.robin.murphy-5wv7dgnIgG8@public.gmane.org> 2016-06-14 14:16 ` Will Deacon 2016-06-14 14:16 ` Will Deacon 2016-06-03 17:15 ` [PATCH v2 3/7] of/irq: Break out msi-map lookup (again) Robin Murphy 2016-06-03 17:15 ` Robin Murphy [not found] ` <2cbffa9a341edfd10114994f6486f6b08d0c390c.1464966939.git.robin.murphy-5wv7dgnIgG8@public.gmane.org> 2016-06-04 8:10 ` Marc Zyngier 2016-06-04 8:10 ` Marc Zyngier 2016-06-14 14:37 ` Will Deacon 2016-06-14 14:37 ` Will Deacon [not found] ` <20160614143750.GJ19407-5wv7dgnIgG8@public.gmane.org> 2016-06-14 18:12 ` Robin Murphy 2016-06-14 18:12 ` Robin Murphy [not found] ` <5760491E.7060104-5wv7dgnIgG8@public.gmane.org> 2016-06-14 18:20 ` Will Deacon 2016-06-14 18:20 ` Will Deacon 2016-06-14 17:01 ` Rob Herring 2016-06-14 17:01 ` Rob Herring [not found] ` <CAL_JsqJ4km0dH2PxHma9-cPwC20WR0ejn_14UeV0vBWJ+XLBBg-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> 2016-06-15 10:16 ` Robin Murphy 2016-06-15 10:16 ` Robin Murphy 2016-06-03 17:15 ` [PATCH v2 4/7] iommu/of: Handle iommu-map property for PCI Robin Murphy 2016-06-03 17:15 ` Robin Murphy [not found] ` <69952eda726c370ed6e5739bdd2e32cdc4466bfb.1464966939.git.robin.murphy-5wv7dgnIgG8@public.gmane.org> 2016-06-14 14:45 ` Will Deacon 2016-06-14 14:45 ` Will Deacon [not found] ` <20160614144559.GK19407-5wv7dgnIgG8@public.gmane.org> 2016-06-15 11:21 ` Robin Murphy 2016-06-15 11:21 ` Robin Murphy 2016-06-03 17:15 ` [PATCH v2 5/7] iommu/arm-smmu: Implement of_xlate() for SMMUv3 Robin Murphy 2016-06-03 17:15 ` Robin Murphy [not found] ` <55aa94e099f00fd586077c45d4c4fd1c010981d9.1464966939.git.robin.murphy-5wv7dgnIgG8@public.gmane.org> 2016-06-14 15:07 ` Will Deacon 2016-06-14 15:07 ` Will Deacon [not found] ` <20160614150757.GB16531-5wv7dgnIgG8@public.gmane.org> 2016-06-14 16:11 ` Robin Murphy 2016-06-14 16:11 ` Robin Murphy 2016-06-03 17:15 ` [PATCH v2 6/7] iommu/arm-smmu: Finish off SMMUv3 default domain support Robin Murphy 2016-06-03 17:15 ` Robin Murphy [not found] ` <aabcdd814b93b2b6a902b189f6911f929a29b64f.1464966939.git.robin.murphy-5wv7dgnIgG8@public.gmane.org> 2016-06-06 15:47 ` Jean-Philippe Brucker 2016-06-06 15:47 ` Jean-Philippe Brucker [not found] ` <20160606154712.GA9864-lfHAr0XZR/FyySVAYrpuPyZi+YwRKgec@public.gmane.org> 2016-06-06 17:22 ` Robin Murphy 2016-06-06 17:22 ` Robin Murphy 2016-06-14 15:59 ` Will Deacon 2016-06-14 15:59 ` Will Deacon 2016-06-03 17:15 ` Robin Murphy [this message] 2016-06-03 17:15 ` [PATCH v2 7/7] iommu/arm-smmu: Support non-PCI devices with SMMUv3 Robin Murphy [not found] ` <42a8a71932f766d70ea9dcae5d11d5f33dcc3652.1464966939.git.robin.murphy-5wv7dgnIgG8@public.gmane.org> 2016-06-14 15:16 ` Will Deacon 2016-06-14 15:16 ` Will Deacon [not found] ` <20160614151642.GC16531-5wv7dgnIgG8@public.gmane.org> 2016-06-15 1:22 ` Leizhen (ThunderTown) 2016-06-15 1:22 ` Leizhen (ThunderTown) [not found] ` <5760ADC6.8000803-hv44wF8Li93QT0dZR+AlfA@public.gmane.org> 2016-06-17 1:54 ` Leizhen (ThunderTown) 2016-06-17 1:54 ` Leizhen (ThunderTown) [not found] ` <57635843.6000906-hv44wF8Li93QT0dZR+AlfA@public.gmane.org> 2016-06-17 9:14 ` Robin Murphy 2016-06-17 9:14 ` Robin Murphy [not found] ` <5763BF69.7010205-5wv7dgnIgG8@public.gmane.org> 2016-06-21 8:36 ` Leizhen (ThunderTown) 2016-06-21 8:36 ` Leizhen (ThunderTown)
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=42a8a71932f766d70ea9dcae5d11d5f33dcc3652.1464966939.git.robin.murphy@arm.com \ --to=robin.murphy-5wv7dgnigg8@public.gmane.org \ --cc=devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \ --cc=frowand.list-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org \ --cc=iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org \ --cc=joro-zLv9SwRftAIdnm+yROfE0A@public.gmane.org \ --cc=linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org \ --cc=robh+dt-DgEjT+Ai2ygdnm+yROfE0A@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.