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

Commit ddeaba11 authored by Will Deacon's avatar Will Deacon Committed by Matt Wagantall
Browse files

iommu: add ARM LPAE page table allocator 



A number of IOMMUs found in ARM SoCs can walk architecture-compatible
page tables.

This patch adds a generic allocator for Stage-1 and Stage-2 v7/v8
long-descriptor page tables. 4k, 16k and 64k pages are supported, with
up to 4-levels of walk to cover a 48-bit address space.

Change-Id: I32740cfa795c55e0d3683b42105b4f49c9dcf984
Tested-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
Git-commit: e1d3c0fd701df831169b116cd5c5d6203ac07f70
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git


Signed-off-by: default avatarMitchel Humpherys <mitchelh@codeaurora.org>
parent e4735f27

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -1562,6 +1562,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>

drivers/iommu/Kconfig

+9 −0
Original line number Diff line number Diff line
@@ -19,6 +19,15 @@ menu "Generic IOMMU Pagetable Support" 
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.



endmenu



config OF_IOMMU

drivers/iommu/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 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/io-pgtable-arm.c

0 → 100644
+781 −0

File added.

Preview size limit exceeded, changes collapsed.

drivers/iommu/io-pgtable.c

+11 −0
Original line number Diff line number Diff line
@@ -24,9 +24,20 @@ 


#include "io-pgtable.h"



extern struct io_pgtable_init_fns io_pgtable_arm_32_lpae_s1_init_fns;

extern struct io_pgtable_init_fns io_pgtable_arm_32_lpae_s2_init_fns;

extern struct io_pgtable_init_fns io_pgtable_arm_64_lpae_s1_init_fns;

extern struct io_pgtable_init_fns io_pgtable_arm_64_lpae_s2_init_fns;



static const struct io_pgtable_init_fns *

io_pgtable_init_table[IO_PGTABLE_NUM_FMTS] =

{

#ifdef CONFIG_IOMMU_IO_PGTABLE_LPAE

	[ARM_32_LPAE_S1] = &io_pgtable_arm_32_lpae_s1_init_fns,

	[ARM_32_LPAE_S2] = &io_pgtable_arm_32_lpae_s2_init_fns,

	[ARM_64_LPAE_S1] = &io_pgtable_arm_64_lpae_s1_init_fns,

	[ARM_64_LPAE_S2] = &io_pgtable_arm_64_lpae_s2_init_fns,

#endif

};



struct io_pgtable_ops *alloc_io_pgtable_ops(enum io_pgtable_fmt fmt,