diff -drupN a/drivers/iommu/Kconfig b/drivers/iommu/Kconfig
--- a/drivers/iommu/Kconfig	2018-08-06 17:23:04.000000000 +0300
+++ b/drivers/iommu/Kconfig	2022-06-12 05:28:14.000000000 +0300
@@ -230,6 +230,19 @@ config ROCKCHIP_IOMMU
 	  Say Y here if you are using a Rockchip SoC that includes an IOMMU
 	  device.
 
+config SUNXI_IOMMU
+	bool "Allwinner Sunxi IOMMU Support"
+	depends on ARCH_SUNXI
+	select ARM_DMA_USE_IOMMU if ARM
+	select IOMMU_API
+	help
+	  Support for the Allwinner's IOMMU(System MMU) component. This
+	  enables H/W multimedia accellerators to see non-linear physical
+	  memory chunks as a linear memory in their address spaces.
+
+	  If unsure,say N here.
+
+
 config TEGRA_IOMMU_GART
 	bool "Tegra GART IOMMU Support"
 	depends on ARCH_TEGRA_2x_SOC
@@ -362,4 +375,26 @@ config MTK_IOMMU_V1
 
 	  if unsure, say N here.
 
+menuconfig IOMMU_DEBUG
+	bool "IOMMU Profiling and Debugging"
+	help
+	  Makes available some additional IOMMU profiling and debugging
+	  options.
+
+	  Say Y here if you want to debug and trace iommu driver.
+
+if IOMMU_DEBUG
+
+config IOMMU_TESTS
+	bool "Interactive IOMMU performance/functional tests"
+	depends on IOMMU_DEBUG
+	select IOMMU_API
+	help
+	  Enables a suite of IOMMU unit tests.  The tests are runnable
+	  through debugfs.  Unlike the IOMMU_DEBUG_TRACKING option, the
+	  impact of enabling this option to overal system performance
+	  should be minimal.
+
+endif # IOMMU_DEBUG
+
 endif # IOMMU_SUPPORT