Enable R52 support for the first chunk of MPU support
v5 cover Enable R52 support for the first chunk of MPU support
Hi all,
This patch serie enables R52 support based on Luca's series. "[PATCH v6 0/6] First chunk for Arm R82 and MPU support".
Changes from :-
v1 - Changes mentioned in individual patches
v2 - Split "arm/mpu: Provide access to the MPU region from the C code" into 4 patches.
v3 - Patches 1,2 are merged. Patch 3 is dropped.
v4 - Add R-b, A-b, T-b tags to the individual patches.
Ayan Kumar Halder (3):
arm/mpu: Move the functions to arm64 specific files arm/mpu: Define arm32 system registers
arm/mpu: Enable read/write to protection regions for arm32
xen/arch/arm/include/asm/mpu.h | 2 - xen/arch/arm/include/asm/mpu/cpregs.h | 68 ++++++++++- xen/arch/arm/mpu/Makefile | 2 + xen/arch/arm/mpu/arm32/Makefile | 1 + xen/arch/arm/mpu/arm32/mm.c | 164 ++++++++++++++++++++++++++ xen/arch/arm/mpu/arm64/Makefile | 1 + xen/arch/arm/mpu/arm64/mm.c | 130 ++++++++++++++++++++ xen/arch/arm/mpu/mm.c | 119 ------------------- 8 files changed, 365 insertions(+), 122 deletions(-) create mode 100644 xen/arch/arm/mpu/arm32/Makefile create mode 100644 xen/arch/arm/mpu/arm32/mm.c create mode 100644 xen/arch/arm/mpu/arm64/Makefile create mode 100644 xen/arch/arm/mpu/arm64/mm.c
Signature · 1 line
2.25.1
PATCH v5 1/3 arm/mpu: Move the functions to arm64 specific files
prepare_selector(), read_protection_region() and write_protection_region() differ significantly between arm32 and arm64. Thus, move these functions to their sub-arch specific folder.
Also the macro GENERATE_{WRITE/READ}_PR_REG_CASE are moved, in order to keep them in the same file of their usage and improve readability.
---
Changes from -
v2 - New patch introduced in v3.
v3 - 1. Add Luca's R-b.
v4 - 1. Reorder entries in mpu/Makefile alphabetically.
2. Add Michal's A-b.
xen/arch/arm/mpu/Makefile | 1 + xen/arch/arm/mpu/arm64/Makefile | 1 + xen/arch/arm/mpu/arm64/mm.c | 130 ++++++++++++++++++++++++++++++++ xen/arch/arm/mpu/mm.c | 117 ---------------------------- 4 files changed, 132 insertions(+), 117 deletions(-) create mode 100644 xen/arch/arm/mpu/arm64/Makefile create mode 100644 xen/arch/arm/mpu/arm64/mm.c
xen/arch/arm/mpu/Makefile +1 -0
@@ -1,3 +1,4 @@ +obj-$(CONFIG_ARM_64) += arm64/ obj-$(CONFIG_ARM_32) += domain-page.o obj-y += mm.o obj-y += p2m.o
xen/arch/arm/mpu/arm64/Makefile new file +1 -0
@@ -0,0 +1 @@ +obj-y += mm.o
xen/arch/arm/mpu/arm64/mm.c new file +130 -0
130 lines not on this page · raw message
xen/arch/arm/mpu/mm.c +0 -117
129 lines not on this page · raw message
Signature · 1 line
2.25.1
PATCH v5 2/3 arm/mpu: Define arm32 system registers
In reply to Ayan Kumar HalderFix the definition for HPRLAR.
Define the base/limit address registers to access the first 32 protection regions.
---
Changes from :-
v2 - New patch introduced in v3 (Extracted from "arm/mpu: Provide access to the MPU region from the C code").
v3 - Add Hari's R-b.
v4 - Add Michal's A-b.
xen/arch/arm/include/asm/mpu/cpregs.h | 68 ++++++++++++++++++++++++++- 1 file changed, 67 insertions(+), 1 deletion(-)
xen/arch/arm/include/asm/mpu/cpregs.h +67 -1
@@ -9,7 +9,73 @@/* CP15 CR6: MPU Protection Region Base/Limit/Select Address Register */ #define HPRSELR p15,4,c6,c2,1#define HPRBAR p15,4,c6,c3,0 -#define HPRLAR p15,4,c6,c8,1 +#define HPRLAR p15,4,c6,c3,1 + +/* CP15 CR6: MPU Protection Region Base/Limit Address Register */ +#define HPRBAR0 p15,4,c6,c8,0 +#define HPRLAR0 p15,4,c6,c8,1 +#define HPRBAR1 p15,4,c6,c8,4 +#define HPRLAR1 p15,4,c6,c8,5 +#define HPRBAR2 p15,4,c6,c9,0 +#define HPRLAR2 p15,4,c6,c9,1 +#define HPRBAR3 p15,4,c6,c9,4 +#define HPRLAR3 p15,4,c6,c9,5 +#define HPRBAR4 p15,4,c6,c10,0 +#define HPRLAR4 p15,4,c6,c10,1 +#define HPRBAR5 p15,4,c6,c10,4 +#define HPRLAR5 p15,4,c6,c10,5 +#define HPRBAR6 p15,4,c6,c11,0 +#define HPRLAR6 p15,4,c6,c11,1 +#define HPRBAR7 p15,4,c6,c11,4 +#define HPRLAR7 p15,4,c6,c11,5 +#define HPRBAR8 p15,4,c6,c12,0 +#define HPRLAR8 p15,4,c6,c12,1 +#define HPRBAR9 p15,4,c6,c12,4 +#define HPRLAR9 p15,4,c6,c12,5 +#define HPRBAR10 p15,4,c6,c13,0 +#define HPRLAR10 p15,4,c6,c13,1 +#define HPRBAR11 p15,4,c6,c13,4 +#define HPRLAR11 p15,4,c6,c13,5 +#define HPRBAR12 p15,4,c6,c14,0 +#define HPRLAR12 p15,4,c6,c14,1 +#define HPRBAR13 p15,4,c6,c14,4 +#define HPRLAR13 p15,4,c6,c14,5 +#define HPRBAR14 p15,4,c6,c15,0 +#define HPRLAR14 p15,4,c6,c15,1 +#define HPRBAR15 p15,4,c6,c15,4 +#define HPRLAR15 p15,4,c6,c15,5 +#define HPRBAR16 p15,5,c6,c8,0 +#define HPRLAR16 p15,5,c6,c8,1 +#define HPRBAR17 p15,5,c6,c8,4 +#define HPRLAR17 p15,5,c6,c8,5 +#define HPRBAR18 p15,5,c6,c9,0 +#define HPRLAR18 p15,5,c6,c9,1 +#define HPRBAR19 p15,5,c6,c9,4 +#define HPRLAR19 p15,5,c6,c9,5 +#define HPRBAR20 p15,5,c6,c10,0 +#define HPRLAR20 p15,5,c6,c10,1 +#define HPRBAR21 p15,5,c6,c10,4 +#define HPRLAR21 p15,5,c6,c10,5 +#define HPRBAR22 p15,5,c6,c11,0 +#define HPRLAR22 p15,5,c6,c11,1 +#define HPRBAR23 p15,5,c6,c11,4 +#define HPRLAR23 p15,5,c6,c11,5 +#define HPRBAR24 p15,5,c6,c12,0 +#define HPRLAR24 p15,5,c6,c12,1 +#define HPRBAR25 p15,5,c6,c12,4 +#define HPRLAR25 p15,5,c6,c12,5 +#define HPRBAR26 p15,5,c6,c13,0 +#define HPRLAR26 p15,5,c6,c13,1 +#define HPRBAR27 p15,5,c6,c13,4 +#define HPRLAR27 p15,5,c6,c13,5 +#define HPRBAR28 p15,5,c6,c14,0 +#define HPRLAR28 p15,5,c6,c14,1 +#define HPRBAR29 p15,5,c6,c14,4 +#define HPRLAR29 p15,5,c6,c14,5 +#define HPRBAR30 p15,5,c6,c15,0 +#define HPRLAR30 p15,5,c6,c15,1 +#define HPRBAR31 p15,5,c6,c15,4 +#define HPRLAR31 p15,5,c6,c15,5/* Aliases of AArch64 names for use in common code */ #ifdef CONFIG_ARM_32
Signature · 1 line
2.25.1
PATCH v5 3/3 arm/mpu: Enable read/write to protection regions for arm32
In reply to Ayan Kumar HalderDefine prepare_selector(), read_protection_region() and write_protection_region() for arm32. Also, define GENERATE_{READ/WRITE}_PR_REG_OTHERS to access MPU regions from 32 to 254.
Enable pr_{get/set}_{base/limit}(), region_is_valid() for arm32. Enable pr_of_addr() for arm32.
The maximum number of regions supported is 255 (which corresponds to the maximum value in HMPUIR).
---
Changes from :-
v1 - 1. Enable write_protection_region() for aarch32.
v2 - 1. Enable access to protection regions from 0 - 255.
v3 - 1. The maximum number of regions is 255. Thus, regions numbered 0 - 254 are supported.
2. prepare_selector() is modified to ensure HPRSELR is written when accessing any region beyond 31 and the current value differs from the region number to be accessed.
v4 - 1. Add R-b, A-b and T-b.
xen/arch/arm/include/asm/mpu.h | 2 - xen/arch/arm/mpu/Makefile | 1 + xen/arch/arm/mpu/arm32/Makefile | 1 + xen/arch/arm/mpu/arm32/mm.c | 164 ++++++++++++++++++++++++++++++++ xen/arch/arm/mpu/mm.c | 2 - 5 files changed, 166 insertions(+), 4 deletions(-) create mode 100644 xen/arch/arm/mpu/arm32/Makefile create mode 100644 xen/arch/arm/mpu/arm32/mm.c
xen/arch/arm/include/asm/mpu.h +0 -2
@@ -25,7 +25,6 @@#ifndef __ASSEMBLY__ -#ifdef CONFIG_ARM_64 /* * Set base address of MPU protection region. *
@@ -85,7 +84,6 @@ static inline bool region_is_valid(const pr_t *pr) {return pr->prlar.reg.en; } -#endif /* CONFIG_ARM_64 */ #endif /* __ASSEMBLY__ */
xen/arch/arm/mpu/Makefile +1 -0
@@ -1,3 +1,4 @@ +obj-$(CONFIG_ARM_32) += arm32/ obj-$(CONFIG_ARM_64) += arm64/ obj-$(CONFIG_ARM_32) += domain-page.o obj-y += mm.o
xen/arch/arm/mpu/arm32/Makefile new file +1 -0
@@ -0,0 +1 @@ +obj-y += mm.o
xen/arch/arm/mpu/arm32/mm.c new file +164 -0
164 lines not on this page · raw message
xen/arch/arm/mpu/mm.c +0 -2
@@ -39,7 +39,6 @@ static void __init __maybe_unused build_assertions(void)BUILD_BUG_ON (PAGE_SIZE !=SZ_4K ); } -#ifdef CONFIG_ARM_64 pr_t pr_of_addr (paddr_t base,paddr_t limit,unsigned int flags) {unsigned int attr_idx =PAGE_AI_MASK (flags);
@@ -110,7 +109,6 @@ pr_t pr_of_addr(paddr_t base, paddr_t limit, unsigned int flags)return region; } -#endif /* CONFIG_ARM_64 */ void __init setup_mm (void ) {
Signature · 1 line
2.25.1