From 66c4bd02ebab8b5f9f2e2ef698ee6834048d2781 Mon Sep 17 00:00:00 2001 From: "Edgar E. Iglesias" Date: Tue, 20 Feb 2018 22:30:31 -0500 Subject: [PATCH] target-arm: Mark CNTHP_TVAL_EL2 as ARM_CP_NO_RAW Mark CNTHP_TVAL_EL2 as ARM_CP_NO_RAW due to the register not having any underlying state. This fixes an issue with booting KVM enabled kernels when EL2 is on. Backports commit d44ec156300a149b386a14d3ab349d3b83b66b8c from qemu --- qemu/target-arm/helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qemu/target-arm/helper.c b/qemu/target-arm/helper.c index c953a283..86147675 100644 --- a/qemu/target-arm/helper.c +++ b/qemu/target-arm/helper.c @@ -3205,7 +3205,7 @@ static const ARMCPRegInfo el2_cp_reginfo[] = { { "CNTHP_CVAL", 15,0,14, 0,6,0, 0, ARM_CP_64BIT | ARM_CP_IO, PL2_RW, 0, NULL, 0, offsetof(CPUARMState, cp15.c14_timer[GTIMER_HYP].cval), {0, 0}, NULL, NULL, gt_hyp_cval_write, NULL, raw_write }, - { "CNTHP_TVAL_EL2", 0,14,2, 3,4,0, ARM_CP_STATE_BOTH, ARM_CP_IO, + { "CNTHP_TVAL_EL2", 0,14,2, 3,4,0, ARM_CP_STATE_BOTH, ARM_CP_NO_RAW | ARM_CP_IO, PL2_RW, 0, NULL, 0, 0, {0, 0}, NULL, gt_hyp_tval_read, gt_hyp_tval_write, NULL, NULL, gt_hyp_timer_reset }, { "CNTHP_CTL_EL2", 0,14,2, 3,4,1, ARM_CP_STATE_BOTH, ARM_CP_IO,