target/arm: KVM Aarch32 spring cleaning
cover target/arm: KVM Aarch32 spring cleaning
Remove unused KVM/Aarch32 definitions.
Philippe Mathieu-Daudé (2):
target/arm: Remove KVM AArch32 CPU definitions
hw/arm/virt: Restrict Cortex-A7 check to TCG
target/arm/kvm-consts.h | 9 +++------ hw/arm/virt.c | 2 ++ target/arm/cpu_tcg.c | 2 -- 3 files changed, 5 insertions(+), 8 deletions(-)
Signature · 1 line
2.38.1
PATCH 1/2 target/arm: Remove KVM AArch32 CPU definitions
Missed in commit 80485d88f9 ("target/arm: Restrict v7A TCG cpus to TCG accel").
--- target/arm/kvm-consts.h | 9 +++------ target/arm/cpu_tcg.c | 2 -- 2 files changed, 3 insertions(+), 8 deletions(-)
target/arm/kvm-consts.h +3 -6
@@ -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_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_FOUNDATION_V8 1#define QEMU_KVM_ARM_TARGET_CORTEX_A57 2
target/arm/cpu_tcg.c +0 -2
@@ -546,7 +546,6 @@ static void cortex_a7_initfn(Object *obj)set_feature (&cpu->env,ARM_FEATURE_EL2 );set_feature (&cpu->env,ARM_FEATURE_EL3 );set_feature (&cpu->env,ARM_FEATURE_PMU ); - cpu->kvm_target =QEMU_KVM_ARM_TARGET_CORTEX_A7 ; cpu->midr =0x410fc075 ; cpu->reset_fpsid =0x41023075 ; 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_EL3 );set_feature (&cpu->env,ARM_FEATURE_PMU ); - cpu->kvm_target =QEMU_KVM_ARM_TARGET_CORTEX_A15 ;/* r4p0 cpu, not requiring expensive tlb flush errata */ cpu->midr =0x414fc0f0 ; cpu->revidr =0x0 ;
Signature · 1 line
2.38.1
PATCH 2/2 hw/arm/virt: Restrict Cortex-A7 check to TCG
In reply to Philippe Mathieu-DaudéThe Cortex-A7 core is only available when TCG is enabled (see commit 80485d88f9 "target/arm: Restrict v7A TCG cpus to TCG accel").
--- hw/arm/virt.c | 2 ++ 1 file changed, 2 insertions(+)
hw/arm/virt.c +2 -0
@@ -204,7 +204,9 @@ static const int a15irqmap[] = { };static const char *valid_cpus[] = { +#ifdef CONFIG_TCGARM_CPU_TYPE_NAME ("cortex-a7" ), +#endifARM_CPU_TYPE_NAME ("cortex-a15" ),ARM_CPU_TYPE_NAME ("cortex-a35" ),ARM_CPU_TYPE_NAME ("cortex-a53" ),
Signature · 1 line
2.38.1
Quoted 11 lines · Philippe Mathieu-Daudé
Remove unused KVM/Aarch32 definitions.
Philippe Mathieu-Daudé (2):
target/arm: Remove KVM AArch32 CPU definitions
hw/arm/virt: Restrict Cortex-A7 check to TCGtarget/arm/kvm-consts.h | 9 +++------ hw/arm/virt.c | 2 ++ target/arm/cpu_tcg.c | 2 -- 3 files changed, 5 insertions(+), 8 deletions(-)
r~
Peter Maydell
AppliedQuoted 8 lines · Richard Henderson
Quoted 6 lines · Philippe Mathieu-Daudé
Remove unused KVM/Aarch32 definitions.
Philippe Mathieu-Daudé (2):
target/arm: Remove KVM AArch32 CPU definitions
hw/arm/virt: Restrict Cortex-A7 check to TCG
Quoted 7 lines
Quoted 5 lines
target/arm/kvm-consts.h | 9 +++------ hw/arm/virt.c | 2 ++ target/arm/cpu_tcg.c | 2 -- 3 files changed, 5 insertions(+), 8 deletions(-)Reviewed-by Richard Henderson <[email protected]>
Applied to target-arm.next for 8.1, thanks.
-- PMM