Merge tag 'iommu-updates-v4.21' of git://git.kernel.org/pub/scm/linux/kernel/git...

[sfrench/cifs-2.6.git] / drivers / acpi / arm64 / iort.c

diff --git a/drivers/acpi/arm64/iort.c b/drivers/acpi/arm64/iort.c
index 2159ad9bf9ed8721733fdfd8f5ee29098b42850a..fdd90ffceb85cedd8c8a2049d48be97d66ee9a6e 100644 (file)
--- a/drivers/acpi/arm64/iort.c
+++ b/drivers/acpi/arm64/iort.c
@@ -779,7 +779,7 @@ static inline bool iort_iommu_driver_enabled(u8 type)
 static struct acpi_iort_node *iort_get_msi_resv_iommu(struct device *dev)
 {
        struct acpi_iort_node *iommu;
-       struct iommu_fwspec *fwspec = dev->iommu_fwspec;
+       struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev);
 
        iommu = iort_get_iort_node(fwspec->iommu_fwnode);
 
@@ -794,9 +794,10 @@ static struct acpi_iort_node *iort_get_msi_resv_iommu(struct device *dev)
        return NULL;
 }
 
-static inline const struct iommu_ops *iort_fwspec_iommu_ops(
-                               struct iommu_fwspec *fwspec)
+static inline const struct iommu_ops *iort_fwspec_iommu_ops(struct device *dev)
 {
+       struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev);
+
        return (fwspec && fwspec->ops) ? fwspec->ops : NULL;
 }
 
@@ -805,8 +806,8 @@ static inline int iort_add_device_replay(const struct iommu_ops *ops,
 {
        int err = 0;
 
-       if (ops->add_device && dev->bus && !dev->iommu_group)
-               err = ops->add_device(dev);
+       if (dev->bus && !device_iommu_mapped(dev))
+               err = iommu_probe_device(dev);
 
        return err;
 }
@@ -824,6 +825,7 @@ static inline int iort_add_device_replay(const struct iommu_ops *ops,
  */
 int iort_iommu_msi_get_resv_regions(struct device *dev, struct list_head *head)
 {
+       struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev);
        struct acpi_iort_its_group *its;
        struct acpi_iort_node *iommu_node, *its_node = NULL;
        int i, resv = 0;
@@ -841,9 +843,9 @@ int iort_iommu_msi_get_resv_regions(struct device *dev, struct list_head *head)
         * a given PCI or named component may map IDs to.
         */
 
-       for (i = 0; i < dev->iommu_fwspec->num_ids; i++) {
+       for (i = 0; i < fwspec->num_ids; i++) {
                its_node = iort_node_map_id(iommu_node,
-                                       dev->iommu_fwspec->ids[i],
+                                       fwspec->ids[i],
                                        NULL, IORT_MSI_TYPE);
                if (its_node)
                        break;
@@ -874,8 +876,7 @@ int iort_iommu_msi_get_resv_regions(struct device *dev, struct list_head *head)
        return (resv == its->its_count) ? resv : -ENODEV;
 }
 #else
-static inline const struct iommu_ops *iort_fwspec_iommu_ops(
-                               struct iommu_fwspec *fwspec)
+static inline const struct iommu_ops *iort_fwspec_iommu_ops(struct device *dev);
 { return NULL; }
 static inline int iort_add_device_replay(const struct iommu_ops *ops,
                                         struct device *dev)
@@ -1045,7 +1046,7 @@ const struct iommu_ops *iort_iommu_configure(struct device *dev)
         * If we already translated the fwspec there
         * is nothing left to do, return the iommu_ops.
         */
-       ops = iort_fwspec_iommu_ops(dev->iommu_fwspec);
+       ops = iort_fwspec_iommu_ops(dev);
        if (ops)
                return ops;
 
@@ -1084,7 +1085,7 @@ const struct iommu_ops *iort_iommu_configure(struct device *dev)
         * add_device callback for dev, replay it to get things in order.
         */
        if (!err) {
-               ops = iort_fwspec_iommu_ops(dev->iommu_fwspec);
+               ops = iort_fwspec_iommu_ops(dev);
                err = iort_add_device_replay(ops, dev);
        }