diff options
author | Joerg Roedel <jroedel@suse.de> | 2016-02-25 14:23:58 +0100 |
---|---|---|
committer | Joerg Roedel <jroedel@suse.de> | 2016-02-25 14:23:58 +0100 |
commit | 28f691544766bb5741a51189f7d7eccfe63dc23f (patch) | |
tree | cba6b98d759e831867c82bfbd342c0482a0eaa0d /drivers/iommu/Kconfig | |
parent | 81f70ba233d5f660e1ea5fe23260ee323af5d53a (diff) | |
parent | c8bff3a68f33b94e53f65aa9a4c0e9be34b6b514 (diff) | |
download | blackbird-op-linux-28f691544766bb5741a51189f7d7eccfe63dc23f.tar.gz blackbird-op-linux-28f691544766bb5741a51189f7d7eccfe63dc23f.zip |
Merge branch 'for-joerg/io-pgtable' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into arm/io-pgtable
Diffstat (limited to 'drivers/iommu/Kconfig')
-rw-r--r-- | drivers/iommu/Kconfig | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/drivers/iommu/Kconfig b/drivers/iommu/Kconfig index a1e75cba18e0..dc1aaa5d53e8 100644 --- a/drivers/iommu/Kconfig +++ b/drivers/iommu/Kconfig @@ -39,6 +39,25 @@ config IOMMU_IO_PGTABLE_LPAE_SELFTEST If unsure, say N here. +config IOMMU_IO_PGTABLE_ARMV7S + bool "ARMv7/v8 Short Descriptor Format" + select IOMMU_IO_PGTABLE + depends on HAS_DMA && (ARM || ARM64 || COMPILE_TEST) + help + Enable support for the ARM Short-descriptor pagetable format. + This supports 32-bit virtual and physical addresses mapped using + 2-level tables with 4KB pages/1MB sections, and contiguous entries + for 64KB pages/16MB supersections if indicated by the IOMMU driver. + +config IOMMU_IO_PGTABLE_ARMV7S_SELFTEST + bool "ARMv7s selftests" + depends on IOMMU_IO_PGTABLE_ARMV7S + help + Enable self-tests for ARMv7s page table allocator. This performs + a series of page-table consistency checks during boot. + + If unsure, say N here. + endmenu config IOMMU_IOVA |