From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 22 Feb 2021 18:31:29 +0000 (-0800)
Subject: Merge tag 'iommu-updates-v5.12' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v5.12-rc1~100
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=d652ea30ba32db12fe8365182fad5ba2e7c22822;p=tomoyo%2Ftomoyo-test1.git

Merge tag 'iommu-updates-v5.12' of git://git./linux/kernel/git/joro/iommu

Pull iommu updates from Joerg Roedel:

 - ARM SMMU and Mediatek updates from Will Deacon:
     - Support for MT8192 IOMMU from Mediatek
     - Arm v7s io-pgtable extensions for MT8192
     - Removal of TLBI_ON_MAP quirk
     - New Qualcomm compatible strings
     - Allow SVA without hardware broadcast TLB maintenance on SMMUv3
     - Virtualization Host Extension support for SMMUv3 (SVA)
     - Allow SMMUv3 PMU perf driver to be built independently from IOMMU

 - Some tidy-up in IOVA and core code

 - Conversion of the AMD IOMMU code to use the generic IO-page-table
   framework

 - Intel VT-d updates from Lu Baolu:
     - Audit capability consistency among different IOMMUs
     - Add SATC reporting structure support
     - Add iotlb_sync_map callback support

 - SDHI support for Renesas IOMMU driver

 - Misc cleanups and other small improvments

* tag 'iommu-updates-v5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu: (94 commits)
  iommu/amd: Fix performance counter initialization
  MAINTAINERS: repair file pattern in MEDIATEK IOMMU DRIVER
  iommu/mediatek: Fix error code in probe()
  iommu/mediatek: Fix unsigned domid comparison with less than zero
  iommu/vt-d: Parse SATC reporting structure
  iommu/vt-d: Add new enum value and structure for SATC
  iommu/vt-d: Add iotlb_sync_map callback
  iommu/vt-d: Move capability check code to cap_audit files
  iommu/vt-d: Audit IOMMU Capabilities and add helper functions
  iommu/vt-d: Fix 'physical' typos
  iommu: Properly pass gfp_t in _iommu_map() to avoid atomic sleeping
  iommu/vt-d: Fix compile error [-Werror=implicit-function-declaration]
  driver/perf: Remove ARM_SMMU_V3_PMU dependency on ARM_SMMU_V3
  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
  ...
---

d652ea30ba32db12fe8365182fad5ba2e7c22822
diff --cc include/soc/mediatek/smi.h
index 29e2fb8f33d6,4cf445dbbdaa..15e3397cec58
--- a/include/soc/mediatek/smi.h
+++ b/include/soc/mediatek/smi.h
@@@ -9,10 -9,8 +9,8 @@@
  #include <linux/bitops.h>
  #include <linux/device.h>
  
 -#ifdef CONFIG_MTK_SMI
 +#if IS_ENABLED(CONFIG_MTK_SMI)
  
- #define MTK_LARB_NR_MAX		16
- 
  #define MTK_SMI_MMU_EN(port)	BIT(port)
  
  struct mtk_smi_larb_iommu {