On 05/03/2025 10:37, Ayan Kumar Halder wrote:
> Hi Michal
>
> On 05/03/2025 07:28, Orzel, Michal wrote:
>>
>> On 04/03/2025 18:57, Ayan Kumar Halder wrote:
>>> For AArch32, refer to ARM DDI 0568A.c ID110520.
>>> MPU_REGION_SHIFT is same between AArch32 and AArch64 (HPRBAR).
>>> Also, NUM_MPU_REGIONS_SHIFT is same between AArch32 and AArch64
>>> (HMPUIR).
>>>
>>> Signed-off-by: Ayan Kumar Halder <ayan.kumar.hal...@amd.com>
>>> Reviewed-by: Luca Fancellu <luca.fance...@arm.com>
>>> ---
>>> Changes from
>>>
>>> v1 - 1. Add the R-b.
>>>
>>> xen/arch/arm/arm64/mpu/head.S | 2 +-
>>> xen/arch/arm/include/asm/early_printk.h | 2 +-
>>> xen/arch/arm/include/asm/{arm64 => }/mpu.h | 6 +++---
>>> 3 files changed, 5 insertions(+), 5 deletions(-)
>>> rename xen/arch/arm/include/asm/{arm64 => }/mpu.h (87%)
>>>
>>> diff --git a/xen/arch/arm/arm64/mpu/head.S b/xen/arch/arm/arm64/mpu/head.S
>>> index e4f2021f45..7b659aa42b 100644
>>> --- a/xen/arch/arm/arm64/mpu/head.S
>>> +++ b/xen/arch/arm/arm64/mpu/head.S
>>> @@ -3,7 +3,7 @@
>>> * Start-of-day code for an Armv8-R MPU system.
>>> */
>>>
>>> -#include <asm/arm64/mpu.h>
>>> +#include <asm/mpu.h>
>>> #include <asm/early_printk.h>
>> These should be sorted alphabetically
>>
>>>
>>> /* Backgroud region enable/disable */
>>> diff --git a/xen/arch/arm/include/asm/early_printk.h
>>> b/xen/arch/arm/include/asm/early_printk.h
>>> index 219705a8b6..644fd0fcfb 100644
>>> --- a/xen/arch/arm/include/asm/early_printk.h
>>> +++ b/xen/arch/arm/include/asm/early_printk.h
>>> @@ -11,7 +11,7 @@
>>> #define __ARM_EARLY_PRINTK_H__
>>>
>>> #include <xen/page-size.h>
>>> -#include <asm/arm64/mpu.h>
>>> +#include <asm/mpu.h>
>>> #include <asm/fixmap.h>
>> These should be sorted alphabetically
> This and ..
>>
>>>
>>> #ifdef CONFIG_EARLY_PRINTK
>>> diff --git a/xen/arch/arm/include/asm/arm64/mpu.h
>>> b/xen/arch/arm/include/asm/mpu.h
>>> similarity index 87%
>>> rename from xen/arch/arm/include/asm/arm64/mpu.h
>>> rename to xen/arch/arm/include/asm/mpu.h
>>> index f8a029f1a1..40fa6eaaca 100644
>>> --- a/xen/arch/arm/include/asm/arm64/mpu.h
>>> +++ b/xen/arch/arm/include/asm/mpu.h
>>> @@ -3,8 +3,8 @@
>>> * mpu.h: Arm Memory Protection Unit definitions.
>>> */
>>>
>>> -#ifndef __ARM64_MPU_H__
>>> -#define __ARM64_MPU_H__
>>> +#ifndef __ARM_MPU_H__
>>> +#define __ARM_MPU_H__
>>>
>>> #define MPU_REGION_SHIFT 6
>>> #define MPU_REGION_ALIGN (_AC(1, UL) << MPU_REGION_SHIFT)
>>> @@ -13,7 +13,7 @@
>>> #define NUM_MPU_REGIONS_SHIFT 8
>>> #define NUM_MPU_REGIONS (_AC(1, UL) << NUM_MPU_REGIONS_SHIFT)
>>> #define NUM_MPU_REGIONS_MASK (NUM_MPU_REGIONS - 1)
>>> -#endif /* __ARM64_MPU_H__ */
>>> +#endif /* __ARM_MPU_H__ */
>> Would you mind adding extra line between last definition and #endif?
>
> this, can you fix them on commit, please ? Or do you want me to send a v3.
If I end up committing this patch (I can do that tomorrow), then I can do these
changes on commit.
~Michal
