[PATCH 12/37] iommu/of: Add stall and pasid properties to iommu_fwspec

[Jean-Philippe Brucker]

Add stall and pasid properties to iommu_fwspec, and fill them when
dma-can-stall and pasid-bits properties are present in the device tree.

Signed-off-by: Jean-Philippe Brucker <jean-philippe.bruc...@arm.com>
---
 drivers/iommu/of_iommu.c | 12 ++++++++++++
 include/linux/iommu.h    |  2 ++
 2 files changed, 14 insertions(+)

diff --git a/drivers/iommu/of_iommu.c b/drivers/iommu/of_iommu.c
index 5c36a8b7656a..98158fc061ca 100644
--- a/drivers/iommu/of_iommu.c
+++ b/drivers/iommu/of_iommu.c
@@ -204,6 +204,18 @@ const struct iommu_ops *of_iommu_configure(struct device 
*dev,
                        if (err)
                                break;
                }
+
+               fwspec = dev->iommu_fwspec;
+               if (!err && fwspec) {
+                       const __be32 *prop;
+
+                       if (of_get_property(master_np, "dma-can-stall", NULL))
+                               fwspec->can_stall = true;
+
+                       prop = of_get_property(master_np, "pasid-bits", NULL);
+                       if (prop)
+                               fwspec->num_pasid_bits = be32_to_cpu(*prop);
+               }
        }
 
        /*
diff --git a/include/linux/iommu.h b/include/linux/iommu.h
index 36fcb579f5ed..37c3b9d087ce 100644
--- a/include/linux/iommu.h
+++ b/include/linux/iommu.h
@@ -632,6 +632,8 @@ struct iommu_fwspec {
        struct fwnode_handle    *iommu_fwnode;
        void                    *iommu_priv;
        unsigned int            num_ids;
+       unsigned int            num_pasid_bits;
+       bool                    can_stall;
        u32                     ids[1];
 };
 
-- 
2.15.1

_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu