From: will.deacon@arm•com (Will Deacon)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH v2 5/7] iommu/arm-smmu: Implement of_xlate() for SMMUv3
Date: Tue, 14 Jun 2016 16:07:59 +0100 [thread overview]
Message-ID: <20160614150757.GB16531@arm.com> (raw)
In-Reply-To: <55aa94e099f00fd586077c45d4c4fd1c010981d9.1464966939.git.robin.murphy@arm.com>
On Fri, Jun 03, 2016 at 06:15:40PM +0100, Robin Murphy wrote:
> Now that we can properly describe the mapping between PCI RIDs and
> stream IDs via "iommu-map", and have it fed it to the driver
> automatically via of_xlate(), rework the SMMUv3 driver to benefit from
> that. Initially, this just gets rid of the misuse of the "iommus"
> binding without changing the driver's existing level of functionality,
> but does at least pave the way to extending it more easily in future.
>
> Signed-off-by: Robin Murphy <robin.murphy@arm•com>
> ---
>
> v2: New.
>
> drivers/iommu/arm-smmu-v3.c | 119 +++++++++++++++++++++++++++-----------------
> 1 file changed, 73 insertions(+), 46 deletions(-)
>
> diff --git a/drivers/iommu/arm-smmu-v3.c b/drivers/iommu/arm-smmu-v3.c
> index 94b68213c50d..7631639cc209 100644
> --- a/drivers/iommu/arm-smmu-v3.c
> +++ b/drivers/iommu/arm-smmu-v3.c
> @@ -30,6 +30,7 @@
> #include <linux/msi.h>
> #include <linux/of.h>
> #include <linux/of_address.h>
> +#include <linux/of_iommu.h>
> #include <linux/of_platform.h>
> #include <linux/pci.h>
> #include <linux/platform_device.h>
> @@ -638,6 +639,12 @@ struct arm_smmu_domain {
> struct iommu_domain domain;
> };
>
> +/* SMMU private data for each master */
> +struct arm_smmu_master_data {
> + struct arm_smmu_device *smmu;
> + u32 sid;
> +};
Hmm, we already have this information in arm_smmu_group so I'd rather
avoid the duplication if we can.
> @@ -1804,23 +1790,41 @@ static int arm_smmu_add_device(struct device *dev)
> {
> int i, ret;
> u32 sid, *sids;
> - struct pci_dev *pdev;
> struct iommu_group *group;
> + struct device_node *np;
> struct arm_smmu_group *smmu_group;
> - struct arm_smmu_device *smmu;
> + struct arm_smmu_device *smmu = NULL;
> + struct arm_smmu_master_data *data = dev->archdata.iommu;
>
> - /* We only support PCI, for now */
> - if (!dev_is_pci(dev))
> + if (!data)
> return -ENODEV;
>
> - pdev = to_pci_dev(dev);
> + np = (struct device_node *)data->smmu;
> + smmu = data->smmu = arm_smmu_get_by_node(np);
> + of_node_put(np);
> + if (!smmu)
> + return -ENODEV;
Why can't we continue to use the group here?
Will
next prev parent reply other threads:[~2016-06-14 15:07 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 [this message]
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
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=20160614150757.GB16531@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