From: Robin Murphy <robin.murphy@arm.com>
To: joro@8bytes.org, will@kernel.org
Cc: iommu@lists.linux.dev, jgg@nvidia.com, baolu.lu@linux.intel.com,
linux-kernel@vger.kernel.org
Subject: [PATCH v5 5/7] iommu/arm-smmu: Don't register fwnode for legacy binding
Date: Wed, 11 Oct 2023 19:14:52 +0100 [thread overview]
Message-ID: <3a5cd62dd21ed58f337bb9a389d301054e503dc3.1697047261.git.robin.murphy@arm.com> (raw)
In-Reply-To: <cover.1697047261.git.robin.murphy@arm.com>
When using the legacy binding we bypass the of_xlate mechanism, so avoid
registering the instance fwnodes which act as keys for that. This will
help __iommu_probe_device() to retrieve the registered ops the same way
as for x86 etc. when no fwspec has previously been set up by of_xlate.
Reviewed-by: Jason Gunthorpe <jgg@nvidia.com>
Signed-off-by: Robin Murphy <robin.murphy@arm.com>
---
drivers/iommu/arm/arm-smmu/arm-smmu.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/iommu/arm/arm-smmu/arm-smmu.c b/drivers/iommu/arm/arm-smmu/arm-smmu.c
index d6d1a2a55cc0..4b83a3adacd6 100644
--- a/drivers/iommu/arm/arm-smmu/arm-smmu.c
+++ b/drivers/iommu/arm/arm-smmu/arm-smmu.c
@@ -2161,7 +2161,8 @@ static int arm_smmu_device_probe(struct platform_device *pdev)
return err;
}
- err = iommu_device_register(&smmu->iommu, &arm_smmu_ops, dev);
+ err = iommu_device_register(&smmu->iommu, &arm_smmu_ops,
+ using_legacy_binding ? NULL : dev);
if (err) {
dev_err(dev, "Failed to register iommu\n");
iommu_device_sysfs_remove(&smmu->iommu);
--
2.39.2.101.g768bb238c484.dirty
next prev parent reply other threads:[~2023-10-11 18:15 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-11 18:14 [PATCH v5 0/7] iommu: Retire bus ops Robin Murphy
2023-10-11 18:14 ` [PATCH v5 1/7] iommu: Factor out some helpers Robin Murphy
2023-10-11 23:34 ` Jason Gunthorpe
2023-10-18 23:04 ` Jerry Snitselaar
2023-10-11 18:14 ` [PATCH v5 2/7] iommu: Decouple iommu_present() from bus ops Robin Murphy
2023-10-12 6:05 ` Baolu Lu
2023-10-12 11:40 ` Robin Murphy
2023-10-12 12:37 ` Jason Gunthorpe
2023-10-12 12:57 ` Baolu Lu
2023-10-12 12:58 ` Baolu Lu
2023-10-18 23:05 ` Jerry Snitselaar
2023-10-11 18:14 ` [PATCH v5 3/7] iommu: Validate that devices match domains Robin Murphy
2023-10-18 23:14 ` Jerry Snitselaar
2023-10-24 18:52 ` Jason Gunthorpe
2023-10-25 12:39 ` Robin Murphy
2023-10-25 12:55 ` Jason Gunthorpe
2023-10-25 16:05 ` Robin Murphy
2023-10-25 16:15 ` Jason Gunthorpe
2023-10-11 18:14 ` [PATCH v5 4/7] iommu: Decouple iommu_domain_alloc() from bus ops Robin Murphy
2023-10-11 23:38 ` Jason Gunthorpe
2023-10-18 23:15 ` Jerry Snitselaar
2023-10-11 18:14 ` Robin Murphy [this message]
2023-10-12 12:56 ` [PATCH v5 5/7] iommu/arm-smmu: Don't register fwnode for legacy binding Will Deacon
2023-10-18 23:29 ` Jerry Snitselaar
2023-10-11 18:14 ` [PATCH v5 6/7] iommu: Retire bus ops Robin Murphy
2023-10-18 23:36 ` Jerry Snitselaar
2023-10-11 18:14 ` [PATCH v5 7/7] iommu: Clean up open-coded ownership checks Robin Murphy
2023-10-12 12:57 ` Will Deacon
2023-10-18 23:40 ` Jerry Snitselaar
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=3a5cd62dd21ed58f337bb9a389d301054e503dc3.1697047261.git.robin.murphy@arm.com \
--to=robin.murphy@arm.com \
--cc=baolu.lu@linux.intel.com \
--cc=iommu@lists.linux.dev \
--cc=jgg@nvidia.com \
--cc=joro@8bytes.org \
--cc=linux-kernel@vger.kernel.org \
--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
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