diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2021-03-31 16:48:22 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2021-04-06 11:49:14 +0100 |
| commit | 21c2dd77a6aa5173764abe1371b06cc2a7541c4f (patch) | |
| tree | f611f9af72932327548c2526a54545f4d6c747f4 /target/arm/cpu.h | |
| parent | e7e0d52dc6cbce267757697f9730d5d8d2a916c1 (diff) | |
Revert "target/arm: Make number of counters in PMCR follow the CPU"
This reverts commit f7fb73b8cdd3f77e26f9fcff8cf24ff1b58d200f.
This change turned out to be a bit half-baked, and doesn't
work with KVM, which fails with the error:
"qemu-system-aarch64: Failed to retrieve host CPU features"
because KVM does not allow accessing of the PMCR_EL0 value in
the scratch "query CPU ID registers" VM unless we have first
set the KVM_ARM_VCPU_PMU_V3 feature on the VM.
Revert the change for 6.0.
Reported-by: Zenghui Yu <yuzenghui@huawei.com>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Tested-by: Zenghui Yu <yuzenghui@huawei.com>
Message-id: 20210331154822.23332-1-peter.maydell@linaro.org
Diffstat (limited to 'target/arm/cpu.h')
| -rw-r--r-- | target/arm/cpu.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/target/arm/cpu.h b/target/arm/cpu.h index fe68f464b3..193a49ec7f 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -942,7 +942,6 @@ struct ARMCPU { uint64_t id_aa64mmfr2; uint64_t id_aa64dfr0; uint64_t id_aa64dfr1; - uint64_t reset_pmcr_el0; } isar; uint64_t midr; uint32_t revidr; |