Re: [PATCH v3 4/7] iommu/mediatek: Delete the leaf in the tlb flush

[Robin Murphy]

On 14/10/2019 07:38, Yong Wu wrote:

In our tlb range flush, we don't care the "leaf". Remove it to simplify
the code. no functional change.

Presumably you don't care about the granule either?

Robin.

Signed-off-by: Yong Wu <yong...@mediatek.com>
---
  drivers/iommu/mtk_iommu.c | 16 ++++------------
  1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/drivers/iommu/mtk_iommu.c b/drivers/iommu/mtk_iommu.c
index 8712afc..19f936c 100644
--- a/drivers/iommu/mtk_iommu.c
+++ b/drivers/iommu/mtk_iommu.c
@@ -174,8 +174,7 @@ static void mtk_iommu_tlb_flush_all(void *cookie)
  }

static void mtk_iommu_tlb_add_flush_nosync(unsigned long iova, size_t size,

-                                          size_t granule, bool leaf,
-                                          void *cookie)
+                                          size_t granule, void *cookie)
  {
        struct mtk_iommu_data *data = cookie;

@@ -219,14 +218,7 @@ static void mtk_iommu_tlb_sync(void *cookie)

  static void mtk_iommu_tlb_flush_walk(unsigned long iova, size_t size,
                                     size_t granule, void *cookie)
  {
-       mtk_iommu_tlb_add_flush_nosync(iova, size, granule, false, cookie);
-       mtk_iommu_tlb_sync(cookie);
-}
-
-static void mtk_iommu_tlb_flush_leaf(unsigned long iova, size_t size,
-                                    size_t granule, void *cookie)
-{
-       mtk_iommu_tlb_add_flush_nosync(iova, size, granule, true, cookie);
+       mtk_iommu_tlb_add_flush_nosync(iova, size, granule, cookie);
        mtk_iommu_tlb_sync(cookie);
  }

@@ -245,7 +237,7 @@ static void mtk_iommu_tlb_flush_page_nosync(struct iommu_iotlb_gather *gather,

  static const struct iommu_flush_ops mtk_iommu_flush_ops = {
        .tlb_flush_all = mtk_iommu_tlb_flush_all,
        .tlb_flush_walk = mtk_iommu_tlb_flush_walk,
-       .tlb_flush_leaf = mtk_iommu_tlb_flush_leaf,
+       .tlb_flush_leaf = mtk_iommu_tlb_flush_walk,
        .tlb_add_page = mtk_iommu_tlb_flush_page_nosync,
  };

@@ -475,7 +467,7 @@ static void mtk_iommu_iotlb_sync(struct iommu_domain *domain,

                spin_lock_irqsave(&dom->pgtlock, flags);

mtk_iommu_tlb_add_flush_nosync(gather->start, length, gather->pgsize,

-                                      false, data);
+                                      data);
        mtk_iommu_tlb_sync(data);

if (!is_in_gather)