Revert "target/arm: Make number of counters in PMCR follow the CPU"
commit21c2dd77a6aa5173764abe1371b06cc2a7541c4f
authorPeter Maydell <peter.maydell@linaro.org>
Wed, 31 Mar 2021 15:48:22 +0000 (31 16:48 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Tue, 6 Apr 2021 10:49:14 +0000 (6 11:49 +0100)
treef611f9af72932327548c2526a54545f4d6c747f4
parente7e0d52dc6cbce267757697f9730d5d8d2a916c1
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
target/arm/cpu.h
target/arm/cpu64.c
target/arm/cpu_tcg.c
target/arm/helper.c
target/arm/kvm64.c