From 8fc06292273297262028fb02d113445984f0eb80 Mon Sep 17 00:00:00 2001 From: "Edgar E. Iglesias" Date: Mon, 12 Feb 2018 23:26:35 -0500 Subject: [PATCH] target-arm: Add MAIR_EL2 Backports commit 95f949ac3dc7d4a6ebee512a9d122db18210df64 from qemu --- qemu/target-arm/helper.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/qemu/target-arm/helper.c b/qemu/target-arm/helper.c index a0996f9e..1876b87b 100644 --- a/qemu/target-arm/helper.c +++ b/qemu/target-arm/helper.c @@ -2176,6 +2176,10 @@ static const ARMCPRegInfo v8_el3_no_el2_cp_reginfo[] = { NULL, arm_cp_read_zero, arm_cp_write_ignore }, { "CPTR_EL2", 0,1,1, 3,4,2, ARM_CP_STATE_BOTH, ARM_CP_CONST, PL2_RW, 0, NULL, 0 }, + { "MAIR_EL2", 0,10,2, 3,4,0, ARM_CP_STATE_BOTH, ARM_CP_CONST, + PL2_RW, 0, NULL, 0 }, + { "HMAIR1", 0,10,2, 0,4,1, ARM_CP_STATE_AA32, ARM_CP_CONST, + PL2_RW, 0, NULL, 0 }, REGINFO_SENTINEL }; @@ -2229,6 +2233,10 @@ static const ARMCPRegInfo v8_el2_cp_reginfo[] = { { "CPTR_EL2", 0,1,1, 3,4,2, ARM_CP_STATE_BOTH, 0, PL2_RW, 0, NULL, 0, offsetof(CPUARMState, cp15.cptr_el[2]), {0, 0}, cptr_access }, + { "MAIR_EL2", 0,10,2, 3,4,0, ARM_CP_STATE_BOTH, 0, + PL2_RW, 0, NULL, 0, offsetof(CPUARMState, cp15.mair_el[2]) }, + { "HMAIR1", 0,10,2, 0,4,1, ARM_CP_STATE_AA32, ARM_CP_ALIAS, + PL2_RW, 0, NULL, 0, offsetofhigh32(CPUARMState, cp15.mair_el[2]) }, REGINFO_SENTINEL };