[PATCH 0/2] target/arm: KVM Aarch32 spring cleaning

[PATCH 0/2] target/arm: KVM Aarch32 spring cleaning

[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

 target/arm/kvm-consts.h | 9 +++------
 hw/arm/virt.c           | 2 ++
 target/arm/cpu_tcg.c    | 2 --
 3 files changed, 5 insertions(+), 8 deletions(-)

-- 
2.38.1

[PATCH 1/2] target/arm: Remove KVM AArch32 CPU definitions

[Philippe Mathieu-Daudé]

Missed in commit 80485d88f9 ("target/arm: Restrict
v7A TCG cpus to TCG accel").

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 target/arm/kvm-consts.h | 9 +++------
 target/arm/cpu_tcg.c    | 2 --
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/target/arm/kvm-consts.h b/target/arm/kvm-consts.h
index 09967ec5e6..7c6adc14f6 100644
--- a/target/arm/kvm-consts.h
+++ b/target/arm/kvm-consts.h
@@ -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
diff --git a/target/arm/cpu_tcg.c b/target/arm/cpu_tcg.c
index df0c45e523..1911d7ec47 100644
--- a/target/arm/cpu_tcg.c
+++ b/target/arm/cpu_tcg.c
@@ -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;
-- 
2.38.1

[PATCH 2/2] hw/arm/virt: Restrict Cortex-A7 check to TCG

[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").

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 hw/arm/virt.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index ac626b3bef..1fe39c6683 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -204,7 +204,9 @@ static const int a15irqmap[] = {
 };
 
 static const char *valid_cpus[] = {
+#ifdef CONFIG_TCG
     ARM_CPU_TYPE_NAME("cortex-a7"),
+#endif
     ARM_CPU_TYPE_NAME("cortex-a15"),
     ARM_CPU_TYPE_NAME("cortex-a35"),
     ARM_CPU_TYPE_NAME("cortex-a53"),
-- 
2.38.1

Re: [PATCH 0/2] target/arm: KVM Aarch32 spring cleaning

[Richard Henderson]

On 4/5/23 03:08, Philippe Mathieu-Daudé wrote:
> 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(-)
> 

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>

r~

Re: [PATCH 0/2] target/arm: KVM Aarch32 spring cleaning

[Peter Maydell]

On Wed, 5 Apr 2023 at 23:06, Richard Henderson
<richard.henderson@linaro.org> wrote:
>
> On 4/5/23 03:08, Philippe Mathieu-Daudé wrote:
> > 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(-)
> >
>
> Reviewed-by: Richard Henderson <richard.henderson@linaro.org>

Applied to target-arm.next for 8.1, thanks.

-- PMM