Commit b4ceb4a5 authored by Robin Murphy's avatar Robin Murphy Committed by Joerg Roedel
Browse files

iommu: Tidy up Kconfig for SoC IOMMUs 



Wacky COMPILE_TEST dependencies based on who used to define
dev_archdata.iommu can go.

Dependencies on ARM or ARM64 already implied by the ARCH_* platform
selection can go.

The entire IOMMU_SUPPORT menu already depends on MMU, so those can go.

IOMMU_DMA is for the architecture's DMA API implementation to choose,
and its interface to IOMMU drivers is properly stubbed out if disabled,
so dependencies on or selections of that can go (AMD_IOMMU is the
current exception since the x86 drivers have to provide their own entire
dma_map_ops implementation).

Since commit ed6ccf10 ("dma-mapping: properly stub out the DMA API
for !CONFIG_HAS_DMA"), drivers which simply use the dma-mapping API
should not need to depend on HAS_DMA, so those can go.

And a long-dead option for code removed from the MSM driver 4 years ago
can also go.

Signed-off-by: default avatarRobin Murphy <robin.murphy@arm.com>
Link: https://lore.kernel.org/r/7fb9c74dc6bd12a4619ca44c92408e91352f1be0.1593791968.git.robin.murphy@arm.com


Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent 557d4bec

drivers/iommu/Kconfig

+3 −12
Original line number Diff line number Diff line
@@ -128,10 +128,6 @@ config MSM_IOMMU 


	  If unsure, say N here.



config IOMMU_PGTABLES_L2

	def_bool y

	depends on MSM_IOMMU && MMU && SMP && CPU_DCACHE_DISABLE=n



# AMD IOMMU support

config AMD_IOMMU

	bool "AMD IOMMU support"
@@ -274,7 +270,6 @@ config IRQ_REMAP 
# OMAP IOMMU support

config OMAP_IOMMU

	bool "OMAP IOMMU Support"

	depends on ARM && MMU || (COMPILE_TEST && (ARM || ARM64 || IA64 || SPARC))

	depends on ARCH_OMAP2PLUS || COMPILE_TEST

	select IOMMU_API

	help
@@ -292,7 +287,6 @@ config OMAP_IOMMU_DEBUG 


config ROCKCHIP_IOMMU

	bool "Rockchip IOMMU Support"

	depends on ARM || ARM64 || (COMPILE_TEST && (ARM64 || IA64 || SPARC))

	depends on ARCH_ROCKCHIP || COMPILE_TEST

	select IOMMU_API

	select ARM_DMA_USE_IOMMU
@@ -308,7 +302,6 @@ config SUN50I_IOMMU 
	depends on ARCH_SUNXI || COMPILE_TEST

	select ARM_DMA_USE_IOMMU

	select IOMMU_API

	select IOMMU_DMA

	help

	  Support for the IOMMU introduced in the Allwinner H6 SoCs.
@@ -335,7 +328,7 @@ config TEGRA_IOMMU_SMMU 


config EXYNOS_IOMMU

	bool "Exynos IOMMU Support"

	depends on ARCH_EXYNOS && MMU || (COMPILE_TEST && (ARM || ARM64 || IA64 || SPARC))

	depends on ARCH_EXYNOS || COMPILE_TEST

	depends on !CPU_BIG_ENDIAN # revisit driver if we can enable big-endian ptes

	select IOMMU_API

	select ARM_DMA_USE_IOMMU
@@ -358,7 +351,7 @@ config EXYNOS_IOMMU_DEBUG 


config IPMMU_VMSA

	bool "Renesas VMSA-compatible IPMMU"

	depends on ARM || IOMMU_DMA

	depends on ARM || ARM64

	depends on ARCH_RENESAS || (COMPILE_TEST && !GENERIC_ATOMIC64)

	select IOMMU_API

	select IOMMU_IO_PGTABLE_LPAE
@@ -380,7 +373,7 @@ config SPAPR_TCE_IOMMU 
# ARM IOMMU support

config ARM_SMMU

	tristate "ARM Ltd. System MMU (SMMU) Support"

	depends on (ARM64 || ARM || (COMPILE_TEST && !GENERIC_ATOMIC64)) && MMU

	depends on ARM64 || ARM || (COMPILE_TEST && !GENERIC_ATOMIC64)

	select IOMMU_API

	select IOMMU_IO_PGTABLE_LPAE

	select ARM_DMA_USE_IOMMU if ARM
@@ -466,11 +459,9 @@ config S390_AP_IOMMU 


config MTK_IOMMU

	bool "MTK IOMMU Support"

	depends on HAS_DMA

	depends on ARCH_MEDIATEK || COMPILE_TEST

	select ARM_DMA_USE_IOMMU

	select IOMMU_API

	select IOMMU_DMA

	select IOMMU_IO_PGTABLE_ARMV7S

	select MEMORY

	select MTK_SMI

CRA Git | Maintained and supported by SUSTech CRA and CCSE