From: will.deacon@arm•com (Will Deacon)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH v2 7/7] iommu/arm-smmu: Support non-PCI devices with SMMUv3
Date: Tue, 14 Jun 2016 16:16:42 +0100 [thread overview]
Message-ID: <20160614151642.GC16531@arm.com> (raw)
In-Reply-To: <42a8a71932f766d70ea9dcae5d11d5f33dcc3652.1464966939.git.robin.murphy@arm.com>
[adding ThunderTown, since he might be able to test this for us]
On Fri, Jun 03, 2016 at 06:15:42PM +0100, Robin Murphy wrote:
> 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...
> + */
Worse: what if a SID in the DT aliases with a PCI master? It might be
nice to have some basic snity checking, at least.
Will
next prev parent reply other threads:[~2016-06-14 15:16 UTC|newest]
Thread overview: 29+ 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 ` [PATCH v2 1/7] iommu/of: Respect disabled IOMMUs Robin Murphy
2016-06-14 14:11 ` Will Deacon
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-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-04 8:10 ` Marc Zyngier
2016-06-14 14:37 ` Will Deacon
2016-06-14 18:12 ` Robin Murphy
2016-06-14 18:20 ` Will Deacon
2016-06-14 17:01 ` Rob Herring
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-14 14:45 ` Will Deacon
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-14 15:07 ` Will Deacon
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-06 15:47 ` Jean-Philippe Brucker
2016-06-06 17:22 ` Robin Murphy
2016-06-14 15:59 ` Will Deacon
2016-06-03 17:15 ` [PATCH v2 7/7] iommu/arm-smmu: Support non-PCI devices with SMMUv3 Robin Murphy
2016-06-14 15:16 ` Will Deacon [this message]
2016-06-15 1:22 ` Leizhen (ThunderTown)
2016-06-17 1:54 ` Leizhen (ThunderTown)
2016-06-17 9:14 ` Robin Murphy
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=20160614151642.GC16531@arm.com \
--to=will.deacon@arm$(echo .)com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox