Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 16753322 authored by Joerg Roedel's avatar Joerg Roedel
Browse files

Merge branch 'for-joerg/arm-smmu/updates' of... 

Merge branch 'for-joerg/arm-smmu/updates' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into arm/smmu
parents 26bc420b 859a732e

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -1582,6 +1582,7 @@ M: Will Deacon <will.deacon@arm.com> 
L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Maintained

F:	drivers/iommu/arm-smmu.c

F:	drivers/iommu/io-pgtable-arm.c



ARM64 PORT (AARCH64 ARCHITECTURE)

M:	Catalin Marinas <catalin.marinas@arm.com>

arch/arm64/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -349,7 +349,6 @@ config ARM64_VA_BITS_42 


config ARM64_VA_BITS_48

	bool "48-bit"

	depends on !ARM_SMMU



endchoice

drivers/iommu/Kconfig

+29 −3
Original line number Diff line number Diff line
@@ -13,6 +13,32 @@ menuconfig IOMMU_SUPPORT 


if IOMMU_SUPPORT



menu "Generic IOMMU Pagetable Support"



# Selected by the actual pagetable implementations

config IOMMU_IO_PGTABLE

	bool



config IOMMU_IO_PGTABLE_LPAE

	bool "ARMv7/v8 Long Descriptor Format"

	select IOMMU_IO_PGTABLE

	help

	  Enable support for the ARM long descriptor pagetable format.

	  This allocator supports 4K/2M/1G, 16K/32M and 64K/512M page

	  sizes at both stage-1 and stage-2, as well as address spaces

	  up to 48-bits in size.



config IOMMU_IO_PGTABLE_LPAE_SELFTEST

	bool "LPAE selftests"

	depends on IOMMU_IO_PGTABLE_LPAE

	help

	  Enable self-tests for LPAE page table allocator. This performs

	  a series of page-table consistency checks during boot.



	  If unsure, say N here.



endmenu



config OF_IOMMU

       def_bool y

       depends on OF && IOMMU_API
@@ -304,13 +330,13 @@ config SPAPR_TCE_IOMMU 


config ARM_SMMU

	bool "ARM Ltd. System MMU (SMMU) Support"

	depends on ARM64 || (ARM_LPAE && OF)

	depends on ARM64 || ARM

	select IOMMU_API

	select IOMMU_IO_PGTABLE_LPAE

	select ARM_DMA_USE_IOMMU if ARM

	help

	  Support for implementations of the ARM System MMU architecture

	  versions 1 and 2. The driver supports both v7l and v8l table

	  formats with 4k and 64k page sizes.

	  versions 1 and 2.



	  Say Y here if your SoC includes an IOMMU device implementing

	  the ARM SMMU architecture.

drivers/iommu/Makefile

+2 −0
Original line number Diff line number Diff line 
obj-$(CONFIG_IOMMU_API) += iommu.o

obj-$(CONFIG_IOMMU_API) += iommu-traces.o

obj-$(CONFIG_IOMMU_API) += iommu-sysfs.o

obj-$(CONFIG_IOMMU_IO_PGTABLE) += io-pgtable.o

obj-$(CONFIG_IOMMU_IO_PGTABLE_LPAE) += io-pgtable-arm.o

obj-$(CONFIG_OF_IOMMU)	+= of_iommu.o

obj-$(CONFIG_MSM_IOMMU) += msm_iommu.o msm_iommu_dev.o

obj-$(CONFIG_AMD_IOMMU) += amd_iommu.o amd_iommu_init.o

drivers/iommu/arm-smmu.c

+319 −616

File changed.

Preview size limit exceeded, changes collapsed.