[PATCH v2 03/60][SRU][OEM-5.6] ACPI/IORT: Remove direct access of dev->iommu_fwspec
You-Sheng Yang
vicamo.yang at canonical.com
Tue Jun 2 07:43:24 UTC 2020
From: Joerg Roedel <jroedel at suse.de>
BugLink: https://bugs.launchpad.net/bugs/1876707
Use the accessor functions instead of directly dereferencing
dev->iommu_fwspec.
Signed-off-by: Joerg Roedel <jroedel at suse.de>
Tested-by: Hanjun Guo <guohanjun at huawei.com>
Reviewed-by: Jean-Philippe Brucker <jean-philippe at linaro.org>
Link: https://lore.kernel.org/r/20200326150841.10083-3-joro@8bytes.org
(cherry picked from commit 6990ec796a7470740e6fb108dd30948b1ac9beb9)
Signed-off-by: You-Sheng Yang <vicamo.yang at canonical.com>
---
drivers/acpi/arm64/iort.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/acpi/arm64/iort.c b/drivers/acpi/arm64/iort.c
index ed3d2d1a7ae9..7d04424189df 100644
--- a/drivers/acpi/arm64/iort.c
+++ b/drivers/acpi/arm64/iort.c
@@ -1015,6 +1015,7 @@ const struct iommu_ops *iort_iommu_configure(struct device *dev)
return ops;
if (dev_is_pci(dev)) {
+ struct iommu_fwspec *fwspec;
struct pci_bus *bus = to_pci_dev(dev)->bus;
struct iort_pci_alias_info info = { .dev = dev };
@@ -1027,8 +1028,9 @@ const struct iommu_ops *iort_iommu_configure(struct device *dev)
err = pci_for_each_dma_alias(to_pci_dev(dev),
iort_pci_iommu_init, &info);
- if (!err && iort_pci_rc_supports_ats(node))
- dev->iommu_fwspec->flags |= IOMMU_FWSPEC_PCI_RC_ATS;
+ fwspec = dev_iommu_fwspec_get(dev);
+ if (fwspec && iort_pci_rc_supports_ats(node))
+ fwspec->flags |= IOMMU_FWSPEC_PCI_RC_ATS;
} else {
int i = 0;
--
2.25.1
More information about the kernel-team
mailing list