iommu/arm-smmu: Use accessor functions for iommu private data

Make use of dev_iommu_priv_set/get() functions and simplify the code
where possible with this change.

Signed-off-by: Joerg Roedel <jroedel@suse.de>
Tested-by: Will Deacon <will@kernel.org> # arm-smmu
Link: https://lore.kernel.org/r/20200326150841.10083-12-joro@8bytes.org

diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c
index 3cef2bf..a6a5796 100644 (file)
--- a/drivers/iommu/arm-smmu.c
+++ b/drivers/iommu/arm-smmu.c
@@ -1059,7 +1059,7 @@ static bool arm_smmu_free_sme(struct arm_smmu_device *smmu, int idx)
 static int arm_smmu_master_alloc_smes(struct device *dev)
 {
        struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev);
-       struct arm_smmu_master_cfg *cfg = fwspec->iommu_priv;
+       struct arm_smmu_master_cfg *cfg = dev_iommu_priv_get(dev);
        struct arm_smmu_device *smmu = cfg->smmu;
        struct arm_smmu_smr *smrs = smmu->smrs;
        struct iommu_group *group;
@@ -1159,11 +1159,11 @@ static int arm_smmu_domain_add_master(struct arm_smmu_domain *smmu_domain,
 
 static int arm_smmu_attach_dev(struct iommu_domain *domain, struct device *dev)
 {
-       int ret;
-       struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev);
        struct arm_smmu_domain *smmu_domain = to_smmu_domain(domain);
+       struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev);
        struct arm_smmu_master_cfg *cfg;
        struct arm_smmu_device *smmu;
+       int ret;
 
        if (!fwspec || fwspec->ops != &arm_smmu_ops) {
                dev_err(dev, "cannot attach to SMMU, is it on the same bus?\n");
@@ -1177,7 +1177,7 @@ static int arm_smmu_attach_dev(struct iommu_domain *domain, struct device *dev)
         * domains, just say no (but more politely than by dereferencing NULL).
         * This should be at least a WARN_ON once that's sorted.
         */
-       cfg = fwspec->iommu_priv;
+       cfg = dev_iommu_priv_get(dev);
        if (!cfg)
                return -ENODEV;
 
@@ -1430,7 +1430,7 @@ static int arm_smmu_add_device(struct device *dev)
                goto out_free;
 
        cfg->smmu = smmu;
-       fwspec->iommu_priv = cfg;
+       dev_iommu_priv_set(dev, cfg);
        while (i--)
                cfg->smendx[i] = INVALID_SMENDX;
 
@@ -1468,7 +1468,7 @@ static void arm_smmu_remove_device(struct device *dev)
        if (!fwspec || fwspec->ops != &arm_smmu_ops)
                return;
 
-       cfg  = fwspec->iommu_priv;
+       cfg  = dev_iommu_priv_get(dev);
        smmu = cfg->smmu;
 
        ret = arm_smmu_rpm_get(smmu);
@@ -1480,15 +1480,16 @@ static void arm_smmu_remove_device(struct device *dev)
 
        arm_smmu_rpm_put(smmu);
 
+       dev_iommu_priv_set(dev, NULL);
        iommu_group_remove_device(dev);
-       kfree(fwspec->iommu_priv);
+       kfree(cfg);
        iommu_fwspec_free(dev);
 }
 
 static struct iommu_group *arm_smmu_device_group(struct device *dev)
 {
+       struct arm_smmu_master_cfg *cfg = dev_iommu_priv_get(dev);
        struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev);
-       struct arm_smmu_master_cfg *cfg = fwspec->iommu_priv;
        struct arm_smmu_device *smmu = cfg->smmu;
        struct iommu_group *group = NULL;
        int i, idx;