ARM: mpu: add PMSA related registers and bitfields to existing headers

This patch adds the following definitions relevant to the PMSA:

Add SCTLR bit 17, (CR_BR - Background Region bit) to the list of CR_*
bitfields. This bit determines whether to use the architecturally defined
memory map

Add the MPUIR to the available registers when using read_cpuid macro. The
MPUIR is the MPU type register.

Signed-off-by: Jonathan Austin <jonathan.austin@arm.com>
Reviewed-by: Will Deacon <will.deacon@arm.com>
CC:"Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>

diff --git a/arch/arm/include/asm/cp15.h b/arch/arm/include/asm/cp15.h
index 1f3262e99d81e6e7be2bf3864b6649d32a39b0da..a524a23d862782ba48f77acf02c5934583b442f1 100644 (file)
--- a/arch/arm/include/asm/cp15.h
+++ b/arch/arm/include/asm/cp15.h
@@ -23,6 +23,11 @@
 #define CR_RR  (1 << 14)       /* Round Robin cache replacement        */
 #define CR_L4  (1 << 15)       /* LDR pc can set T bit                 */
 #define CR_DT  (1 << 16)
+#ifdef CONFIG_MMU
+#define CR_HA  (1 << 17)       /* Hardware management of Access Flag   */
+#else
+#define CR_BR  (1 << 17)       /* MPU Background region enable (PMSA)  */
+#endif
 #define CR_IT  (1 << 18)
 #define CR_ST  (1 << 19)
 #define CR_FI  (1 << 21)       /* Fast interrupt (lower latency mode)  */

diff --git a/arch/arm/include/asm/cputype.h b/arch/arm/include/asm/cputype.h
index ec635ff32f493d872a4aed9a488ba6a574c9eb29..3b704dfb6c58fa501d20b470e12f7bd5423f3e8e 100644 (file)
--- a/arch/arm/include/asm/cputype.h
+++ b/arch/arm/include/asm/cputype.h
@@ -8,6 +8,7 @@
 #define CPUID_CACHETYPE        1
 #define CPUID_TCM      2
 #define CPUID_TLBTYPE  3
+#define CPUID_MPUIR    4
 #define CPUID_MPIDR    5
 
 #ifdef CONFIG_CPU_V7M