From: Joerg Roedel <jroedel@suse.de>
Date: Fri, 30 Aug 2019 14:12:10 +0000 (+0200)
Subject: Merge branch 'arm/smmu' into arm/mediatek
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=4c008893415385a0941bbb626c666620a4d7ab00;p=openwrt%2Fstaging%2Fblogic.git

Merge branch 'arm/smmu' into arm/mediatek
---

4c008893415385a0941bbb626c666620a4d7ab00
diff --cc drivers/iommu/io-pgtable-arm-v7s.c
index 545287148147,18e7d212c7de..4cb394937700
--- a/drivers/iommu/io-pgtable-arm-v7s.c
+++ b/drivers/iommu/io-pgtable-arm-v7s.c
@@@ -627,12 -582,11 +627,11 @@@ static size_t arm_v7s_split_blk_unmap(s
  		if (!ARM_V7S_PTE_IS_TABLE(pte, 1))
  			return 0;
  
 -		tablep = iopte_deref(pte, 1);
 +		tablep = iopte_deref(pte, 1, data);
- 		return __arm_v7s_unmap(data, iova, size, 2, tablep);
+ 		return __arm_v7s_unmap(data, gather, iova, size, 2, tablep);
  	}
  
- 	io_pgtable_tlb_add_flush(&data->iop, iova, size, size, true);
- 	io_pgtable_tlb_sync(&data->iop);
+ 	io_pgtable_tlb_add_page(&data->iop, gather, iova, size);
  	return size;
  }
  
@@@ -683,10 -638,9 +683,9 @@@ static size_t __arm_v7s_unmap(struct ar
  		for (i = 0; i < num_entries; i++) {
  			if (ARM_V7S_PTE_IS_TABLE(pte[i], lvl)) {
  				/* Also flush any partial walks */
- 				io_pgtable_tlb_add_flush(iop, iova, blk_size,
- 					ARM_V7S_BLOCK_SIZE(lvl + 1), false);
- 				io_pgtable_tlb_sync(iop);
+ 				io_pgtable_tlb_flush_walk(iop, iova, blk_size,
+ 						ARM_V7S_BLOCK_SIZE(lvl + 1));
 -				ptep = iopte_deref(pte[i], lvl);
 +				ptep = iopte_deref(pte[i], lvl, data);
  				__arm_v7s_free_table(ptep, lvl + 1, data);
  			} else if (iop->cfg.quirks & IO_PGTABLE_QUIRK_NON_STRICT) {
  				/*
@@@ -711,8 -665,8 +710,8 @@@
  	}
  
  	/* Keep on walkin' */
 -	ptep = iopte_deref(pte[0], lvl);
 +	ptep = iopte_deref(pte[0], lvl, data);
- 	return __arm_v7s_unmap(data, iova, size, lvl + 1, ptep);
+ 	return __arm_v7s_unmap(data, gather, iova, size, lvl + 1, ptep);
  }
  
  static size_t arm_v7s_unmap(struct io_pgtable_ops *ops, unsigned long iova,
diff --cc drivers/iommu/mtk_iommu.c
index 400066d0d37b,0827d51936fa..67a483c1a935
--- a/drivers/iommu/mtk_iommu.c
+++ b/drivers/iommu/mtk_iommu.c
@@@ -299,12 -285,11 +321,12 @@@ static int mtk_iommu_domain_finalise(st
  	dom->cfg = (struct io_pgtable_cfg) {
  		.quirks = IO_PGTABLE_QUIRK_ARM_NS |
  			IO_PGTABLE_QUIRK_NO_PERMS |
 -			IO_PGTABLE_QUIRK_TLBI_ON_MAP,
 +			IO_PGTABLE_QUIRK_TLBI_ON_MAP |
 +			IO_PGTABLE_QUIRK_ARM_MTK_EXT,
  		.pgsize_bitmap = mtk_iommu_ops.pgsize_bitmap,
  		.ias = 32,
 -		.oas = 32,
 +		.oas = 34,
- 		.tlb = &mtk_iommu_gather_ops,
+ 		.tlb = &mtk_iommu_flush_ops,
  		.iommu_dev = data->dev,
  	};