xen: arm: context switch the aux memory attribute registers
PATCH 1/1 xen: arm: context switch the aux memory attribute registers
We appear to have somehow missed these. Linux doesn't actually use them and none of the processors I've looked at actually define any bits in them (so they are UNK/SBZP) but it is good form to context switch them anyway.
--- xen/arch/arm/domain.c | 6 ++++++ xen/include/asm-arm/cpregs.h | 2 ++ xen/include/asm-arm/domain.h | 2 ++ 3 files changed, 10 insertions(+)
xen/arch/arm/domain.c +6 -0
@@ -98,8 +98,11 @@ static void ctxt_switch_from(struct vcpu *p)#if defined(CONFIG_ARM_32 ) p->arch.mair0 =READ_CP32 (MAIR0 ); p->arch.mair1 =READ_CP32 (MAIR1 ); + p->arch.amair0 =READ_CP32 (AMAIR0 ); + p->arch.amair1 =READ_CP32 (AMAIR1 );#else p->arch.mair =READ_SYSREG64 (MAIR_EL1 ); + p->arch.amair =READ_SYSREG64 (AMAIR_EL1 );#endif /* Fault Status */
@@ -177,8 +180,11 @@ static void ctxt_switch_to(struct vcpu *n)#if defined(CONFIG_ARM_32 )WRITE_CP32 (n->arch.mair0,MAIR0 );WRITE_CP32 (n->arch.mair1,MAIR1 ); +WRITE_CP32 (n->arch.amair0,AMAIR0 ); +WRITE_CP32 (n->arch.amair1,AMAIR1 );#elif defined(CONFIG_ARM_64 )WRITE_SYSREG64 (n->arch.mair,MAIR_EL1 ); +WRITE_SYSREG64 (n->arch.amair,AMAIR_EL1 );#endif isb ();
xen/include/asm-arm/cpregs.h +2 -0
@@ -200,6 +200,8 @@#define MAIR1 p15,0,c10,c2,1/* Memory Attribute Indirection Register 1 AKA NMRR */ #define HMAIR0 p15,4,c10,c2,0/* Hyp. Memory Attribute Indirection Register 0 */ #define HMAIR1 p15,4,c10,c2,1/* Hyp. Memory Attribute Indirection Register 1 */ +#define AMAIR0 p15,0,c10,c3,0/* Aux. Memory Attribute Indirection Register 0 */ +#define AMAIR1 p15,0,c10,c3,1/* Aux. Memory Attribute Indirection Register 1 */ /* CP15 CR11: DMA Operations for TCM Access */
xen/include/asm-arm/domain.h +2 -0
@@ -221,8 +221,10 @@ struct arch_vcpuuint64_t par;#ifdef CONFIG_ARM_32 uint32_t mair0, mair1; +uint32_t amair0, amair1;#else uint64_t mair; +uint64_t amair;#endif /* Control Registers */
Signature · 1 line
1.7.10.4
Quoted 5 lines · Ian Campbell
We appear to have somehow missed these. Linux doesn't actually use them and none of the processors I've looked at actually define any bits in them (so they are UNK/SBZP) but it is good form to context switch them anyway.
Signed-off-by Ian Campbell <[email protected]>
Quoted 63 lines
--- xen/arch/arm/domain.c | 6 ++++++ xen/include/asm-arm/cpregs.h | 2 ++ xen/include/asm-arm/domain.h | 2 ++ 3 files changed, 10 insertions(+)xen/arch/arm/domain.c +6
-0@@ -98,8 +98,11 @@ static void ctxt_switch_from(struct vcpu *p)#if defined(CONFIG_ARM_32 ) p->arch.mair0 =READ_CP32 (MAIR0 ); p->arch.mair1 =READ_CP32 (MAIR1 ); + p->arch.amair0 =READ_CP32 (AMAIR0 ); + p->arch.amair1 =READ_CP32 (AMAIR1 );#else p->arch.mair =READ_SYSREG64 (MAIR_EL1 ); + p->arch.amair =READ_SYSREG64 (AMAIR_EL1 );#endif /* Fault Status */ @@ -177,8 +180,11 @@ static void ctxt_switch_to(struct vcpu *n)#if defined(CONFIG_ARM_32 )WRITE_CP32 (n->arch.mair0,MAIR0 );WRITE_CP32 (n->arch.mair1,MAIR1 ); +WRITE_CP32 (n->arch.amair0,AMAIR0 ); +WRITE_CP32 (n->arch.amair1,AMAIR1 );#elif defined(CONFIG_ARM_64 )WRITE_SYSREG64 (n->arch.mair,MAIR_EL1 ); +WRITE_SYSREG64 (n->arch.amair,AMAIR_EL1 );#endif isb ();xen/include/asm-arm/cpregs.h +2
-0@@ -200,6 +200,8 @@#define MAIR1 p15,0,c10,c2,1/* Memory Attribute Indirection Register 1 AKA NMRR */ #define HMAIR0 p15,4,c10,c2,0/* Hyp. Memory Attribute Indirection Register 0 */ #define HMAIR1 p15,4,c10,c2,1/* Hyp. Memory Attribute Indirection Register 1 */ +#define AMAIR0 p15,0,c10,c3,0/* Aux. Memory Attribute Indirection Register 0 */ +#define AMAIR1 p15,0,c10,c3,1/* Aux. Memory Attribute Indirection Register 1 */ /* CP15 CR11: DMA Operations for TCM Access */ xen/include/asm-arm/domain.h +2
-0@@ -221,8 +221,10 @@ struct arch_vcpuuint64_t par;#ifdef CONFIG_ARM_32 uint32_t mair0, mair1; +uint32_t amair0, amair1;#else uint64_t mair; +uint64_t amair;#endif /* Control Registers */
Signature · 1 line
Julien Grall
Quoted 9 lines · Julien Grall
Quoted 5 lines · Ian Campbell
We appear to have somehow missed these. Linux doesn't actually use them and none of the processors I've looked at actually define any bits in them (so they are UNK/SBZP) but it is good form to context switch them anyway.
Signed-off-by Ian Campbell <[email protected]>Acked-by Julien Grall <[email protected]>
I feel a bit conflicted giving a release-ack to my own patch but I think it is low risk and will avoid hard to diagnose failures if Xen is run on a processor which uses these.
So applied.
Ian.