[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-arm] [PATCH v8 11/13] target/arm: PMU: Set PMCR.N to 4
From: |
Aaron Lindsay |
Subject: |
[Qemu-arm] [PATCH v8 11/13] target/arm: PMU: Set PMCR.N to 4 |
Date: |
Tue, 20 Nov 2018 21:26:46 +0000 |
This both advertises that we support four counters and enables them
because the pmu_num_counters() reads this value from PMCR.
Signed-off-by: Aaron Lindsay <address@hidden>
Signed-off-by: Aaron Lindsay <address@hidden>
Reviewed-by: Peter Maydell <address@hidden>
---
target/arm/helper.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/target/arm/helper.c b/target/arm/helper.c
index 6e5f00c0d5..b8462d429a 100644
--- a/target/arm/helper.c
+++ b/target/arm/helper.c
@@ -1768,7 +1768,7 @@ static const ARMCPRegInfo v7_cp_reginfo[] = {
.access = PL1_W, .type = ARM_CP_NOP },
/* Performance monitors are implementation defined in v7,
* but with an ARM recommended set of registers, which we
- * follow (although we don't actually implement any counters)
+ * follow.
*
* Performance registers fall into three categories:
* (a) always UNDEF in PL0, RW in PL1 (PMINTENSET, PMINTENCLR)
@@ -5502,10 +5502,10 @@ void register_cp_regs_for_features(ARMCPU *cpu)
}
if (arm_feature(env, ARM_FEATURE_V7)) {
/* v7 performance monitor control register: same implementor
- * field as main ID register, and we implement only the cycle
- * count register.
+ * field as main ID register, and we implement four counters in
+ * addition to the cycle count register.
*/
- unsigned int i, pmcrn = 0;
+ unsigned int i, pmcrn = 4;
ARMCPRegInfo pmcr = {
.name = "PMCR", .cp = 15, .crn = 9, .crm = 12, .opc1 = 0, .opc2 =
0,
.access = PL0_RW,
@@ -5520,7 +5520,7 @@ void register_cp_regs_for_features(ARMCPU *cpu)
.access = PL0_RW, .accessfn = pmreg_access,
.type = ARM_CP_IO,
.fieldoffset = offsetof(CPUARMState, cp15.c9_pmcr),
- .resetvalue = cpu->midr & 0xff000000,
+ .resetvalue = (cpu->midr & 0xff000000) | (pmcrn << PMCRN_SHIFT),
.writefn = pmcr_write, .raw_writefn = raw_write,
};
define_one_arm_cp_reg(cpu, &pmcr);
--
2.19.1
- [Qemu-arm] [PATCH v8 00/13] More fully implement ARM PMUv3, Aaron Lindsay, 2018/11/20
- [Qemu-arm] [PATCH v8 01/13] migration: Add post_save function to VMStateDescription, Aaron Lindsay, 2018/11/20
- [Qemu-arm] [PATCH v8 02/13] target/arm: Reorganize PMCCNTR accesses, Aaron Lindsay, 2018/11/20
- [Qemu-arm] [PATCH v8 05/13] target/arm: Allow AArch32 access for PMCCFILTR, Aaron Lindsay, 2018/11/20
- [Qemu-arm] [PATCH v8 03/13] target/arm: Swap PMU values before/after migrations, Aaron Lindsay, 2018/11/20
- [Qemu-arm] [PATCH v8 06/13] target/arm: Implement PMOVSSET, Aaron Lindsay, 2018/11/20
- [Qemu-arm] [PATCH v8 04/13] target/arm: Filter cycle counter based on PMCCFILTR_EL0, Aaron Lindsay, 2018/11/20
- [Qemu-arm] [PATCH v8 07/13] target-arm: Make PMCEID[01]_EL0 64 bit registers, add PMCEID[23], Aaron Lindsay, 2018/11/20
- [Qemu-arm] [PATCH v8 11/13] target/arm: PMU: Set PMCR.N to 4,
Aaron Lindsay <=
- [Qemu-arm] [PATCH v8 12/13] target/arm: Implement PMSWINC, Aaron Lindsay, 2018/11/20
- [Qemu-arm] [PATCH v8 08/13] target/arm: Add array for supported PMU events, generate PMCEID[01]_EL0, Aaron Lindsay, 2018/11/20
- [Qemu-arm] [PATCH v8 09/13] target/arm: Finish implementation of PM[X]EVCNTR and PM[X]EVTYPER, Aaron Lindsay, 2018/11/20
- [Qemu-arm] [PATCH v8 13/13] target/arm: Send interrupts on PMU counter overflow, Aaron Lindsay, 2018/11/20