diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-02-29 10:19:06 +0100 |
|---|---|---|
| committer | Joerg Roedel <jroedel@suse.de> | 2016-02-29 16:47:46 +0100 |
| commit | 1928832f0241f0c39fcd2ce73aaa39d37db50a97 (patch) | |
| tree | 6bd79606722f6885ff9ca48e9fced88d39ee5f91 /drivers/iommu | |
| parent | 5ff6b3a6d3915b4238cfc2725362d586c9927e92 (diff) | |
| download | linux-stable-1928832f0241f0c39fcd2ce73aaa39d37db50a97.tar.gz linux-stable-1928832f0241f0c39fcd2ce73aaa39d37db50a97.tar.bz2 linux-stable-1928832f0241f0c39fcd2ce73aaa39d37db50a97.zip | |
iommu/mediatek: Select ARM_DMA_USE_IOMMU
The newly added Mediatek IOMMU driver uses the IOMMU_DMA infrastructure,
but unlike other such drivers, it does not select 'ARM_DMA_USE_IOMMU',
which is a prerequisite, leading to a link error:
warning: (MTK_IOMMU) selects IOMMU_DMA which has unmet direct dependencies (IOMMU_SUPPORT && NEED_SG_DMA_LENGTH)
drivers/iommu/built-in.o: In function `iommu_put_dma_cookie':
mtk_iommu.c:(.text+0x11fe): undefined reference to `put_iova_domain'
drivers/iommu/built-in.o: In function `iommu_dma_init_domain':
mtk_iommu.c:(.text+0x1316): undefined reference to `init_iova_domain'
drivers/iommu/built-in.o: In function `__iommu_dma_unmap':
mtk_iommu.c:(.text+0x1380): undefined reference to `find_iova'
This adds the same select that the other drivers have. On a related
note, I wonder if we should just always select ARM_DMA_USE_IOMMU
whenever any IOMMU driver is enabled. Are there any cases where
we would enable an IOMMU but not use it?
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Fixes: 0df4fabe208d ("iommu/mediatek: Add mt8173 IOMMU driver")
Signed-off-by: Joerg Roedel <jroedel@suse.de>
Diffstat (limited to 'drivers/iommu')
| -rw-r--r-- | drivers/iommu/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/iommu/Kconfig b/drivers/iommu/Kconfig index 6df982f89f0c..624510ae877c 100644 --- a/drivers/iommu/Kconfig +++ b/drivers/iommu/Kconfig @@ -341,6 +341,7 @@ config MTK_IOMMU bool "MTK IOMMU Support" depends on ARM || ARM64 depends on ARCH_MEDIATEK || COMPILE_TEST + select ARM_DMA_USE_IOMMU select IOMMU_API select IOMMU_DMA select IOMMU_IO_PGTABLE_ARMV7S |