From: Will Deacon <will@kernel.org>
Date: Mon, 1 Feb 2021 12:59:28 +0000 (+0000)
Subject: Merge branch 'for-joerg/mtk' into for-joerg/arm-smmu/updates
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=7060377ce06f9cd3ed6274c0f2310463feb5baec;p=linux.git

Merge branch 'for-joerg/mtk' into for-joerg/arm-smmu/updates

Merge in Mediatek support from Yong Wu which introduces significant
changes to the TLB invalidation and Arm short-descriptor code in the
io-pgtable layer.

* for-joerg/mtk: (40 commits)
  MAINTAINERS: Add entry for MediaTek IOMMU
  iommu/mediatek: Add mt8192 support
  iommu/mediatek: Remove unnecessary check in attach_device
  iommu/mediatek: Support master use iova over 32bit
  iommu/mediatek: Add iova reserved function
  iommu/mediatek: Support for multi domains
  iommu/mediatek: Add get_domain_id from dev->dma_range_map
  iommu/mediatek: Add iova_region structure
  iommu/mediatek: Move geometry.aperture updating into domain_finalise
  iommu/mediatek: Move domain_finalise into attach_device
  iommu/mediatek: Adjust the structure
  iommu/mediatek: Support report iova 34bit translation fault in ISR
  iommu/mediatek: Support up to 34bit iova in tlb flush
  iommu/mediatek: Add power-domain operation
  iommu/mediatek: Add pm runtime callback
  iommu/mediatek: Add device link for smi-common and m4u
  iommu/mediatek: Add error handle for mtk_iommu_probe
  iommu/mediatek: Move hw_init into attach_device
  iommu/mediatek: Update oas for v7s
  iommu/mediatek: Add a flag for iova 34bits case
  ...
---

7060377ce06f9cd3ed6274c0f2310463feb5baec
diff --cc drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c
index baebaac34a83c,c70d6e79f5346..8594b4a830437
--- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c
+++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c
@@@ -2305,9 -2280,8 +2305,9 @@@ static void arm_smmu_iotlb_sync(struct 
  {
  	struct arm_smmu_domain *smmu_domain = to_smmu_domain(domain);
  
 -	arm_smmu_tlb_inv_range(gather->start, gather->end - gather->start + 1,
 -			       gather->pgsize, true, smmu_domain);
 +	arm_smmu_tlb_inv_range_domain(gather->start,
- 				      gather->end - gather->start,
++				      gather->end - gather->start + 1,
 +				      gather->pgsize, true, smmu_domain);
  }
  
  static phys_addr_t