diff options
| author | Geert Uytterhoeven <geert@linux-m68k.org> | 2018-04-17 13:49:09 -0400 |
|---|---|---|
| committer | Joerg Roedel <jroedel@suse.de> | 2018-05-03 09:02:06 -0400 |
| commit | 48e6f7652dd8c502005decb331910ca0d097c1a9 (patch) | |
| tree | 509344f61d13f956a5349ea38df770863d2510f9 /drivers/iommu/Kconfig | |
| parent | 6da6c0db5316275015e8cc2959f12a17584aeb64 (diff) | |
iommu: Remove depends on HAS_DMA in case of platform dependency
Remove dependencies on HAS_DMA where a Kconfig symbol depends on another
symbol that implies HAS_DMA, and, optionally, on "|| COMPILE_TEST".
In most cases this other symbol is an architecture or platform specific
symbol, or PCI.
Generic symbols and drivers without platform dependencies keep their
dependencies on HAS_DMA, to prevent compiling subsystems or drivers that
cannot work anyway.
This simplifies the dependencies, and allows to improve compile-testing.
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Reviewed-by: Mark Brown <broonie@kernel.org>
Acked-by: Robin Murphy <robin.murphy@arm.com>
Acked-by: Joerg Roedel <jroedel@suse.de>
Signed-off-by: Joerg Roedel <jroedel@suse.de>
Diffstat (limited to 'drivers/iommu/Kconfig')
| -rw-r--r-- | drivers/iommu/Kconfig | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/iommu/Kconfig b/drivers/iommu/Kconfig index df171cb85822..c76157e57f6b 100644 --- a/drivers/iommu/Kconfig +++ b/drivers/iommu/Kconfig | |||
| @@ -23,7 +23,7 @@ config IOMMU_IO_PGTABLE | |||
| 23 | config IOMMU_IO_PGTABLE_LPAE | 23 | config IOMMU_IO_PGTABLE_LPAE |
| 24 | bool "ARMv7/v8 Long Descriptor Format" | 24 | bool "ARMv7/v8 Long Descriptor Format" |
| 25 | select IOMMU_IO_PGTABLE | 25 | select IOMMU_IO_PGTABLE |
| 26 | depends on HAS_DMA && (ARM || ARM64 || (COMPILE_TEST && !GENERIC_ATOMIC64)) | 26 | depends on ARM || ARM64 || (COMPILE_TEST && !GENERIC_ATOMIC64) |
| 27 | help | 27 | help |
| 28 | Enable support for the ARM long descriptor pagetable format. | 28 | Enable support for the ARM long descriptor pagetable format. |
| 29 | This allocator supports 4K/2M/1G, 16K/32M and 64K/512M page | 29 | This allocator supports 4K/2M/1G, 16K/32M and 64K/512M page |
| @@ -42,7 +42,7 @@ config IOMMU_IO_PGTABLE_LPAE_SELFTEST | |||
| 42 | config IOMMU_IO_PGTABLE_ARMV7S | 42 | config IOMMU_IO_PGTABLE_ARMV7S |
| 43 | bool "ARMv7/v8 Short Descriptor Format" | 43 | bool "ARMv7/v8 Short Descriptor Format" |
| 44 | select IOMMU_IO_PGTABLE | 44 | select IOMMU_IO_PGTABLE |
| 45 | depends on HAS_DMA && (ARM || ARM64 || COMPILE_TEST) | 45 | depends on ARM || ARM64 || COMPILE_TEST |
| 46 | help | 46 | help |
| 47 | Enable support for the ARM Short-descriptor pagetable format. | 47 | Enable support for the ARM Short-descriptor pagetable format. |
| 48 | This supports 32-bit virtual and physical addresses mapped using | 48 | This supports 32-bit virtual and physical addresses mapped using |
| @@ -376,7 +376,6 @@ config QCOM_IOMMU | |||
| 376 | # Note: iommu drivers cannot (yet?) be built as modules | 376 | # Note: iommu drivers cannot (yet?) be built as modules |
| 377 | bool "Qualcomm IOMMU Support" | 377 | bool "Qualcomm IOMMU Support" |
| 378 | depends on ARCH_QCOM || (COMPILE_TEST && !GENERIC_ATOMIC64) | 378 | depends on ARCH_QCOM || (COMPILE_TEST && !GENERIC_ATOMIC64) |
| 379 | depends on HAS_DMA | ||
| 380 | select IOMMU_API | 379 | select IOMMU_API |
| 381 | select IOMMU_IO_PGTABLE_LPAE | 380 | select IOMMU_IO_PGTABLE_LPAE |
| 382 | select ARM_DMA_USE_IOMMU | 381 | select ARM_DMA_USE_IOMMU |