Skip to contentSkip to conversation

Enable early bootup of Armv8-R AArch32 systems

PATCH Superseded Ayan Kumar Halder 5 participants 15 messages Apr 11, 2025 – Apr 14, 2025

v6 of 7 Superseded Latest is v7 →

lore
Share & tools
lore
#0 lore raw

v6 cover Enable early bootup of Armv8-R AArch32 systems

Enable early booting of Armv8-R AArch32 based systems.

Added Luca's R-b in all the patches.

Ayan Kumar Halder (3):
xen/arm: Move some of the functions to common file xen/arm32: Create the same boot-time MPU regions as arm64 xen/arm32: mpu: Stubs to build MPU for arm32

 xen/arch/arm/arm32/Makefile              |   1 +
 xen/arch/arm/arm32/mpu/Makefile          |   3 +
 xen/arch/arm/arm32/mpu/head.S            | 104 +++++++++++++++++++++++
 xen/arch/arm/arm32/mpu/p2m.c             |  19 +++++
 xen/arch/arm/arm32/mpu/smpboot.c         |  26 ++++++
 xen/arch/arm/arm64/mpu/head.S            |  78 +----------------
 xen/arch/arm/include/asm/arm32/sysregs.h |   9 ++
 xen/arch/arm/include/asm/arm64/sysregs.h |  13 +++
 xen/arch/arm/include/asm/cpregs.h        |   2 +
 xen/arch/arm/include/asm/mm.h            |   9 +-
 xen/arch/arm/include/asm/mmu/mm.h        |   7 ++
 xen/arch/arm/include/asm/mpu/cpregs.h    |  27 ++++++
 xen/arch/arm/include/asm/mpu/mm.h        |   5 ++
 xen/arch/arm/include/asm/mpu/regions.inc |  79 +++++++++++++++++
 xen/arch/arm/mpu/Makefile                |   1 +
 xen/arch/arm/mpu/domain_page.c           |  45 ++++++++++
 16 files changed, 343 insertions(+), 85 deletions(-)
 create mode 100644 xen/arch/arm/arm32/mpu/Makefile
 create mode 100644 xen/arch/arm/arm32/mpu/head.S
 create mode 100644 xen/arch/arm/arm32/mpu/p2m.c
 create mode 100644 xen/arch/arm/arm32/mpu/smpboot.c
 create mode 100644 xen/arch/arm/include/asm/mpu/cpregs.h
 create mode 100644 xen/arch/arm/include/asm/mpu/regions.inc
 create mode 100644 xen/arch/arm/mpu/domain_page.c
Signature · 1 line
2.25.1
#1 lore raw

PATCH v6 1/3 xen/arm: Move some of the functions to common file

regions.inc is added to hold the common earlyboot MPU regions configuration between arm64 and arm32.

prepare_xen_region, fail_insufficient_regions() will be used by both arm32 and arm64. Thus, they have been moved to regions.inc.

*_PRBAR are moved to arm64/sysregs.h.
*_PRLAR are moved to regions.inc as they are common between arm32 and arm64.

Introduce WRITE_SYSREG_ASM to write to the system registers from regions.inc.

---

Changes from

v1 -

1. enable_mpu() now sets HMAIR{0,1} registers. This is similar to what is being done in enable_mmu(). All the mm related configurations happen in this function.

2. Fixed some typos.

v2 -
1. Extracted the arm64 head.S functions/macros in a common file.

v3 -
1. Moved *_PRLAR are moved to prepare_xen_region.inc

2. enable_boot_cpu_mm() is preserved in mpu/head.S.

3. STORE_SYSREG is renamed as WRITE_SYSREG_ASM()

4. LOAD_SYSREG is removed.

5. No need to save/restore lr in enable_boot_cpu_mm(). IOW, keep it as it was in the original code.

v4 -
1. Rename prepare_xen_region.inc to common.inc

2. enable_secondary_cpu_mm() is moved back to mpu/head.S.

v5 -
1. Rename common.inc to regions.inc.

2. WRITE_SYSREG_ASM() in enclosed within #ifdef __ASSEMBLY__.

 xen/arch/arm/arm64/mpu/head.S            | 78 +----------------------
 xen/arch/arm/include/asm/arm64/sysregs.h | 13 ++++
 xen/arch/arm/include/asm/mpu/regions.inc | 79 ++++++++++++++++++++++++
 3 files changed, 93 insertions(+), 77 deletions(-)
 create mode 100644 xen/arch/arm/include/asm/mpu/regions.inc
xen/arch/arm/arm64/mpu/head.S +1 -77
index ed01993d85..6d336cafbb 100644
@@ -3,83 +3,7 @@
  * Start-of-day code for an Armv8-R MPU system.
  */
 
-#include <asm/early_printk.h>
-#include <asm/mpu.h>
-
-/* Backgroud region enable/disable */
-#define SCTLR_ELx_BR    BIT(17, UL)
-
-#define REGION_TEXT_PRBAR       0x38    /* SH=11 AP=10 XN=00 */
-#define REGION_RO_PRBAR         0x3A    /* SH=11 AP=10 XN=10 */
-#define REGION_DATA_PRBAR       0x32    /* SH=11 AP=00 XN=10 */
-#define REGION_DEVICE_PRBAR     0x22    /* SH=10 AP=00 XN=10 */
-
-#define REGION_NORMAL_PRLAR     0x0f    /* NS=0 ATTR=111 EN=1 */
-#define REGION_DEVICE_PRLAR     0x09    /* NS=0 ATTR=100 EN=1 */
-
-/*
- * Macro to prepare and set a EL2 MPU memory region.
- * We will also create an according MPU memory region entry, which
- * is a structure of pr_t,  in table \prmap.
- *
- * sel:         region selector
- * base:        reg storing base address
- * limit:       reg storing limit address
- * prbar:       store computed PRBAR_EL2 value
- * prlar:       store computed PRLAR_EL2 value
- * maxcount:    maximum number of EL2 regions supported
- * attr_prbar:  PRBAR_EL2-related memory attributes. If not specified it will be
- *              REGION_DATA_PRBAR
- * attr_prlar:  PRLAR_EL2-related memory attributes. If not specified it will be
- *              REGION_NORMAL_PRLAR
- *
- * Preserves \maxcount
- * Output:
- *  \sel: Next available region selector index.
- * Clobbers \base, \limit, \prbar, \prlar
- *
- * Note that all parameters using registers should be distinct.
- */
-.macro prepare_xen_region, sel, base, limit, prbar, prlar, maxcount, attr_prbar=REGION_DATA_PRBAR, attr_prlar=REGION_NORMAL_PRLAR
-    /* Check if the region is empty */
-    cmp   \base, \limit
-    beq   1f
-
-    /* Check if the number of regions exceeded the count specified in MPUIR_EL2 */
-    cmp   \sel, \maxcount
-    bge   fail_insufficient_regions
-
-    /* Prepare value for PRBAR_EL2 reg and preserve it in \prbar.*/
-    and   \base, \base, #MPU_REGION_MASK
-    mov   \prbar, #\attr_prbar
-    orr   \prbar, \prbar, \base
-
-    /* Limit address should be inclusive */
-    sub   \limit, \limit, #1
-    and   \limit, \limit, #MPU_REGION_MASK
-    mov   \prlar, #\attr_prlar
-    orr   \prlar, \prlar, \limit
-
-    msr   PRSELR_EL2, \sel
-    isb
-    msr   PRBAR_EL2, \prbar
-    msr   PRLAR_EL2, \prlar
-    dsb   sy
-    isb
-
-    add   \sel, \sel, #1
-
-1:
-.endm
-
-/*
- * Failure caused due to insufficient MPU regions.
- */
-FUNC_LOCAL(fail_insufficient_regions)
-    PRINT("- Selected MPU region is above the implemented number in MPUIR_EL2 -\r\n")
-1:  wfe
-    b   1b
-END(fail_insufficient_regions)
+#include <asm/mpu/regions.inc>
 
 /*
  * Enable EL2 MPU and data cache
xen/arch/arm/include/asm/arm64/sysregs.h +13 -0
index b593e4028b..dba0248c88 100644
@@ -462,6 +462,17 @@
 #define ZCR_ELx_LEN_SIZE             9
 #define ZCR_ELx_LEN_MASK             0x1ff
 
+#define REGION_TEXT_PRBAR       0x38    /* SH=11 AP=10 XN=00 */
+#define REGION_RO_PRBAR         0x3A    /* SH=11 AP=10 XN=10 */
+#define REGION_DATA_PRBAR       0x32    /* SH=11 AP=00 XN=10 */
+#define REGION_DEVICE_PRBAR     0x22    /* SH=10 AP=00 XN=10 */
+
+#ifdef __ASSEMBLY__
+
+#define WRITE_SYSREG_ASM(v, name) "msr " __stringify(name,) #v
+
+#else /* !__ASSEMBLY__ */
+
 /* Access to system registers */
 
 #define WRITE_SYSREG64(v, name) do {                    \
@@ -481,6 +492,8 @@
 #define WRITE_SYSREG_LR(v, index)  WRITE_SYSREG(v, ICH_LR_REG(index))
 #define READ_SYSREG_LR(index)      READ_SYSREG(ICH_LR_REG(index))
 
+#endif /* !__ASSEMBLY__ */
+
 #endif /* _ASM_ARM_ARM64_SYSREGS_H */
 
 /*
xen/arch/arm/include/asm/mpu/regions.inc new file +79 -0

79 lines not on this page · raw message

Signature · 1 line
2.25.1
Reviewed-by on v6 1/3
#2 lore raw

Re: [PATCH v6 1/3] xen/arm: Move some of the functions to common file

Quoted 1 line · Ayan Kumar Halder

regions.inc is added to hold the common earlyboot MPU regions configuration

NIT: I mentioned this a few times already. Please use imperative mood in commit msg.

Quoted 5 lines

between arm64 and arm32.

prepare_xen_region, fail_insufficient_regions() will be used by both arm32 and arm64. Thus, they have been moved to regions.inc.

Quoted 7 lines

*_PRBAR are moved to arm64/sysregs.h.
*_PRLAR are moved to regions.inc as they are common between arm32 and arm64.

Introduce WRITE_SYSREG_ASM to write to the system registers from regions.inc.

~Michal

#3 lore raw

Re: [PATCH v6 1/3] xen/arm: Move some of the functions to common file

In reply to Ayan Kumar Halder

Hi,

I will keep Michal's R-b with one small change.

Quoted 153 lines · Ayan Kumar Halder

regions.inc is added to hold the common earlyboot MPU regions configuration between arm64 and arm32.

prepare_xen_region, fail_insufficient_regions() will be used by both arm32 and arm64. Thus, they have been moved to regions.inc.

*_PRBAR are moved to arm64/sysregs.h.
*_PRLAR are moved to regions.inc as they are common between arm32 and arm64.

Introduce WRITE_SYSREG_ASM to write to the system registers from regions.inc.

---

Changes from

v1 -

1. enable_mpu() now sets HMAIR{0,1} registers. This is similar to what is being done in enable_mmu(). All the mm related configurations happen in this function.

2. Fixed some typos.

v2 -
1. Extracted the arm64 head.S functions/macros in a common file.

v3 -
1. Moved *_PRLAR are moved to prepare_xen_region.inc

2. enable_boot_cpu_mm() is preserved in mpu/head.S.

3. STORE_SYSREG is renamed as WRITE_SYSREG_ASM()

4. LOAD_SYSREG is removed.

5. No need to save/restore lr in enable_boot_cpu_mm(). IOW, keep it as it was in the original code.

v4 -
1. Rename prepare_xen_region.inc to common.inc

2. enable_secondary_cpu_mm() is moved back to mpu/head.S.

v5 -
1. Rename common.inc to regions.inc.

2. WRITE_SYSREG_ASM() in enclosed within #ifdef __ASSEMBLY__.

  xen/arch/arm/arm64/mpu/head.S            | 78 +----------------------
  xen/arch/arm/include/asm/arm64/sysregs.h | 13 ++++
  xen/arch/arm/include/asm/mpu/regions.inc | 79 ++++++++++++++++++++++++
  3 files changed, 93 insertions(+), 77 deletions(-)

create mode 100644 xen/arch/arm/include/asm/mpu/regions.inc

xen/arch/arm/arm64/mpu/head.S +1 -77
index ed01993d85..6d336cafbb 100644
@@ -3,83 +3,7 @@
   * Start-of-day code for an Armv8-R MPU system.
   */
 
-#include <asm/early_printk.h>
-#include <asm/mpu.h>
-
-/* Backgroud region enable/disable */
-#define SCTLR_ELx_BR    BIT(17, UL)
-
-#define REGION_TEXT_PRBAR       0x38    /* SH=11 AP=10 XN=00 */
-#define REGION_RO_PRBAR         0x3A    /* SH=11 AP=10 XN=10 */
-#define REGION_DATA_PRBAR       0x32    /* SH=11 AP=00 XN=10 */
-#define REGION_DEVICE_PRBAR     0x22    /* SH=10 AP=00 XN=10 */
-
-#define REGION_NORMAL_PRLAR     0x0f    /* NS=0 ATTR=111 EN=1 */
-#define REGION_DEVICE_PRLAR     0x09    /* NS=0 ATTR=100 EN=1 */
-
-/*
- * Macro to prepare and set a EL2 MPU memory region.
- * We will also create an according MPU memory region entry, which
- * is a structure of pr_t,  in table \prmap.
- *
- * sel:         region selector
- * base:        reg storing base address
- * limit:       reg storing limit address
- * prbar:       store computed PRBAR_EL2 value
- * prlar:       store computed PRLAR_EL2 value
- * maxcount:    maximum number of EL2 regions supported
- * attr_prbar:  PRBAR_EL2-related memory attributes. If not specified it will be
- *              REGION_DATA_PRBAR
- * attr_prlar:  PRLAR_EL2-related memory attributes. If not specified it will be
- *              REGION_NORMAL_PRLAR
- *
- * Preserves \maxcount
- * Output:
- *  \sel: Next available region selector index.
- * Clobbers \base, \limit, \prbar, \prlar
- *
- * Note that all parameters using registers should be distinct.
- */
-.macro prepare_xen_region, sel, base, limit, prbar, prlar, maxcount, attr_prbar=REGION_DATA_PRBAR, attr_prlar=REGION_NORMAL_PRLAR
-    /* Check if the region is empty */
-    cmp   \base, \limit
-    beq   1f
-
-    /* Check if the number of regions exceeded the count specified in MPUIR_EL2 */
-    cmp   \sel, \maxcount
-    bge   fail_insufficient_regions
-
-    /* Prepare value for PRBAR_EL2 reg and preserve it in \prbar.*/
-    and   \base, \base, #MPU_REGION_MASK
-    mov   \prbar, #\attr_prbar
-    orr   \prbar, \prbar, \base
-
-    /* Limit address should be inclusive */
-    sub   \limit, \limit, #1
-    and   \limit, \limit, #MPU_REGION_MASK
-    mov   \prlar, #\attr_prlar
-    orr   \prlar, \prlar, \limit
-
-    msr   PRSELR_EL2, \sel
-    isb
-    msr   PRBAR_EL2, \prbar
-    msr   PRLAR_EL2, \prlar
-    dsb   sy
-    isb
-
-    add   \sel, \sel, #1
-
-1:
-.endm
-
-/*
- * Failure caused due to insufficient MPU regions.
- */
-FUNC_LOCAL(fail_insufficient_regions)
-    PRINT("- Selected MPU region is above the implemented number in MPUIR_EL2 -\r\n")
-1:  wfe
-    b   1b
-END(fail_insufficient_regions)
+#include <asm/mpu/regions.inc>
 
  /*
   * Enable EL2 MPU and data cache
xen/arch/arm/include/asm/arm64/sysregs.h +0 -0
index b593e4028b..dba0248c88 100644
@@ -462,6 +462,17 @@
  #define ZCR_ELx_LEN_SIZE             9
  #define ZCR_ELx_LEN_MASK             0x1ff
 

xen/arch/arm/include/asm/arm64/sysregs.h line 474

Quoted 10 lines
xen/arch/arm/include/asm/arm64/sysregs.h +10 -0
+#define REGION_TEXT_PRBAR       0x38    /* SH=11 AP=10 XN=00 */
+#define REGION_RO_PRBAR         0x3A    /* SH=11 AP=10 XN=10 */
+#define REGION_DATA_PRBAR       0x32    /* SH=11 AP=00 XN=10 */
+#define REGION_DEVICE_PRBAR     0x22    /* SH=10 AP=00 XN=10 */
+
+#ifdef __ASSEMBLY__
+
+#define WRITE_SYSREG_ASM(v, name) "msr " __stringify(name,) #v
+
+#else /* !__ASSEMBLY__ */

change this to make it consistent as patch 2.

#else /* __ASSEMBLY__ */

- Ayan

#4 lore raw

PATCH v6 2/3 xen/arm32: Create the same boot-time MPU regions as arm64

In reply to Ayan Kumar Halder

Boot-time MPU protection regions (similar to Armv8-R AArch64) are created for Armv8-R AArch32.
Also, defined *_PRBAR macros for arm32. The only difference from arm64 is that XN is 1-bit for arm32.
Defined the system registers and macros in mpu/cpregs.h.

Introduced WRITE_SYSREG_ASM() to write to system registers in assembly.

---
Changes from

v1 -

1. enable_mpu() now sets HMAIR{0,1} registers. This is similar to what is being done in enable_mmu(). All the mm related configurations happen in this function.

2. Fixed some typos.

v2 -
1. Include the common prepare_xen_region.inc in head.S.

2. Define LOAD_SYSREG()/STORE_SYSREG() for arm32.

v3 -
1. Rename STORE_SYSREG() as WRITE_SYSREG_ASM()

2. enable_boot_cpu_mm() is defined in head.S

v4 -
1. *_PRBAR is moved to arm32/sysregs.h.

2. MPU specific CP15 system registers are defined in mpu/cpregs.h.

v5 -
1. WRITE_SYSREG_ASM is enclosed within #ifdef __ASSEMBLY__

2. enable_mpu() clobbers r0 only.

3. Definitions in mpu/cpregs.h in enclosed within ARM_32.

4. Removed some #ifdefs and style changes.

 xen/arch/arm/arm32/Makefile              |   1 +
 xen/arch/arm/arm32/mpu/Makefile          |   1 +
 xen/arch/arm/arm32/mpu/head.S            | 104 +++++++++++++++++++++++
 xen/arch/arm/include/asm/arm32/sysregs.h |   9 ++
 xen/arch/arm/include/asm/cpregs.h        |   2 +
 xen/arch/arm/include/asm/mpu/cpregs.h    |  27 ++++++
 6 files changed, 144 insertions(+)
 create mode 100644 xen/arch/arm/arm32/mpu/Makefile
 create mode 100644 xen/arch/arm/arm32/mpu/head.S
 create mode 100644 xen/arch/arm/include/asm/mpu/cpregs.h
xen/arch/arm/arm32/Makefile +1 -0
index 40a2b4803f..537969d753 100644
@@ -1,5 +1,6 @@
 obj-y += lib/
 obj-$(CONFIG_MMU) += mmu/
+obj-$(CONFIG_MPU) += mpu/
 
 obj-$(CONFIG_EARLY_PRINTK) += debug.o
 obj-y += domctl.o
xen/arch/arm/arm32/mpu/Makefile new file +1 -0
new file mode 100644
index 0000000000..3340058c08
@@ -0,0 +1 @@
+obj-y += head.o
xen/arch/arm/arm32/mpu/head.S new file +104 -0

104 lines not on this page · raw message

xen/arch/arm/include/asm/arm32/sysregs.h +9 -0
index 22871999af..8d7b95d982 100644
@@ -20,6 +20,15 @@
  * uses r0 as a placeholder register. */
 #define CMD_CP32(name...)      "mcr " __stringify(CP32(r0, name)) ";"
 
+#define REGION_TEXT_PRBAR       0x18    /* SH=11 AP=10 XN=0 */
+#define REGION_RO_PRBAR         0x1D    /* SH=11 AP=10 XN=1 */
+#define REGION_DATA_PRBAR       0x19    /* SH=11 AP=00 XN=1 */
+#define REGION_DEVICE_PRBAR     0x11    /* SH=10 AP=00 XN=1 */
+
+#ifdef __ASSEMBLY__
+#define WRITE_SYSREG_ASM(v, name) mcr CP32(v, name)
+#endif /* __ASSEMBLY__ */
+
 #ifndef __ASSEMBLY__
 
 /* C wrappers */
xen/arch/arm/include/asm/cpregs.h +2 -0
index aec9e8f329..a7503a190f 100644
@@ -1,6 +1,8 @@
 #ifndef __ASM_ARM_CPREGS_H
 #define __ASM_ARM_CPREGS_H
 
+#include <asm/mpu/cpregs.h>
+
 /*
  * AArch32 Co-processor registers.
  *
xen/arch/arm/include/asm/mpu/cpregs.h new file +27 -0
new file mode 100644
index 0000000000..e2f3b2264c
@@ -0,0 +1,27 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
+#ifndef __ASM_ARM_MPU_CPREGS_H
+#define __ASM_ARM_MPU_CPREGS_H
+
+#ifdef CONFIG_ARM_32
+
+/* CP15 CR0: MPU Type Register */
+#define HMPUIR          p15,4,c0,c0,4
+
+/* CP15 CR6: MPU Protection Region Base/Limit/Select Address Register */
+#define HPRSELR         p15,4,c6,c2,1
+#define PRBAR_EL2       p15,4,c6,c3,0
+#define PRLAR_EL2       p15,4,c6,c8,1
+
+#define MPUIR_EL2       HMPUIR
+#define PRSELR_EL2      HPRSELR
+
+#endif /* CONFIG_ARM_32 */
+#endif /* __ASM_ARM_MPU_CPREGS_H */
+
+/*
+ * Local variables:
+ * mode: ASM
+ * indent-tabs-mode: nil
+ * End:
+ */
Signature · 1 line
2.25.1
#5 lore raw

Re: [PATCH v6 2/3] xen/arm32: Create the same boot-time MPU regions as arm64

Quoted 7 lines · Ayan Kumar Halder

Boot-time MPU protection regions (similar to Armv8-R AArch64) are created for Armv8-R AArch32.
Also, defined *_PRBAR macros for arm32. The only difference from arm64 is that XN is 1-bit for arm32.
Defined the system registers and macros in mpu/cpregs.h.

Introduced WRITE_SYSREG_ASM() to write to system registers in assembly.

It really reads odd when you write what patch does in past tense.

Quoted 182 lines

---
Changes from

v1 -

1. enable_mpu() now sets HMAIR{0,1} registers. This is similar to what is being done in enable_mmu(). All the mm related configurations happen in this function.

2. Fixed some typos.

v2 -
1. Include the common prepare_xen_region.inc in head.S.

2. Define LOAD_SYSREG()/STORE_SYSREG() for arm32.

v3 -
1. Rename STORE_SYSREG() as WRITE_SYSREG_ASM()

2. enable_boot_cpu_mm() is defined in head.S

v4 -
1. *_PRBAR is moved to arm32/sysregs.h.

2. MPU specific CP15 system registers are defined in mpu/cpregs.h.

v5 -
1. WRITE_SYSREG_ASM is enclosed within #ifdef __ASSEMBLY__

2. enable_mpu() clobbers r0 only.

3. Definitions in mpu/cpregs.h in enclosed within ARM_32.

4. Removed some #ifdefs and style changes.

 xen/arch/arm/arm32/Makefile              |   1 +
 xen/arch/arm/arm32/mpu/Makefile          |   1 +
 xen/arch/arm/arm32/mpu/head.S            | 104 +++++++++++++++++++++++
 xen/arch/arm/include/asm/arm32/sysregs.h |   9 ++
 xen/arch/arm/include/asm/cpregs.h        |   2 +
 xen/arch/arm/include/asm/mpu/cpregs.h    |  27 ++++++
 6 files changed, 144 insertions(+)
 create mode 100644 xen/arch/arm/arm32/mpu/Makefile
 create mode 100644 xen/arch/arm/arm32/mpu/head.S
 create mode 100644 xen/arch/arm/include/asm/mpu/cpregs.h
xen/arch/arm/arm32/Makefile +1 -0
index 40a2b4803f..537969d753 100644
@@ -1,5 +1,6 @@
 obj-y += lib/
 obj-$(CONFIG_MMU) += mmu/
+obj-$(CONFIG_MPU) += mpu/
 
 obj-$(CONFIG_EARLY_PRINTK) += debug.o
 obj-y += domctl.o
xen/arch/arm/arm32/mpu/Makefile new file +1 -0
new file mode 100644
index 0000000000..3340058c08
@@ -0,0 +1 @@
+obj-y += head.o
xen/arch/arm/arm32/mpu/head.S new file +104 -0
new file mode 100644
index 0000000000..b2c5245e51
@@ -0,0 +1,104 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+/*
+ * Start-of-day code for an Armv8-R-AArch32 MPU system.
+ */
+
+#include <asm/arm32/macros.h>
+#include <asm/arm32/sysregs.h>
+#include <asm/cpregs.h>
+#include <asm/mpu.h>
+#include <asm/mpu/regions.inc>
+#include <asm/page.h>
+
+/*
+ * Set up the memory attribute type tables and enable EL2 MPU and data cache.
+ * If the Background region is enabled, then the MPU uses the default memory
+ * map as the Background region for generating the memory
+ * attributes when MPU is disabled.
+ * Since the default memory map of the Armv8-R AArch32 architecture is
+ * IMPLEMENTATION DEFINED, we intend to turn off the Background region here.
+ *
+ * Clobbers r0
+ */
+FUNC_LOCAL(enable_mpu)
+    /* Set up memory attribute type tables */
+    mov_w r0, MAIR0VAL
+    mcr   CP32(r0, HMAIR0)
+    mov_w r0, MAIR1VAL
+    mcr   CP32(r0, HMAIR1)
+
+    mrc   CP32(r0, HSCTLR)
+    bic   r0, r0, #SCTLR_ELx_BR       /* Disable Background region */
+    orr   r0, r0, #SCTLR_Axx_ELx_M    /* Enable MPU */
+    orr   r0, r0, #SCTLR_Axx_ELx_C    /* Enable D-cache */
+    mcr   CP32(r0, HSCTLR)
+    isb
+
+    ret
+END(enable_mpu)
+
+/*
+ * Maps the various sections of Xen (described in xen.lds.S) as different MPU
+ * regions.
+ *
+ * Clobbers r0 - r5
+ *
+ */
+FUNC(enable_boot_cpu_mm)
+    /* Get the number of regions specified in MPUIR_EL2 */
+    mrc   CP32(r5, MPUIR_EL2)
+    and   r5, r5, #NUM_MPU_REGIONS_MASK
+
+    /* x0: region sel */
+    mov   r0, #0
+    /* Xen text section. */
+    mov_w   r1, _stext
+    mov_w   r2, _etext
+    prepare_xen_region r0, r1, r2, r3, r4, r5, attr_prbar=REGION_TEXT_PRBAR
+
+    /* Xen read-only data section. */
+    mov_w   r1, _srodata
+    mov_w   r2, _erodata
+    prepare_xen_region r0, r1, r2, r3, r4, r5, attr_prbar=REGION_RO_PRBAR
+
+    /* Xen read-only after init and data section. (RW data) */
+    mov_w   r1, __ro_after_init_start
+    mov_w   r2, __init_begin
+    prepare_xen_region r0, r1, r2, r3, r4, r5
+
+    /* Xen code section. */
+    mov_w   r1, __init_begin
+    mov_w   r2, __init_data_begin
+    prepare_xen_region r0, r1, r2, r3, r4, r5, attr_prbar=REGION_TEXT_PRBAR
+
+    /* Xen data and BSS section. */
+    mov_w   r1, __init_data_begin
+    mov_w   r2, __bss_end
+    prepare_xen_region r0, r1, r2, r3, r4, r5
+
+#ifdef CONFIG_EARLY_PRINTK
+    /* Xen early UART section. */
+    mov_w   r1, CONFIG_EARLY_UART_BASE_ADDRESS
+    mov_w   r2, (CONFIG_EARLY_UART_BASE_ADDRESS + CONFIG_EARLY_UART_SIZE)
+    prepare_xen_region r0, r1, r2, r3, r4, r5, attr_prbar=REGION_DEVICE_PRBAR, attr_prlar=REGION_DEVICE_PRLAR
+#endif
+
+    b    enable_mpu
+END(enable_boot_cpu_mm)
+
+/*
+ * We don't yet support secondary CPUs bring-up. Implement a dummy helper to
+ * please the common code.
+ */
+FUNC(enable_secondary_cpu_mm)
+    PRINT("- SMP not enabled yet -\r\n")
+1:  wfe
+    b 1b
+END(enable_secondary_cpu_mm)
+
+/*
+ * Local variables:
+ * mode: ASM
+ * indent-tabs-mode: nil
+ * End:
+ */
xen/arch/arm/include/asm/arm32/sysregs.h +0 -0
index 22871999af..8d7b95d982 100644

xen/arch/arm/include/asm/arm32/sysregs.h line 28

Quoted 9 lines
xen/arch/arm/include/asm/arm32/sysregs.h +6 -0
@@ -20,6 +20,15 @@
  * uses r0 as a placeholder register. */
 #define CMD_CP32(name...)      "mcr " __stringify(CP32(r0, name)) ";"
 
+#define REGION_TEXT_PRBAR       0x18    /* SH=11 AP=10 XN=0 */
+#define REGION_RO_PRBAR         0x1D    /* SH=11 AP=10 XN=1 */
+#define REGION_DATA_PRBAR       0x19    /* SH=11 AP=00 XN=1 */
+#define REGION_DEVICE_PRBAR     0x11    /* SH=10 AP=00 XN=1 */
+
+#ifdef __ASSEMBLY__

In previous patch, you had empty lines surrounding the macro.

xen/arch/arm/include/asm/arm32/sysregs.h line 29

Quoted 1 line
xen/arch/arm/include/asm/arm32/sysregs.h +1 -0
+#define WRITE_SYSREG_ASM(v, name) mcr CP32(v, name)

Hmm, for arm64 you surrounded msr within "". Any reason for these style changes?

xen/arch/arm/include/asm/arm32/sysregs.h line 30

Quoted 1 line
xen/arch/arm/include/asm/arm32/sysregs.h +1 -0
+#endif /* __ASSEMBLY__ */

Why #endif given ...

xen/arch/arm/include/asm/arm32/sysregs.h line 32

Quoted 2 lines
xen/arch/arm/include/asm/arm32/sysregs.h +1 -0
+
 #ifndef __ASSEMBLY__

this one?

Quoted 21 lines
xen/arch/arm/include/asm/arm32/sysregs.h +0 -0
 /* C wrappers */
xen/arch/arm/include/asm/cpregs.h +2 -0
index aec9e8f329..a7503a190f 100644
@@ -1,6 +1,8 @@
 #ifndef __ASM_ARM_CPREGS_H
 #define __ASM_ARM_CPREGS_H
 
+#include <asm/mpu/cpregs.h>
+
 /*
  * AArch32 Co-processor registers.
  *
xen/arch/arm/include/asm/mpu/cpregs.h new file +0 -0
new file mode 100644
index 0000000000..e2f3b2264c

xen/arch/arm/include/asm/mpu/cpregs.h line 3

Quoted 3 lines
xen/arch/arm/include/asm/mpu/cpregs.h new file +3 -0
@@ -0,0 +1,27 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
+#ifndef __ASM_ARM_MPU_CPREGS_H

There are already 4 header files in this directory. Why don't you look at them to get a hint as for naming the header guards? You don't need ASM here.

xen/arch/arm/include/asm/mpu/cpregs.h line 6

Quoted 3 lines
xen/arch/arm/include/asm/mpu/cpregs.h new file +3 -0
+#define __ASM_ARM_MPU_CPREGS_H
+
+#ifdef CONFIG_ARM_32

If you look at cpregs.h, we only use #ifdef CONFIG_ARM_32 to protect aliases. I'd prefer to follow the same rules here.

xen/arch/arm/include/asm/mpu/cpregs.h line 19

Quoted 13 lines
xen/arch/arm/include/asm/mpu/cpregs.h new file +13 -0
+
+/* CP15 CR0: MPU Type Register */
+#define HMPUIR          p15,4,c0,c0,4
+
+/* CP15 CR6: MPU Protection Region Base/Limit/Select Address Register */
+#define HPRSELR         p15,4,c6,c2,1
+#define PRBAR_EL2       p15,4,c6,c3,0
+#define PRLAR_EL2       p15,4,c6,c8,1
+
+#define MPUIR_EL2       HMPUIR
+#define PRSELR_EL2      HPRSELR
+
+#endif /* CONFIG_ARM_32 */

Emtpy line here

xen/arch/arm/include/asm/mpu/cpregs.h line 24

Quoted 5 lines
xen/arch/arm/include/asm/mpu/cpregs.h new file +5 -0
+#endif /* __ASM_ARM_MPU_CPREGS_H */
+
+/*
+ * Local variables:
+ * mode: ASM

This is not ASM file.

~Michal

#6 lore raw

Re: [PATCH v6 2/3] xen/arm32: Create the same boot-time MPU regions as arm64

Hi Michal,

Quoted 10 lines · Michal
Quoted 7 lines · Ayan Kumar Halder

Boot-time MPU protection regions (similar to Armv8-R AArch64) are created for Armv8-R AArch32.
Also, defined *_PRBAR macros for arm32. The only difference from arm64 is that XN is 1-bit for arm32.
Defined the system registers and macros in mpu/cpregs.h.

Introduced WRITE_SYSREG_ASM() to write to system registers in assembly.

It really reads odd when you write what patch does in past tense.

I will change it.

Quoted 185 lines
Quoted 185 lines

---
Changes from

v1 -

1. enable_mpu() now sets HMAIR{0,1} registers. This is similar to what is being done in enable_mmu(). All the mm related configurations happen in this function.

2. Fixed some typos.

v2 -
1. Include the common prepare_xen_region.inc in head.S.

2. Define LOAD_SYSREG()/STORE_SYSREG() for arm32.

v3 -
1. Rename STORE_SYSREG() as WRITE_SYSREG_ASM()

2. enable_boot_cpu_mm() is defined in head.S

v4 -
1. *_PRBAR is moved to arm32/sysregs.h.

2. MPU specific CP15 system registers are defined in mpu/cpregs.h.

v5 -
1. WRITE_SYSREG_ASM is enclosed within #ifdef __ASSEMBLY__

2. enable_mpu() clobbers r0 only.

3. Definitions in mpu/cpregs.h in enclosed within ARM_32.

4. Removed some #ifdefs and style changes.

  xen/arch/arm/arm32/Makefile              |   1 +
  xen/arch/arm/arm32/mpu/Makefile          |   1 +
  xen/arch/arm/arm32/mpu/head.S            | 104 +++++++++++++++++++++++
  xen/arch/arm/include/asm/arm32/sysregs.h |   9 ++
  xen/arch/arm/include/asm/cpregs.h        |   2 +
  xen/arch/arm/include/asm/mpu/cpregs.h    |  27 ++++++
  6 files changed, 144 insertions(+)

create mode 100644 xen/arch/arm/arm32/mpu/Makefile create mode 100644 xen/arch/arm/arm32/mpu/head.S create mode 100644 xen/arch/arm/include/asm/mpu/cpregs.h

xen/arch/arm/arm32/Makefile +1 -0
index 40a2b4803f..537969d753 100644
@@ -1,5 +1,6 @@
  obj-y += lib/
  obj-$(CONFIG_MMU) += mmu/
+obj-$(CONFIG_MPU) += mpu/
 
  obj-$(CONFIG_EARLY_PRINTK) += debug.o
  obj-y += domctl.o
xen/arch/arm/arm32/mpu/Makefile new file +1 -0
new file mode 100644
index 0000000000..3340058c08
@@ -0,0 +1 @@
+obj-y += head.o
xen/arch/arm/arm32/mpu/head.S new file +104 -0
new file mode 100644
index 0000000000..b2c5245e51
@@ -0,0 +1,104 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+/*
+ * Start-of-day code for an Armv8-R-AArch32 MPU system.
+ */
+
+#include <asm/arm32/macros.h>
+#include <asm/arm32/sysregs.h>
+#include <asm/cpregs.h>
+#include <asm/mpu.h>
+#include <asm/mpu/regions.inc>
+#include <asm/page.h>
+
+/*
+ * Set up the memory attribute type tables and enable EL2 MPU and data cache.
+ * If the Background region is enabled, then the MPU uses the default memory
+ * map as the Background region for generating the memory
+ * attributes when MPU is disabled.
+ * Since the default memory map of the Armv8-R AArch32 architecture is
+ * IMPLEMENTATION DEFINED, we intend to turn off the Background region here.
+ *
+ * Clobbers r0
+ */
+FUNC_LOCAL(enable_mpu)
+    /* Set up memory attribute type tables */
+    mov_w r0, MAIR0VAL
+    mcr   CP32(r0, HMAIR0)
+    mov_w r0, MAIR1VAL
+    mcr   CP32(r0, HMAIR1)
+
+    mrc   CP32(r0, HSCTLR)
+    bic   r0, r0, #SCTLR_ELx_BR       /* Disable Background region */
+    orr   r0, r0, #SCTLR_Axx_ELx_M    /* Enable MPU */
+    orr   r0, r0, #SCTLR_Axx_ELx_C    /* Enable D-cache */
+    mcr   CP32(r0, HSCTLR)
+    isb
+
+    ret
+END(enable_mpu)
+
+/*
+ * Maps the various sections of Xen (described in xen.lds.S) as different MPU
+ * regions.
+ *
+ * Clobbers r0 - r5
+ *
+ */
+FUNC(enable_boot_cpu_mm)
+    /* Get the number of regions specified in MPUIR_EL2 */
+    mrc   CP32(r5, MPUIR_EL2)
+    and   r5, r5, #NUM_MPU_REGIONS_MASK
+
+    /* x0: region sel */
+    mov   r0, #0
+    /* Xen text section. */
+    mov_w   r1, _stext
+    mov_w   r2, _etext
+    prepare_xen_region r0, r1, r2, r3, r4, r5, attr_prbar=REGION_TEXT_PRBAR
+
+    /* Xen read-only data section. */
+    mov_w   r1, _srodata
+    mov_w   r2, _erodata
+    prepare_xen_region r0, r1, r2, r3, r4, r5, attr_prbar=REGION_RO_PRBAR
+
+    /* Xen read-only after init and data section. (RW data) */
+    mov_w   r1, __ro_after_init_start
+    mov_w   r2, __init_begin
+    prepare_xen_region r0, r1, r2, r3, r4, r5
+
+    /* Xen code section. */
+    mov_w   r1, __init_begin
+    mov_w   r2, __init_data_begin
+    prepare_xen_region r0, r1, r2, r3, r4, r5, attr_prbar=REGION_TEXT_PRBAR
+
+    /* Xen data and BSS section. */
+    mov_w   r1, __init_data_begin
+    mov_w   r2, __bss_end
+    prepare_xen_region r0, r1, r2, r3, r4, r5
+
+#ifdef CONFIG_EARLY_PRINTK
+    /* Xen early UART section. */
+    mov_w   r1, CONFIG_EARLY_UART_BASE_ADDRESS
+    mov_w   r2, (CONFIG_EARLY_UART_BASE_ADDRESS + CONFIG_EARLY_UART_SIZE)
+    prepare_xen_region r0, r1, r2, r3, r4, r5, attr_prbar=REGION_DEVICE_PRBAR, attr_prlar=REGION_DEVICE_PRLAR
+#endif
+
+    b    enable_mpu
+END(enable_boot_cpu_mm)
+
+/*
+ * We don't yet support secondary CPUs bring-up. Implement a dummy helper to
+ * please the common code.
+ */
+FUNC(enable_secondary_cpu_mm)
+    PRINT("- SMP not enabled yet -\r\n")
+1:  wfe
+    b 1b
+END(enable_secondary_cpu_mm)
+
+/*
+ * Local variables:
+ * mode: ASM
+ * indent-tabs-mode: nil
+ * End:
+ */
xen/arch/arm/include/asm/arm32/sysregs.h +0 -0
index 22871999af..8d7b95d982 100644
@@ -20,6 +20,15 @@
   * uses r0 as a placeholder register. */
  #define CMD_CP32(name...)      "mcr " __stringify(CP32(r0, name)) ";"
 
Quoted 7 lines

xen/arch/arm/include/asm/arm32/sysregs.h line 28

Quoted 6 lines
xen/arch/arm/include/asm/arm32/sysregs.h +6 -0
+#define REGION_TEXT_PRBAR       0x18    /* SH=11 AP=10 XN=0 */
+#define REGION_RO_PRBAR         0x1D    /* SH=11 AP=10 XN=1 */
+#define REGION_DATA_PRBAR       0x19    /* SH=11 AP=00 XN=1 */
+#define REGION_DEVICE_PRBAR     0x11    /* SH=10 AP=00 XN=1 */
+
+#ifdef __ASSEMBLY__

In previous patch, you had empty lines surrounding the macro.

I will put a empty line here.

Quoted 3 lines

xen/arch/arm/include/asm/arm32/sysregs.h line 29

Quoted 2 lines
xen/arch/arm/include/asm/arm32/sysregs.h +1 -0
+#define WRITE_SYSREG_ASM(v, name) mcr CP32(v, name)

Hmm, for arm64 you surrounded msr within "". Any reason for these style changes?

In arm64, it is

"msr " __stringify(name,) #v

One needs " " to treat this as string for concatenation. Otherwise, we get an error.

In the case of arm32, we don't need __stringify().

Let me know if it makes sense.

Quoted 3 lines

xen/arch/arm/include/asm/arm32/sysregs.h line 30

Quoted 2 lines
xen/arch/arm/include/asm/arm32/sysregs.h +1 -0
+#endif /* __ASSEMBLY__ */

Why #endif given ...

#else /* __ASSEMBLY__ */

Quoted 4 lines

xen/arch/arm/include/asm/arm32/sysregs.h line 32

Quoted 3 lines
xen/arch/arm/include/asm/arm32/sysregs.h +1 -0
+
  #ifndef __ASSEMBLY__

this one?

remove this.

Quoted 11 lines
Quoted 11 lines
xen/arch/arm/include/asm/arm32/sysregs.h +0 -0
  /* C wrappers */
xen/arch/arm/include/asm/cpregs.h +0 -0
index aec9e8f329..a7503a190f 100644
@@ -1,6 +1,8 @@
  #ifndef __ASM_ARM_CPREGS_H
  #define __ASM_ARM_CPREGS_H
 
Quoted 16 lines
Quoted 11 lines
xen/arch/arm/include/asm/cpregs.h +2 -0
+#include <asm/mpu/cpregs.h>
+
  /*
   * AArch32 Co-processor registers.
   *
xen/arch/arm/include/asm/mpu/cpregs.h new file +0 -0
new file mode 100644
index 0000000000..e2f3b2264c

xen/arch/arm/include/asm/mpu/cpregs.h line 3

Quoted 3 lines
xen/arch/arm/include/asm/mpu/cpregs.h new file +3 -0
@@ -0,0 +1,27 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
+#ifndef __ASM_ARM_MPU_CPREGS_H

There are already 4 header files in this directory. Why don't you look at them to get a hint as for naming the header guards? You don't need ASM here.

Yes, this should be

__ARM_MPU_CPREGS_H

Quoted 6 lines

xen/arch/arm/include/asm/mpu/cpregs.h line 6

Quoted 4 lines
xen/arch/arm/include/asm/mpu/cpregs.h new file +3 -0
+#define __ASM_ARM_MPU_CPREGS_H
+
+#ifdef CONFIG_ARM_32

If you look at cpregs.h, we only use #ifdef CONFIG_ARM_32 to protect aliases. I'd prefer to follow the same rules here.

ok.

Quoted 15 lines
Quoted 4 lines
xen/arch/arm/include/asm/mpu/cpregs.h new file +3 -0
+
+/* CP15 CR0: MPU Type Register */
+#define HMPUIR          p15,4,c0,c0,4

xen/arch/arm/include/asm/mpu/cpregs.h line 19

Quoted 10 lines
xen/arch/arm/include/asm/mpu/cpregs.h new file +10 -0
+
+/* CP15 CR6: MPU Protection Region Base/Limit/Select Address Register */
+#define HPRSELR         p15,4,c6,c2,1
+#define PRBAR_EL2       p15,4,c6,c3,0
+#define PRLAR_EL2       p15,4,c6,c8,1
+
+#define MPUIR_EL2       HMPUIR
+#define PRSELR_EL2      HPRSELR
+
+#endif /* CONFIG_ARM_32 */

Emtpy line here

ok

Quoted 7 lines

xen/arch/arm/include/asm/mpu/cpregs.h line 24

Quoted 6 lines
xen/arch/arm/include/asm/mpu/cpregs.h new file +5 -0
+#endif /* __ASM_ARM_MPU_CPREGS_H */
+
+/*
+ * Local variables:
+ * mode: ASM

This is not ASM file.

Ack

- Ayan

Quoted 3 lines

~Michal

#7 lore raw

Re: [PATCH v6 2/3] xen/arm32: Create the same boot-time MPU regions as arm64

Quoted 213 lines · Ayan Kumar Halder

Hi Michal,

Quoted 10 lines · Michal
Quoted 7 lines · Ayan Kumar Halder

Boot-time MPU protection regions (similar to Armv8-R AArch64) are created for Armv8-R AArch32.
Also, defined *_PRBAR macros for arm32. The only difference from arm64 is that XN is 1-bit for arm32.
Defined the system registers and macros in mpu/cpregs.h.

Introduced WRITE_SYSREG_ASM() to write to system registers in assembly.

It really reads odd when you write what patch does in past tense.

I will change it.

Quoted 185 lines
Quoted 185 lines

---
Changes from

v1 -

1. enable_mpu() now sets HMAIR{0,1} registers. This is similar to what is being done in enable_mmu(). All the mm related configurations happen in this function.

2. Fixed some typos.

v2 -
1. Include the common prepare_xen_region.inc in head.S.

2. Define LOAD_SYSREG()/STORE_SYSREG() for arm32.

v3 -
1. Rename STORE_SYSREG() as WRITE_SYSREG_ASM()

2. enable_boot_cpu_mm() is defined in head.S

v4 -
1. *_PRBAR is moved to arm32/sysregs.h.

2. MPU specific CP15 system registers are defined in mpu/cpregs.h.

v5 -
1. WRITE_SYSREG_ASM is enclosed within #ifdef __ASSEMBLY__

2. enable_mpu() clobbers r0 only.

3. Definitions in mpu/cpregs.h in enclosed within ARM_32.

4. Removed some #ifdefs and style changes.

  xen/arch/arm/arm32/Makefile              |   1 +
  xen/arch/arm/arm32/mpu/Makefile          |   1 +
  xen/arch/arm/arm32/mpu/head.S            | 104 +++++++++++++++++++++++
  xen/arch/arm/include/asm/arm32/sysregs.h |   9 ++
  xen/arch/arm/include/asm/cpregs.h        |   2 +
  xen/arch/arm/include/asm/mpu/cpregs.h    |  27 ++++++
  6 files changed, 144 insertions(+)

create mode 100644 xen/arch/arm/arm32/mpu/Makefile create mode 100644 xen/arch/arm/arm32/mpu/head.S create mode 100644 xen/arch/arm/include/asm/mpu/cpregs.h

xen/arch/arm/arm32/Makefile +1 -0
index 40a2b4803f..537969d753 100644
@@ -1,5 +1,6 @@
  obj-y += lib/
  obj-$(CONFIG_MMU) += mmu/
+obj-$(CONFIG_MPU) += mpu/
 
  obj-$(CONFIG_EARLY_PRINTK) += debug.o
  obj-y += domctl.o
xen/arch/arm/arm32/mpu/Makefile new file +1 -0
new file mode 100644
index 0000000000..3340058c08
@@ -0,0 +1 @@
+obj-y += head.o
xen/arch/arm/arm32/mpu/head.S new file +104 -0
new file mode 100644
index 0000000000..b2c5245e51
@@ -0,0 +1,104 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+/*
+ * Start-of-day code for an Armv8-R-AArch32 MPU system.
+ */
+
+#include <asm/arm32/macros.h>
+#include <asm/arm32/sysregs.h>
+#include <asm/cpregs.h>
+#include <asm/mpu.h>
+#include <asm/mpu/regions.inc>
+#include <asm/page.h>
+
+/*
+ * Set up the memory attribute type tables and enable EL2 MPU and data cache.
+ * If the Background region is enabled, then the MPU uses the default memory
+ * map as the Background region for generating the memory
+ * attributes when MPU is disabled.
+ * Since the default memory map of the Armv8-R AArch32 architecture is
+ * IMPLEMENTATION DEFINED, we intend to turn off the Background region here.
+ *
+ * Clobbers r0
+ */
+FUNC_LOCAL(enable_mpu)
+    /* Set up memory attribute type tables */
+    mov_w r0, MAIR0VAL
+    mcr   CP32(r0, HMAIR0)
+    mov_w r0, MAIR1VAL
+    mcr   CP32(r0, HMAIR1)
+
+    mrc   CP32(r0, HSCTLR)
+    bic   r0, r0, #SCTLR_ELx_BR       /* Disable Background region */
+    orr   r0, r0, #SCTLR_Axx_ELx_M    /* Enable MPU */
+    orr   r0, r0, #SCTLR_Axx_ELx_C    /* Enable D-cache */
+    mcr   CP32(r0, HSCTLR)
+    isb
+
+    ret
+END(enable_mpu)
+
+/*
+ * Maps the various sections of Xen (described in xen.lds.S) as different MPU
+ * regions.
+ *
+ * Clobbers r0 - r5
+ *
+ */
+FUNC(enable_boot_cpu_mm)
+    /* Get the number of regions specified in MPUIR_EL2 */
+    mrc   CP32(r5, MPUIR_EL2)
+    and   r5, r5, #NUM_MPU_REGIONS_MASK
+
+    /* x0: region sel */
+    mov   r0, #0
+    /* Xen text section. */
+    mov_w   r1, _stext
+    mov_w   r2, _etext
+    prepare_xen_region r0, r1, r2, r3, r4, r5, attr_prbar=REGION_TEXT_PRBAR
+
+    /* Xen read-only data section. */
+    mov_w   r1, _srodata
+    mov_w   r2, _erodata
+    prepare_xen_region r0, r1, r2, r3, r4, r5, attr_prbar=REGION_RO_PRBAR
+
+    /* Xen read-only after init and data section. (RW data) */
+    mov_w   r1, __ro_after_init_start
+    mov_w   r2, __init_begin
+    prepare_xen_region r0, r1, r2, r3, r4, r5
+
+    /* Xen code section. */
+    mov_w   r1, __init_begin
+    mov_w   r2, __init_data_begin
+    prepare_xen_region r0, r1, r2, r3, r4, r5, attr_prbar=REGION_TEXT_PRBAR
+
+    /* Xen data and BSS section. */
+    mov_w   r1, __init_data_begin
+    mov_w   r2, __bss_end
+    prepare_xen_region r0, r1, r2, r3, r4, r5
+
+#ifdef CONFIG_EARLY_PRINTK
+    /* Xen early UART section. */
+    mov_w   r1, CONFIG_EARLY_UART_BASE_ADDRESS
+    mov_w   r2, (CONFIG_EARLY_UART_BASE_ADDRESS + CONFIG_EARLY_UART_SIZE)
+    prepare_xen_region r0, r1, r2, r3, r4, r5, attr_prbar=REGION_DEVICE_PRBAR, attr_prlar=REGION_DEVICE_PRLAR
+#endif
+
+    b    enable_mpu
+END(enable_boot_cpu_mm)
+
+/*
+ * We don't yet support secondary CPUs bring-up. Implement a dummy helper to
+ * please the common code.
+ */
+FUNC(enable_secondary_cpu_mm)
+    PRINT("- SMP not enabled yet -\r\n")
+1:  wfe
+    b 1b
+END(enable_secondary_cpu_mm)
+
+/*
+ * Local variables:
+ * mode: ASM
+ * indent-tabs-mode: nil
+ * End:
+ */
xen/arch/arm/include/asm/arm32/sysregs.h +0 -0
index 22871999af..8d7b95d982 100644
@@ -20,6 +20,15 @@
   * uses r0 as a placeholder register. */
  #define CMD_CP32(name...)      "mcr " __stringify(CP32(r0, name)) ";"
 
Quoted 7 lines

xen/arch/arm/include/asm/arm32/sysregs.h line 28

Quoted 6 lines
xen/arch/arm/include/asm/arm32/sysregs.h +6 -0
+#define REGION_TEXT_PRBAR       0x18    /* SH=11 AP=10 XN=0 */
+#define REGION_RO_PRBAR         0x1D    /* SH=11 AP=10 XN=1 */
+#define REGION_DATA_PRBAR       0x19    /* SH=11 AP=00 XN=1 */
+#define REGION_DEVICE_PRBAR     0x11    /* SH=10 AP=00 XN=1 */
+
+#ifdef __ASSEMBLY__

In previous patch, you had empty lines surrounding the macro.

I will put a empty line here.

Quoted 3 lines

xen/arch/arm/include/asm/arm32/sysregs.h line 29

Quoted 2 lines
xen/arch/arm/include/asm/arm32/sysregs.h +1 -0
+#define WRITE_SYSREG_ASM(v, name) mcr CP32(v, name)

Hmm, for arm64 you surrounded msr within "". Any reason for these style changes?

In arm64, it is

Quoted 8 lines

"msr " __stringify(name,) #v

One needs " " to treat this as string for concatenation. Otherwise, we get an error.

In the case of arm32, we don't need __stringify().

Let me know if it makes sense.

It does. Thanks for providing the reasoning.

~Michal

#8 lore raw

Re: [PATCH v6 2/3] xen/arm32: Create the same boot-time MPU regions as arm64

In reply to Ayan Kumar Halder

Hi Ayan,

Quoted 25 lines · Ayan Kumar Halder
xen/arch/arm/include/asm/arm32/sysregs.h +9 -0
index 22871999af..8d7b95d982 100644
@@ -20,6 +20,15 @@
   * uses r0 as a placeholder register. */
  #define CMD_CP32(name...)      "mcr " __stringify(CP32(r0, name)) ";"
 
+#define REGION_TEXT_PRBAR       0x18    /* SH=11 AP=10 XN=0 */
+#define REGION_RO_PRBAR         0x1D    /* SH=11 AP=10 XN=1 */
+#define REGION_DATA_PRBAR       0x19    /* SH=11 AP=00 XN=1 */
+#define REGION_DEVICE_PRBAR     0x11    /* SH=10 AP=00 XN=1 */
+
+#ifdef __ASSEMBLY__
+#define WRITE_SYSREG_ASM(v, name) mcr CP32(v, name)
+#endif /* __ASSEMBLY__ */
+
  #ifndef __ASSEMBLY__
 
  /* C wrappers */
xen/arch/arm/include/asm/cpregs.h +0 -0
index aec9e8f329..a7503a190f 100644

xen/arch/arm/include/asm/cpregs.h line 4

Quoted 4 lines
xen/arch/arm/include/asm/cpregs.h +1 -0
@@ -1,6 +1,8 @@
  #ifndef __ASM_ARM_CPREGS_H
  #define __ASM_ARM_CPREGS_H
 
+#include <asm/mpu/cpregs.h>

Just to confirm, the CP registers used by the MPU will never be used for an other purpose on MMU systems, is that correct?

xen/arch/arm/include/asm/mpu/cpregs.h line 6

Quoted 12 lines
xen/arch/arm/include/asm/mpu/cpregs.h new file +6 -0
new file mode 100644
index 0000000000..e2f3b2264c
@@ -0,0 +1,27 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
+#ifndef __ASM_ARM_MPU_CPREGS_H
+#define __ASM_ARM_MPU_CPREGS_H
+
+#ifdef CONFIG_ARM_32

I am not sure I agree with the placement of this ifdef. Is the implication that 32-bit domain will never be supported on arm64? If not, then everything but the aliases should be available for 64-bit (like we already do in asm/cpregs.h).

xen/arch/arm/include/asm/mpu/cpregs.h line 14

Quoted 8 lines
xen/arch/arm/include/asm/mpu/cpregs.h new file +8 -0
+
+/* CP15 CR0: MPU Type Register */
+#define HMPUIR          p15,4,c0,c0,4
+
+/* CP15 CR6: MPU Protection Region Base/Limit/Select Address Register */
+#define HPRSELR         p15,4,c6,c2,1
+#define PRBAR_EL2       p15,4,c6,c3,0
+#define PRLAR_EL2       p15,4,c6,c8,1

I am a little bit surprised the registers have _EL2 in their name. By any chance are you using the aarch64 naming? If so, please provide the 32-bit name and add an alias below.

xen/arch/arm/include/asm/mpu/cpregs.h line 17

Quoted 3 lines
xen/arch/arm/include/asm/mpu/cpregs.h new file +3 -0
+
+#define MPUIR_EL2       HMPUIR
+#define PRSELR_EL2      HPRSELR

Please add a comment on top explaining why we have the aliases (see in cpregs.h).

xen/arch/arm/include/asm/mpu/cpregs.h line 27

Quoted 10 lines
xen/arch/arm/include/asm/mpu/cpregs.h new file +10 -0
+
+#endif /* CONFIG_ARM_32 */
+#endif /* __ASM_ARM_MPU_CPREGS_H */
+
+/*
+ * Local variables:
+ * mode: ASM
+ * indent-tabs-mode: nil
+ * End:
+ */

Cheers,

Signature · 1 line
Julien Grall
#9 lore raw

Re: [PATCH v6 2/3] xen/arm32: Create the same boot-time MPU regions as arm64

Quoted 1 line · Julien Grall

Hi Ayan,

Hi Julien,

A few clarifications.

Quoted 22 lines · Ayan Kumar Halder
Quoted 20 lines
xen/arch/arm/include/asm/arm32/sysregs.h +0 -0
index 22871999af..8d7b95d982 100644
@@ -20,6 +20,15 @@
    * uses r0 as a placeholder register. */
   #define CMD_CP32(name...)      "mcr " __stringify(CP32(r0, name)) ";"

  +#define REGION_TEXT_PRBAR       0x18    /* SH=11 AP=10 XN=0 */

xen/arch/arm/include/asm/arm32/sysregs.h +8 -0
+#define REGION_RO_PRBAR         0x1D    /* SH=11 AP=10 XN=1 */
+#define REGION_DATA_PRBAR       0x19    /* SH=11 AP=00 XN=1 */
+#define REGION_DEVICE_PRBAR     0x11    /* SH=10 AP=00 XN=1 */
+
+#ifdef __ASSEMBLY__
+#define WRITE_SYSREG_ASM(v, name) mcr CP32(v, name)
+#endif /* __ASSEMBLY__ */
+

  #ifndef __ASSEMBLY__
    /* C wrappers */

xen/arch/arm/include/asm/cpregs.h +0 -0
index aec9e8f329..a7503a190f 100644
Quoted 8 lines
Quoted 6 lines
xen/arch/arm/include/asm/cpregs.h +0 -0
@@ -1,6 +1,8 @@
   #ifndef __ASM_ARM_CPREGS_H
   #define __ASM_ARM_CPREGS_H

  +#include <asm/mpu/cpregs.h>

Just to confirm, the CP registers used by the MPU will never be used for an other purpose on MMU systems, is that correct?

Yes, this is correct. The registers are specific to PMSAv8-32 which will not be present on MMU systems.

Quoted 15 lines

xen/arch/arm/include/asm/mpu/cpregs.h line 6

Quoted 13 lines
xen/arch/arm/include/asm/mpu/cpregs.h new file +6 -0
new file mode 100644
index 0000000000..e2f3b2264c
@@ -0,0 +1,27 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
+#ifndef __ASM_ARM_MPU_CPREGS_H
+#define __ASM_ARM_MPU_CPREGS_H
+
+#ifdef CONFIG_ARM_32

I am not sure I agree with the placement of this ifdef. Is the implication that 32-bit domain will never be supported on arm64? If not, then everything but the aliases should be available for 64-bit (like we already do in asm/cpregs.h).

Yes, I will enclose the alias only.

Quoted 12 lines

xen/arch/arm/include/asm/mpu/cpregs.h line 14

Quoted 10 lines
xen/arch/arm/include/asm/mpu/cpregs.h new file +5 -0
+
+/* CP15 CR0: MPU Type Register */
+#define HMPUIR          p15,4,c0,c0,4
+
+/* CP15 CR6: MPU Protection Region Base/Limit/Select Address 

Register */

xen/arch/arm/include/asm/mpu/cpregs.h new file +3 -0
+#define HPRSELR         p15,4,c6,c2,1
+#define PRBAR_EL2       p15,4,c6,c3,0
+#define PRLAR_EL2       p15,4,c6,c8,1

I am a little bit surprised the registers have _EL2 in their name. By any chance are you using the aarch64 naming?

yes.

Quoted 1 line

If so, please provide the 32-bit name and add an alias below.

yes, sorry this is a bit mixed up. I did not understand the purpose for defining alias , so I used the common name.

I will use HPRBAR and HPRLAR here and ....

Quoted 4 lines

xen/arch/arm/include/asm/mpu/cpregs.h line 17

Quoted 4 lines
xen/arch/arm/include/asm/mpu/cpregs.h new file +3 -0
+
+#define MPUIR_EL2       HMPUIR
+#define PRSELR_EL2      HPRSELR

#define PRBAR_EL2 HPRBAR

#define PRLAR_EL2 HPRLAR

Quoted 2 lines

Please add a comment on top explaining why we have the aliases (see in cpregs.h).

Actually, that comment (in asm/cpregs.h) did not make sense to me

"/* Aliases of AArch64 names for use in common code when building for AArch32 */"

Do you mean the common code is used for building both AArch64 and AArch32 ?

If so, then the comment I should put here

/* Aliases of AArch32 names for use in common code */

Does this sound correct ?

- Ayan

Quoted 14 lines

xen/arch/arm/include/asm/mpu/cpregs.h line 27

Quoted 11 lines
xen/arch/arm/include/asm/mpu/cpregs.h new file +10 -0
+
+#endif /* CONFIG_ARM_32 */
+#endif /* __ASM_ARM_MPU_CPREGS_H */
+
+/*
+ * Local variables:
+ * mode: ASM
+ * indent-tabs-mode: nil
+ * End:
+ */

Cheers,

#10 lore raw

Re: [PATCH v6 2/3] xen/arm32: Create the same boot-time MPU regions as arm64

Hi Ayan,

Quoted 38 lines · Ayan Kumar Halder
Quoted 1 line · Julien Grall

Hi Ayan,

Hi Julien,

A few clarifications.

Quoted 22 lines · Ayan Kumar Halder
Quoted 20 lines
xen/arch/arm/include/asm/arm32/sysregs.h +0 -0
index 22871999af..8d7b95d982 100644
@@ -20,6 +20,15 @@
    * uses r0 as a placeholder register. */
   #define CMD_CP32(name...)      "mcr " __stringify(CP32(r0, name)) ";"

  +#define REGION_TEXT_PRBAR       0x18    /* SH=11 AP=10 XN=0 */

xen/arch/arm/include/asm/arm32/sysregs.h +8 -0
+#define REGION_RO_PRBAR         0x1D    /* SH=11 AP=10 XN=1 */
+#define REGION_DATA_PRBAR       0x19    /* SH=11 AP=00 XN=1 */
+#define REGION_DEVICE_PRBAR     0x11    /* SH=10 AP=00 XN=1 */
+
+#ifdef __ASSEMBLY__
+#define WRITE_SYSREG_ASM(v, name) mcr CP32(v, name)
+#endif /* __ASSEMBLY__ */
+

  #ifndef __ASSEMBLY__
    /* C wrappers */

xen/arch/arm/ include/asm/cpregs.h renamed from xen/arch/arm/include/asm/cpregs.h +0 -0
index aec9e8f329..a7503a190f 100644
Quoted 8 lines
Quoted 6 lines
xen/arch/arm/include/asm/cpregs.h +0 -0
@@ -1,6 +1,8 @@
   #ifndef __ASM_ARM_CPREGS_H
   #define __ASM_ARM_CPREGS_H

  +#include <asm/mpu/cpregs.h>

Just to confirm, the CP registers used by the MPU will never be used for an other purpose on MMU systems, is that correct?

Quoted 1 line

Yes, this is correct. The registers are specific to PMSAv8-32 which will not be present on MMU systems.

I am not entirely sure this is answering my question. I was asking whether the encoding could be re-used for a non-MPU specific register in the future? IOW, is the encoding reserved for PMSAv8-32 only?

Quoted 45 lines
Quoted 15 lines

xen/arch/arm/include/asm/mpu/cpregs.h line 6

Quoted 13 lines
xen/arch/arm/include/asm/mpu/cpregs.h new file +6 -0
new file mode 100644
index 0000000000..e2f3b2264c
@@ -0,0 +1,27 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
+#ifndef __ASM_ARM_MPU_CPREGS_H
+#define __ASM_ARM_MPU_CPREGS_H
+
+#ifdef CONFIG_ARM_32

I am not sure I agree with the placement of this ifdef. Is the implication that 32-bit domain will never be supported on arm64? If not, then everything but the aliases should be available for 64-bit (like we already do in asm/cpregs.h).

Yes, I will enclose the alias only.

Quoted 12 lines

xen/arch/arm/include/asm/mpu/cpregs.h line 14

Quoted 10 lines
xen/arch/arm/include/asm/mpu/cpregs.h new file +5 -0
+
+/* CP15 CR0: MPU Type Register */
+#define HMPUIR          p15,4,c0,c0,4
+
+/* CP15 CR6: MPU Protection Region Base/Limit/Select Address 

Register */

xen/arch/arm/include/asm/mpu/cpregs.h new file +3 -0
+#define HPRSELR         p15,4,c6,c2,1
+#define PRBAR_EL2       p15,4,c6,c3,0
+#define PRLAR_EL2       p15,4,c6,c8,1

I am a little bit surprised the registers have _EL2 in their name. By any chance are you using the aarch64 naming?

yes.

Quoted 1 line

If so, please provide the 32-bit name and add an alias below.

yes, sorry this is a bit mixed up. I did not understand the purpose for defining alias , so I used the common name.

I will use HPRBAR and HPRLAR here and ....

Quoted 4 lines

xen/arch/arm/include/asm/mpu/cpregs.h line 17

Quoted 4 lines
xen/arch/arm/include/asm/mpu/cpregs.h new file +3 -0
+
+#define MPUIR_EL2       HMPUIR
+#define PRSELR_EL2      HPRSELR

#define PRBAR_EL2 HPRBAR

#define PRLAR_EL2 HPRLAR

Quoted 1 line
Quoted 7 lines
Quoted 1 line

Please add a comment on top explaining why we have the aliases (see in cpregs.h).

Actually, that comment (in asm/cpregs.h) did not make sense to me

"/* Aliases of AArch64 names for use in common code when building for AArch32 */"

Do you mean the common code is used for building both AArch64 and AArch32 ?

The goal of the comment is to explain why we are defining AArch64. So I think...

Quoted 5 lines
Quoted 1 line

If so, then the comment I should put here

/* Aliases of AArch32 names for use in common code */

Does this sound correct ?

it wants to be s/AArch32/AArch64/ in your proposed comment.

Cheers,

Signature · 1 line
Julien Grall
#11 lore raw

Re: [PATCH v6 2/3] xen/arm32: Create the same boot-time MPU regions as arm64

Quoted 1 line · Julien Grall

Hi Ayan,

Hi Julien,

Quoted 40 lines · Ayan Kumar Halder
Quoted 38 lines · Julien Grall
Quoted 1 line

Hi Ayan,

Hi Julien,

A few clarifications.

Quoted 30 lines · Ayan Kumar Halder
Quoted 25 lines
xen/arch/arm/include/asm/arm32/sysregs.h +0 -0
index 22871999af..8d7b95d982 100644
@@ -20,6 +20,15 @@
    * uses r0 as a placeholder register. */
   #define CMD_CP32(name...)      "mcr " __stringify(CP32(r0, name)) ";"

  +#define REGION_TEXT_PRBAR       0x18    /* SH=11 AP=10 XN=0 */

xen/arch/arm/include/asm/arm32/sysregs.h +8 -0
+#define REGION_RO_PRBAR         0x1D    /* SH=11 AP=10 XN=1 */
+#define REGION_DATA_PRBAR       0x19    /* SH=11 AP=00 XN=1 */
+#define REGION_DEVICE_PRBAR     0x11    /* SH=10 AP=00 XN=1 */
+
+#ifdef __ASSEMBLY__
+#define WRITE_SYSREG_ASM(v, name) mcr CP32(v, name)
+#endif /* __ASSEMBLY__ */
+

  #ifndef __ASSEMBLY__
    /* C wrappers */

xen/arch/arm/include/asm/cpregs.h +0 -0
index aec9e8f329..a7503a190f 100644
@@ -1,6 +1,8 @@
   #ifndef __ASM_ARM_CPREGS_H
   #define __ASM_ARM_CPREGS_H
Quoted 1 line

  +#include <asm/mpu/cpregs.h>

Just to confirm, the CP registers used by the MPU will never be used for an other purpose on MMU systems, is that correct?

Quoted 3 lines
Quoted 1 line

Yes, this is correct. The registers are specific to PMSAv8-32 which will not be present on MMU systems.

I am not entirely sure this is answering my question. I was asking whether the encoding could be re-used for a non-MPU specific register in the future? IOW, is the encoding reserved for PMSAv8-32 only?

yes, these registers encoding are reserved for PMSAv8-32 only.

Quoted 56 lines
Quoted 46 lines
Quoted 16 lines
Quoted 8 lines
xen/arch/arm/include/asm/mpu/cpregs.h new file +0 -0
new file mode 100644
index 0000000000..e2f3b2264c

xen/arch/arm/include/asm/mpu/cpregs.h line 6

Quoted 6 lines
xen/arch/arm/include/asm/mpu/cpregs.h new file +6 -0
@@ -0,0 +1,27 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
+#ifndef __ASM_ARM_MPU_CPREGS_H
+#define __ASM_ARM_MPU_CPREGS_H
+
+#ifdef CONFIG_ARM_32

I am not sure I agree with the placement of this ifdef. Is the implication that 32-bit domain will never be supported on arm64? If not, then everything but the aliases should be available for 64-bit (like we already do in asm/cpregs.h).

Yes, I will enclose the alias only.

Quoted 12 lines

xen/arch/arm/include/asm/mpu/cpregs.h line 14

Quoted 10 lines
xen/arch/arm/include/asm/mpu/cpregs.h new file +5 -0
+
+/* CP15 CR0: MPU Type Register */
+#define HMPUIR          p15,4,c0,c0,4
+
+/* CP15 CR6: MPU Protection Region Base/Limit/Select Address 

Register */

xen/arch/arm/include/asm/mpu/cpregs.h new file +3 -0
+#define HPRSELR         p15,4,c6,c2,1
+#define PRBAR_EL2       p15,4,c6,c3,0
+#define PRLAR_EL2       p15,4,c6,c8,1

I am a little bit surprised the registers have _EL2 in their name. By any chance are you using the aarch64 naming?

yes.

Quoted 1 line

If so, please provide the 32-bit name and add an alias below.

yes, sorry this is a bit mixed up. I did not understand the purpose for defining alias , so I used the common name.

I will use HPRBAR and HPRLAR here and ....

Quoted 4 lines

xen/arch/arm/include/asm/mpu/cpregs.h line 17

Quoted 4 lines
xen/arch/arm/include/asm/mpu/cpregs.h new file +3 -0
+
+#define MPUIR_EL2       HMPUIR
+#define PRSELR_EL2      HPRSELR

#define PRBAR_EL2 HPRBAR

#define PRLAR_EL2 HPRLAR

Quoted 1 line
Quoted 7 lines
Quoted 1 line

Please add a comment on top explaining why we have the aliases (see in cpregs.h).

Actually, that comment (in asm/cpregs.h) did not make sense to me

"/* Aliases of AArch64 names for use in common code when building for AArch32 */"

Do you mean the common code is used for building both AArch64 and AArch32 ?

The goal of the comment is to explain why we are defining AArch64. So I think...

Quoted 7 lines
Quoted 5 lines
Quoted 1 line

If so, then the comment I should put here

/* Aliases of AArch32 names for use in common code */

Does this sound correct ?

it wants to be s/AArch32/AArch64/ in your proposed comment.

ok.

Now I understand. We are using AArch64 names in the common code. :)

- Ayan

Quoted 3 lines

Cheers,

#12 lore raw

PATCH v6 3/3 xen/arm32: mpu: Stubs to build MPU for arm32

In reply to Ayan Kumar Halder

Add stubs to enable compilation.

is_xen_heap_page() and is_xen_heap_mfn() are not implemented for arm32 MPU. Thus, introduce the stubs for these functions in asm/mpu/mm.h and move the original code to asm/mmu/mm.h (as it is used for arm32 MMU based system).

---
Changes from :-

v1, v2 -
1. New patch introduced in v3.
2. Should be applied on top of
https://patchwork.kernel.org/project/xen-devel/cover/[email protected]/

v3 -
1. Add stubs for map_domain_page() and similar functions.

2. 'BUG_ON("unimplemented")' is kept in all the stubs.

v4 -
1. is_xen_heap_mfn() macros are defined across mpu/mm.h (ARM32 specific) , mmu/mm.h (ARM32 specific) and asm/mm.h (ARM64 specific)

2. s/(void*)0/NULL

v5 -
1. Add the headers for smpboot.c, domain_page.c and p2m.c.

2. Inclusion of headers and makefile entries are sorted alphabetically.

3. Update the commit message and style changes.

 xen/arch/arm/arm32/mpu/Makefile   |  2 ++
 xen/arch/arm/arm32/mpu/p2m.c      | 19 +++++++++++++
 xen/arch/arm/arm32/mpu/smpboot.c  | 26 ++++++++++++++++++
 xen/arch/arm/include/asm/mm.h     |  9 +------
 xen/arch/arm/include/asm/mmu/mm.h |  7 +++++
 xen/arch/arm/include/asm/mpu/mm.h |  5 ++++
 xen/arch/arm/mpu/Makefile         |  1 +
 xen/arch/arm/mpu/domain_page.c    | 45 +++++++++++++++++++++++++++++++
 8 files changed, 106 insertions(+), 8 deletions(-)
 create mode 100644 xen/arch/arm/arm32/mpu/p2m.c
 create mode 100644 xen/arch/arm/arm32/mpu/smpboot.c
 create mode 100644 xen/arch/arm/mpu/domain_page.c
xen/arch/arm/arm32/mpu/Makefile +2 -0
index 3340058c08..cf0540aecc 100644
@@ -1 +1,3 @@
 obj-y += head.o
+obj-y += p2m.o
+obj-y += smpboot.o
xen/arch/arm/arm32/mpu/p2m.c new file +19 -0
new file mode 100644
index 0000000000..3d9abe4400
@@ -0,0 +1,19 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
+#include <asm/p2m.h>
+#include <xen/bug.h>
+#include <xen/init.h>
+
+void __init setup_virt_paging(void)
+{
+    BUG_ON("unimplemented");
+}
+
+/*
+ * Local variables:
+ * mode: C
+ * c-file-style: "BSD"
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ */
xen/arch/arm/arm32/mpu/smpboot.c new file +26 -0
new file mode 100644
index 0000000000..5090f443f5
@@ -0,0 +1,26 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
+#include <xen/bug.h>
+#include <xen/errno.h>
+#include <xen/mm.h>
+#include <xen/stdbool.h>
+
+int prepare_secondary_mm(int cpu)
+{
+    BUG_ON("unimplemented");
+    return -EINVAL;
+}
+
+void update_boot_mapping(bool enable)
+{
+    BUG_ON("unimplemented");
+}
+
+/*
+ * Local variables:
+ * mode: C
+ * c-file-style: "BSD"
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ */
xen/arch/arm/include/asm/mm.h +1 -8
index fbffaccef4..5b67c0f8bb 100644
@@ -170,14 +170,7 @@ struct page_info
 #define _PGC_need_scrub   _PGC_allocated
 #define PGC_need_scrub    PGC_allocated
 
-#ifdef CONFIG_ARM_32
-#define is_xen_heap_page(page) is_xen_heap_mfn(page_to_mfn(page))
-#define is_xen_heap_mfn(mfn) ({                                 \
-    unsigned long mfn_ = mfn_x(mfn);                            \
-    (mfn_ >= mfn_x(directmap_mfn_start) &&                      \
-     mfn_ < mfn_x(directmap_mfn_end));                          \
-})
-#else
+#ifdef CONFIG_ARM_64
 #define is_xen_heap_page(page) ((page)->count_info & PGC_xen_heap)
 #define is_xen_heap_mfn(mfn) \
     (mfn_valid(mfn) && is_xen_heap_page(mfn_to_page(mfn)))
xen/arch/arm/include/asm/mmu/mm.h +7 -0
index caba987edc..7f4d59137d 100644
@@ -27,6 +27,13 @@ extern unsigned long directmap_base_pdx;
 })
 
 #ifdef CONFIG_ARM_32
+#define is_xen_heap_page(page) is_xen_heap_mfn(page_to_mfn(page))
+#define is_xen_heap_mfn(mfn) ({                                 \
+    unsigned long mfn_ = mfn_x(mfn);                            \
+    (mfn_ >= mfn_x(directmap_mfn_start) &&                      \
+     mfn_ < mfn_x(directmap_mfn_end));                          \
+})
+
 /**
  * Find the virtual address corresponding to a machine address
  *
xen/arch/arm/include/asm/mpu/mm.h +5 -0
index 86f33d9836..bfd840fa5d 100644
@@ -13,6 +13,11 @@ extern struct page_info *frame_table;
 
 #define virt_to_maddr(va) ((paddr_t)((vaddr_t)(va) & PADDR_MASK))
 
+#ifdef CONFIG_ARM_32
+#define is_xen_heap_page(page) ({ BUG_ON("unimplemented"); false; })
+#define is_xen_heap_mfn(mfn) ({ BUG_ON("unimplemented"); false; })
+#endif
+
 /* On MPU systems there is no translation, ma == va. */
 static inline void *maddr_to_virt(paddr_t ma)
 {
xen/arch/arm/mpu/Makefile +1 -0
index 21bbc517b5..c7e3aa4d87 100644
@@ -1,3 +1,4 @@
+obj-$(CONFIG_ARM_32) += domain_page.o
 obj-y += mm.o
 obj-y += p2m.o
 obj-y += setup.init.o
xen/arch/arm/mpu/domain_page.c new file +45 -0

45 lines not on this page · raw message

Signature · 1 line
2.25.1
Reviewed-by on v6 3/3
#13 lore raw

Re: [PATCH v6 3/3] xen/arm32: mpu: Stubs to build MPU for arm32

Quoted 8 lines · Ayan Kumar Halder

Add stubs to enable compilation.

is_xen_heap_page() and is_xen_heap_mfn() are not implemented for arm32 MPU. Thus, introduce the stubs for these functions in asm/mpu/mm.h and move the original code to asm/mmu/mm.h (as it is used for arm32 MMU based system).

~Michal

Tested-by on the v6 series
#14 lore raw
In reply to Ayan Kumar Halder

Hi Ayan,

Quoted 10 lines · Ayan Kumar Halder

Enable early booting of Armv8-R AArch32 based systems.

Added Luca's R-b in all the patches.

Ayan Kumar Halder (3):
xen/arm: Move some of the functions to common file xen/arm32: Create the same boot-time MPU regions as arm64 xen/arm32: mpu: Stubs to build MPU for arm32

I’ve compiled both Arm32 and Arm64, MPU & MMU code:

Cheers,
Luca