Merge branch 'for-joerg/io-pgtable' of... (28f69154) · Commits · e / devices / android_kernel_fairphone_FP4

MAINTAINERS

+2 −0

Original line number	Diff line number	Diff line
		@@ -1793,11 +1793,13 @@ F: drivers/edac/synopsys_edac.c

		ARM SMMU DRIVERS
		M: Will Deacon <will.deacon@arm.com>
		R: Robin Murphy <robin.murphy@arm.com>
		L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
		S: Maintained
		F: drivers/iommu/arm-smmu.c
		F: drivers/iommu/arm-smmu-v3.c
		F: drivers/iommu/io-pgtable-arm.c
		F: drivers/iommu/io-pgtable-arm-v7s.c

		ARM64 PORT (AARCH64 ARCHITECTURE)
		M: Catalin Marinas <catalin.marinas@arm.com>

+19 −0

Original line number	Diff line number	Diff line
		@@ -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

+1 −0

Original line number	Diff line number	Diff line
		@@ -3,6 +3,7 @@ obj-$(CONFIG_IOMMU_API) += iommu-traces.o
		obj-$(CONFIG_IOMMU_API) += iommu-sysfs.o
		obj-$(CONFIG_IOMMU_DMA) += dma-iommu.o
		obj-$(CONFIG_IOMMU_IO_PGTABLE) += io-pgtable.o
		obj-$(CONFIG_IOMMU_IO_PGTABLE_ARMV7S) += io-pgtable-arm-v7s.o
		obj-$(CONFIG_IOMMU_IO_PGTABLE_LPAE) += io-pgtable-arm.o
		obj-$(CONFIG_IOMMU_IOVA) += iova.o
		obj-$(CONFIG_OF_IOMMU) += of_iommu.o