On Tue, Mar 16, 2021 at 04:38:14PM +0100, Christoph Hellwig wrote:

Merge the two fuctions that configure the ppaace into a single coherent function. I somehow doubt we need the two pamu_config_ppaace calls, but keep the existing behavior just to be on the safe side.

Signed-off-by: Christoph Hellwig hch@lst.de Acked-by: Li Yang leoyang.li@nxp.com

---

drivers/iommu/fsl_pamu_domain.c | 65 +++++++++------------------------ 1 file changed, 17 insertions(+), 48 deletions(-)

diff --git a/drivers/iommu/fsl_pamu_domain.c b/drivers/iommu/fsl_pamu_domain.c index 40eff4b7bc5d42..4a4944332674f7 100644 --- a/drivers/iommu/fsl_pamu_domain.c +++ b/drivers/iommu/fsl_pamu_domain.c @@ -54,25 +54,6 @@ static int __init iommu_init_mempool(void) return 0; }

-/* Map the DMA window corresponding to the LIODN */ -static int map_liodn(int liodn, struct fsl_dma_domain *dma_domain) -{

• int ret;
• struct iommu_domain_geometry *geom = &dma_domain->iommu_domain.geometry;
• unsigned long flags;
• spin_lock_irqsave(&iommu_lock, flags);
• ret = pamu_config_ppaace(liodn, geom->aperture_start,

• 		 geom->aperture_end - 1, ~(u32)0,
  

• 		 0, dma_domain->snoop_id, dma_domain->stash_id,
  

• 		 PAACE_AP_PERMS_QUERY | PAACE_AP_PERMS_UPDATE);
  

• spin_unlock_irqrestore(&iommu_lock, flags);
• if (ret)

• pr_debug("PAACE configuration failed for liodn %d\n", liodn);
  

• return ret;

-}

static int update_liodn_stash(int liodn, struct fsl_dma_domain *dma_domain, u32 val) { @@ -94,11 +75,11 @@ static int update_liodn_stash(int liodn, struct fsl_dma_domain *dma_domain, }

/* Set the geometry parameters for a LIODN */ -static int pamu_set_liodn(int liodn, struct device *dev,

• 	  struct fsl_dma_domain *dma_domain,
  

• 	  struct iommu_domain_geometry *geom_attr)
  

+static int pamu_set_liodn(struct fsl_dma_domain *dma_domain, struct device *dev,

• 	  int liodn)
  

{

• phys_addr_t window_addr, window_size;

• struct iommu_domain *domain = &dma_domain->iommu_domain;
• struct iommu_domain_geometry *geom = &domain->geometry; u32 omi_index = ~(u32)0; unsigned long flags; int ret;

@@ -110,22 +91,25 @@ static int pamu_set_liodn(int liodn, struct device *dev, */ get_ome_index(&omi_index, dev);

• window_addr = geom_attr->aperture_start;
• window_size = geom_attr->aperture_end + 1;
• spin_lock_irqsave(&iommu_lock, flags); ret = pamu_disable_liodn(liodn);
• if (!ret)

• ret = pamu_config_ppaace(liodn, window_addr, window_size, omi_index,
  

• 			 0, dma_domain->snoop_id,
  

• 			 dma_domain->stash_id, 0);
  

• if (ret)

• 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);
  

• 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,
  

• 		 PAACE_AP_PERMS_QUERY | PAACE_AP_PERMS_UPDATE);
  

There's more '+1' / '-1' confusion here with aperture_end which I'm not managing to follow. What am I missing?

Will