From e1d021ad7424d61ded3d60f2f45b5a4962e9394b Mon Sep 17 00:00:00 2001 From: Aaron Lindsay Date: Thu, 26 Apr 2018 09:07:48 -0400 Subject: [PATCH] target/arm: Treat PMCCNTR as alias of PMCCNTR_EL0 They share the same underlying state Backports commit 169c893874977eee8303a6dad4a3f25c5464858f 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 bdde85f9..1e492502 100644 --- a/qemu/target/arm/helper.c +++ b/qemu/target/arm/helper.c @@ -1193,7 +1193,7 @@ static const ARMCPRegInfo v7_cp_reginfo[] = { PL0_RW, 0, NULL, 0, offsetof(CPUARMState, cp15.c9_pmselr), {0, 0}, pmreg_access_selr, NULL, pmselr_write, NULL, raw_write, }, { "PMCCNTR", 15,9,13, 0,0,0, 0, - ARM_CP_IO, PL0_RW, 0, NULL, 0, 0, {0, 0}, + ARM_CP_ALIAS | ARM_CP_IO, PL0_RW, 0, NULL, 0, 0, {0, 0}, pmreg_access_ccntr, pmccntr_read, pmccntr_write32, }, { "PMCCNTR_EL0", 0,9,13, 3,3,0, ARM_CP_STATE_AA64, ARM_CP_IO, PL0_RW, 0, NULL, 0, 0, {0, 0},