From ca6a626ad606040bfefc9a493f7a89a4de2f5bf5 Mon Sep 17 00:00:00 2001 From: "Edgar E. Iglesias" Date: Mon, 12 Feb 2018 23:32:35 -0500 Subject: [PATCH] target-arm: Add TCR_EL2 Backports commit 06ec4c8c9f9e21b7671c79296f3a47ab63d50067 from qemu --- qemu/target-arm/helper.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/qemu/target-arm/helper.c b/qemu/target-arm/helper.c index 1876b87b..dcc0154e 100644 --- a/qemu/target-arm/helper.c +++ b/qemu/target-arm/helper.c @@ -2180,6 +2180,8 @@ static const ARMCPRegInfo v8_el3_no_el2_cp_reginfo[] = { PL2_RW, 0, NULL, 0 }, { "HMAIR1", 0,10,2, 0,4,1, ARM_CP_STATE_AA32, ARM_CP_CONST, PL2_RW, 0, NULL, 0 }, + { "TCR_EL2", 0,2,0, 3,4,2, ARM_CP_STATE_BOTH, ARM_CP_CONST, + PL2_RW, 0, NULL, 0 }, REGINFO_SENTINEL }; @@ -2237,6 +2239,9 @@ static const ARMCPRegInfo v8_el2_cp_reginfo[] = { 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]) }, + { "TCR_EL2", 0,2,0, 3,4,2, ARM_CP_STATE_BOTH, 0, + PL2_RW, 0, NULL, 0, offsetof(CPUARMState, cp15.tcr_el[2]), {0, 0}, + NULL, NULL, vmsa_tcr_el1_write, NULL, raw_write, vmsa_ttbcr_reset }, REGINFO_SENTINEL };