summaryrefslogtreecommitdiff
path: root/drivers/iommu/Kconfig
diff options
context:
space:
mode:
authorMarek Szyprowski <m.szyprowski@samsung.com>2016-02-19 09:22:44 +0100
committerHuang, Tao <huangtao@rock-chips.com>2016-03-18 20:43:24 +0800
commite11b4aa8cdcf11c21d194e8adb7dc0819ed26bad (patch)
tree1e783530b5cebf2948fbcdcb08528eaa407ad545 /drivers/iommu/Kconfig
parent7178c0f93e5fad7b2300e535839aecfa3b4e7ce2 (diff)
FROMLIST: iommu: dma-iommu: use common implementation also on ARM architecture
This patch replaces ARM-specific IOMMU-based DMA-mapping implementation with generic IOMMU DMA-mapping code shared with ARM64 architecture. The side-effect of this change is a switch from bitmap-based IO address space management to tree-based code. There should be no functional changes for drivers, which rely on initialization from generic arch_setup_dna_ops() interface. Code, which used old arm_iommu_* functions must be updated to new interface. To avoid build failed on ARCH arm,we mannually fix the following two files that to use arch_set_dma_ops API arch/arm/mach-highbank/highbank.c arch/arm/mach-mvebu/coherency.c Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> Conflicts: arch/arm/mm/dma-mapping.c Change-Id: Iffad16a7a511d50cc8e422bc61497f117279c66d Signed-off-by: Simon <xxm@rock-chips.com> Signed-off-by: Mark Yao <mark.yao@rock-chips.com> (am from https://patchwork.freedesktop.org/patch/74409/)
Diffstat (limited to 'drivers/iommu/Kconfig')
-rw-r--r--drivers/iommu/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/iommu/Kconfig b/drivers/iommu/Kconfig
index 8d5dde499aa3..d3a32dc950c7 100644
--- a/drivers/iommu/Kconfig
+++ b/drivers/iommu/Kconfig
@@ -369,6 +369,7 @@ config SHMOBILE_IOMMU_L1SIZE
config IPMMU_VMSA
bool "Renesas VMSA-compatible IPMMU"
+ depends on BROKEN
depends on ARM_LPAE
depends on ARCH_SHMOBILE || COMPILE_TEST
select IOMMU_API