iommu/fsl_pamu: remove the snoop_id field

The snoop_id is always set to ~(u32)0.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Acked-by: Will Deacon <will@kernel.org>
Acked-by: Li Yang <leoyang.li@nxp.com>
Link: https://lore.kernel.org/r/20210401155256.298656-12-hch@lst.de
Signed-off-by: Joerg Roedel <jroedel@suse.de>

diff --git a/drivers/iommu/fsl_pamu_domain.c b/drivers/iommu/fsl_pamu_domain.c
index c2e7e17..e9c1e0d 100644 (file)
--- a/drivers/iommu/fsl_pamu_domain.c
+++ b/drivers/iommu/fsl_pamu_domain.c
@@ -97,12 +97,12 @@ static int pamu_set_liodn(struct fsl_dma_domain *dma_domain, struct device *dev,
                goto out_unlock;
        ret = pamu_config_ppaace(liodn, geom->aperture_start,
                                 geom->aperture_end + 1, omi_index, 0,
-                                dma_domain->snoop_id, dma_domain->stash_id, 0);
+                                ~(u32)0, dma_domain->stash_id, 0);
        if (ret)
                goto out_unlock;
        ret = pamu_config_ppaace(liodn, geom->aperture_start,
                                 geom->aperture_end + 1, ~(u32)0,
-                                0, dma_domain->snoop_id, dma_domain->stash_id,
+                                0, ~(u32)0, dma_domain->stash_id,
                                 PAACE_AP_PERMS_QUERY | PAACE_AP_PERMS_UPDATE);
 out_unlock:
        spin_unlock_irqrestore(&iommu_lock, flags);
@@ -210,7 +210,6 @@ static struct iommu_domain *fsl_pamu_domain_alloc(unsigned type)
                return NULL;
 
        dma_domain->stash_id = ~(u32)0;
-       dma_domain->snoop_id = ~(u32)0;
        INIT_LIST_HEAD(&dma_domain->devices);
        spin_lock_init(&dma_domain->domain_lock);
 

diff --git a/drivers/iommu/fsl_pamu_domain.h b/drivers/iommu/fsl_pamu_domain.h
index 5f4ed25..95ac1b3 100644 (file)
--- a/drivers/iommu/fsl_pamu_domain.h
+++ b/drivers/iommu/fsl_pamu_domain.h
@@ -13,7 +13,6 @@ struct fsl_dma_domain {
        /* list of devices associated with the domain */
        struct list_head                devices;
        u32                             stash_id;
-       u32                             snoop_id;
        struct iommu_domain             iommu_domain;
        spinlock_t                      domain_lock;
 };