target/arm: Remove KVM AArch32 CPU definitions
Missed in commit 80485d88f9
("target/arm: Restrict
v7A TCG cpus to TCG accel").
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20230405100848.76145-2-philmd@linaro.org
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
parent
25d758175d
commit
409504a1d5
|
@ -546,7 +546,6 @@ static void cortex_a7_initfn(Object *obj)
|
||||||
set_feature(&cpu->env, ARM_FEATURE_EL2);
|
set_feature(&cpu->env, ARM_FEATURE_EL2);
|
||||||
set_feature(&cpu->env, ARM_FEATURE_EL3);
|
set_feature(&cpu->env, ARM_FEATURE_EL3);
|
||||||
set_feature(&cpu->env, ARM_FEATURE_PMU);
|
set_feature(&cpu->env, ARM_FEATURE_PMU);
|
||||||
cpu->kvm_target = QEMU_KVM_ARM_TARGET_CORTEX_A7;
|
|
||||||
cpu->midr = 0x410fc075;
|
cpu->midr = 0x410fc075;
|
||||||
cpu->reset_fpsid = 0x41023075;
|
cpu->reset_fpsid = 0x41023075;
|
||||||
cpu->isar.mvfr0 = 0x10110222;
|
cpu->isar.mvfr0 = 0x10110222;
|
||||||
|
@ -595,7 +594,6 @@ static void cortex_a15_initfn(Object *obj)
|
||||||
set_feature(&cpu->env, ARM_FEATURE_EL2);
|
set_feature(&cpu->env, ARM_FEATURE_EL2);
|
||||||
set_feature(&cpu->env, ARM_FEATURE_EL3);
|
set_feature(&cpu->env, ARM_FEATURE_EL3);
|
||||||
set_feature(&cpu->env, ARM_FEATURE_PMU);
|
set_feature(&cpu->env, ARM_FEATURE_PMU);
|
||||||
cpu->kvm_target = QEMU_KVM_ARM_TARGET_CORTEX_A15;
|
|
||||||
/* r4p0 cpu, not requiring expensive tlb flush errata */
|
/* r4p0 cpu, not requiring expensive tlb flush errata */
|
||||||
cpu->midr = 0x414fc0f0;
|
cpu->midr = 0x414fc0f0;
|
||||||
cpu->revidr = 0x0;
|
cpu->revidr = 0x0;
|
||||||
|
|
|
@ -124,13 +124,10 @@ MISMATCH_CHECK(QEMU_PSCI_RET_INTERNAL_FAILURE, PSCI_RET_INTERNAL_FAILURE);
|
||||||
MISMATCH_CHECK(QEMU_PSCI_RET_NOT_PRESENT, PSCI_RET_NOT_PRESENT);
|
MISMATCH_CHECK(QEMU_PSCI_RET_NOT_PRESENT, PSCI_RET_NOT_PRESENT);
|
||||||
MISMATCH_CHECK(QEMU_PSCI_RET_DISABLED, PSCI_RET_DISABLED);
|
MISMATCH_CHECK(QEMU_PSCI_RET_DISABLED, PSCI_RET_DISABLED);
|
||||||
|
|
||||||
/* Note that KVM uses overlapping values for AArch32 and AArch64
|
/*
|
||||||
* target CPU numbers. AArch32 targets:
|
* Note that KVM uses overlapping values for AArch32 and AArch64
|
||||||
|
* target CPU numbers. AArch64 targets:
|
||||||
*/
|
*/
|
||||||
#define QEMU_KVM_ARM_TARGET_CORTEX_A15 0
|
|
||||||
#define QEMU_KVM_ARM_TARGET_CORTEX_A7 1
|
|
||||||
|
|
||||||
/* AArch64 targets: */
|
|
||||||
#define QEMU_KVM_ARM_TARGET_AEM_V8 0
|
#define QEMU_KVM_ARM_TARGET_AEM_V8 0
|
||||||
#define QEMU_KVM_ARM_TARGET_FOUNDATION_V8 1
|
#define QEMU_KVM_ARM_TARGET_FOUNDATION_V8 1
|
||||||
#define QEMU_KVM_ARM_TARGET_CORTEX_A57 2
|
#define QEMU_KVM_ARM_TARGET_CORTEX_A57 2
|
||||||
|
|
Loading…
Reference in New Issue