iommu/arm-smmu: Use helper functions to access dev->iommu_fwspec

Use the new helpers dev_iommu_fwspec_get()/set() to access
the dev->iommu_fwspec pointer. This makes it easier to move
that pointer later into another struct.

Cc: Will Deacon <will.deacon@arm.com>
Cc: Robin Murphy <robin.murphy@arm.com>
Acked-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Joerg Roedel <jroedel@suse.de>

diff --git a/drivers/iommu/arm-smmu-v3.c b/drivers/iommu/arm-smmu-v3.c
index 1189c06..ca14797 100644 (file)
--- a/drivers/iommu/arm-smmu-v3.c
+++ b/drivers/iommu/arm-smmu-v3.c
@@ -1696,24 +1696,26 @@ static void arm_smmu_install_ste_for_dev(struct iommu_fwspec *fwspec)
 
 static void arm_smmu_detach_dev(struct device *dev)
 {
 
 static void arm_smmu_detach_dev(struct device *dev)
 {

-       struct arm_smmu_master_data *master = dev->iommu_fwspec->iommu_priv;
+       struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev);
+       struct arm_smmu_master_data *master = fwspec->iommu_priv;

 
        master->ste.assigned = false;
 
        master->ste.assigned = false;

-       arm_smmu_install_ste_for_dev(dev->iommu_fwspec);
+       arm_smmu_install_ste_for_dev(fwspec);

 }
 
 static int arm_smmu_attach_dev(struct iommu_domain *domain, struct device *dev)
 {
        int ret = 0;
 }
 
 static int arm_smmu_attach_dev(struct iommu_domain *domain, struct device *dev)
 {
        int ret = 0;

+       struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev);

        struct arm_smmu_device *smmu;
        struct arm_smmu_domain *smmu_domain = to_smmu_domain(domain);
        struct arm_smmu_master_data *master;
        struct arm_smmu_strtab_ent *ste;
 
        struct arm_smmu_device *smmu;
        struct arm_smmu_domain *smmu_domain = to_smmu_domain(domain);
        struct arm_smmu_master_data *master;
        struct arm_smmu_strtab_ent *ste;
 

-       if (!dev->iommu_fwspec)
+       if (!fwspec)

                return -ENOENT;
 
                return -ENOENT;
 

-       master = dev->iommu_fwspec->iommu_priv;
+       master = fwspec->iommu_priv;

        smmu = master->smmu;
        ste = &master->ste;
 
        smmu = master->smmu;
        ste = &master->ste;
 


@@ -1753,7 +1755,7 @@ static int arm_smmu_attach_dev(struct iommu_domain *domain, struct device *dev)
                ste->s2_cfg = &smmu_domain->s2_cfg;
        }
 
                ste->s2_cfg = &smmu_domain->s2_cfg;
        }
 

-       arm_smmu_install_ste_for_dev(dev->iommu_fwspec);
+       arm_smmu_install_ste_for_dev(fwspec);

 out_unlock:
        mutex_unlock(&smmu_domain->init_mutex);
        return ret;
 out_unlock:
        mutex_unlock(&smmu_domain->init_mutex);
        return ret;


@@ -1844,7 +1846,7 @@ static int arm_smmu_add_device(struct device *dev)
        int i, ret;
        struct arm_smmu_device *smmu;
        struct arm_smmu_master_data *master;
        int i, ret;
        struct arm_smmu_device *smmu;
        struct arm_smmu_master_data *master;

-       struct iommu_fwspec *fwspec = dev->iommu_fwspec;
+       struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev);

        struct iommu_group *group;
 
        if (!fwspec || fwspec->ops != &arm_smmu_ops)
        struct iommu_group *group;
 
        if (!fwspec || fwspec->ops != &arm_smmu_ops)


@@ -1895,7 +1897,7 @@ static int arm_smmu_add_device(struct device *dev)
 
 static void arm_smmu_remove_device(struct device *dev)
 {
 
 static void arm_smmu_remove_device(struct device *dev)
 {

-       struct iommu_fwspec *fwspec = dev->iommu_fwspec;
+       struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev);

        struct arm_smmu_master_data *master;
        struct arm_smmu_device *smmu;
 
        struct arm_smmu_master_data *master;
        struct arm_smmu_device *smmu;
 

diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c
index 4a2e143..44bff7d 100644 (file)
--- a/drivers/iommu/arm-smmu.c
+++ b/drivers/iommu/arm-smmu.c
@@ -1108,7 +1108,7 @@ static bool arm_smmu_free_sme(struct arm_smmu_device *smmu, int idx)
 
 static int arm_smmu_master_alloc_smes(struct device *dev)
 {
 
 static int arm_smmu_master_alloc_smes(struct device *dev)
 {

-       struct iommu_fwspec *fwspec = dev->iommu_fwspec;
+       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 arm_smmu_smr *smrs = smmu->smrs;
        struct arm_smmu_master_cfg *cfg = fwspec->iommu_priv;
        struct arm_smmu_device *smmu = cfg->smmu;
        struct arm_smmu_smr *smrs = smmu->smrs;


@@ -1211,7 +1211,7 @@ 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;
 static int arm_smmu_attach_dev(struct iommu_domain *domain, struct device *dev)
 {
        int ret;

-       struct iommu_fwspec *fwspec = dev->iommu_fwspec;
+       struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev);

        struct arm_smmu_device *smmu;
        struct arm_smmu_domain *smmu_domain = to_smmu_domain(domain);
 
        struct arm_smmu_device *smmu;
        struct arm_smmu_domain *smmu_domain = to_smmu_domain(domain);
 


@@ -1385,7 +1385,7 @@ static int arm_smmu_add_device(struct device *dev)
 {
        struct arm_smmu_device *smmu;
        struct arm_smmu_master_cfg *cfg;
 {
        struct arm_smmu_device *smmu;
        struct arm_smmu_master_cfg *cfg;

-       struct iommu_fwspec *fwspec = dev->iommu_fwspec;
+       struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev);

        int i, ret;
 
        if (using_legacy_binding) {
        int i, ret;
 
        if (using_legacy_binding) {


@@ -1396,7 +1396,7 @@ static int arm_smmu_add_device(struct device *dev)
                 * will allocate/initialise a new one. Thus we need to update fwspec for
                 * later use.
                 */
                 * will allocate/initialise a new one. Thus we need to update fwspec for
                 * later use.
                 */

-               fwspec = dev->iommu_fwspec;
+               fwspec = dev_iommu_fwspec_get(dev);

                if (ret)
                        goto out_free;
        } else if (fwspec && fwspec->ops == &arm_smmu_ops) {
                if (ret)
                        goto out_free;
        } else if (fwspec && fwspec->ops == &arm_smmu_ops) {


@@ -1450,7 +1450,7 @@ out_free:
 
 static void arm_smmu_remove_device(struct device *dev)
 {
 
 static void arm_smmu_remove_device(struct device *dev)
 {

-       struct iommu_fwspec *fwspec = dev->iommu_fwspec;
+       struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev);

        struct arm_smmu_master_cfg *cfg;
        struct arm_smmu_device *smmu;
 
        struct arm_smmu_master_cfg *cfg;
        struct arm_smmu_device *smmu;
 


@@ -1470,7 +1470,7 @@ static void arm_smmu_remove_device(struct device *dev)
 
 static struct iommu_group *arm_smmu_device_group(struct device *dev)
 {
 
 static struct iommu_group *arm_smmu_device_group(struct device *dev)
 {

-       struct iommu_fwspec *fwspec = dev->iommu_fwspec;
+       struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev);

        struct arm_smmu_device *smmu = fwspec_smmu(fwspec);
        struct iommu_group *group = NULL;
        int i, idx;
        struct arm_smmu_device *smmu = fwspec_smmu(fwspec);
        struct iommu_group *group = NULL;
        int i, idx;