kvm tools: arm: support Cortex-A7 CPUs
cover kvm tools: arm: support Cortex-A7 CPUs
These two patches allow KVM-tool to exploit the Cortex-A7 support for KVM recently posted to the kvmarm mailing list.
The first patch is a standalone cleanup to extract previously duplicated timer setup code, and allows us to add A7 support in a small subsequent patch.
Note: the removal of the timer code makes git refuse to see the following:tools/kvm/arm/aarch32/{cortex_a15.c --> arm-cpu.c} tools/kvm/arm/aarch64/{cortex_a57.c --> arm-cpu.c}
(even when passed -M40 git's decisions about what's new/renamed are confusing)
The second patch should not be merged before the Cortex-A7 support patches posted recently to the kvmarm list hit the kernel, as kvm-tool for ARM will not build if KVM_ARM_TARGET_CORTEX_A7 (added with that series) is not defined.
Jonathan Austin (2):
kvm tools: arm: extract common timer support code for ARM cpus kvm tools: arm: add support for ARM Cortex-A7
tools/kvm/Makefile | 6 +-- tools/kvm/arm/aarch32/arm-cpu.c | 42 ++++++++++++++++ tools/kvm/arm/aarch32/cortex-a15.c | 61 ----------------------- tools/kvm/arm/aarch64/arm-cpu.c | 50 +++++++++++++++++++ tools/kvm/arm/aarch64/cortex-a57.c | 80 ------------------------------ tools/kvm/arm/include/arm-common/timer.h | 6 +++ tools/kvm/arm/timer.c | 38 ++++++++++++++ 7 files changed, 139 insertions(+), 144 deletions(-) create mode 100644 tools/kvm/arm/aarch32/arm-cpu.c delete mode 100644 tools/kvm/arm/aarch32/cortex-a15.c create mode 100644 tools/kvm/arm/aarch64/arm-cpu.c delete mode 100644 tools/kvm/arm/aarch64/cortex-a57.c create mode 100644 tools/kvm/arm/include/arm-common/timer.h create mode 100644 tools/kvm/arm/timer.c
Signature · 1 line
1.7.9.5
PATCH 1/2 kvm tools: arm: extract common timer support code for ARM cpus
The ARM V7 and V8 CPUs use the nearly identical support code for generating timer DT nodes as they both use ARM's architected timers. This code is currently duplicated for AArch32 and AArch64.
This cleanup patch generalises timer DT node generation to follow the same pattern as for the GIC. The ability of a DT node to contain multiple compatible strings is exploited to allow an identical DT node to be used on V7 and V8 platforms.
--- tools/kvm/Makefile | 6 +-- tools/kvm/arm/aarch32/arm-cpu.c | 35 +++++++++++++ tools/kvm/arm/aarch32/cortex-a15.c | 61 ----------------------- tools/kvm/arm/aarch64/arm-cpu.c | 50 +++++++++++++++++++ tools/kvm/arm/aarch64/cortex-a57.c | 80 ------------------------------ tools/kvm/arm/include/arm-common/timer.h | 6 +++ tools/kvm/arm/timer.c | 38 ++++++++++++++ 7 files changed, 132 insertions(+), 144 deletions(-) create mode 100644 tools/kvm/arm/aarch32/arm-cpu.c delete mode 100644 tools/kvm/arm/aarch32/cortex-a15.c create mode 100644 tools/kvm/arm/aarch64/arm-cpu.c delete mode 100644 tools/kvm/arm/aarch64/cortex-a57.c create mode 100644 tools/kvm/arm/include/arm-common/timer.h create mode 100644 tools/kvm/arm/timer.c
tools/kvm/Makefile +3 -3
@@ -157,12 +157,12 @@ endif # ARM OBJS_ARM_COMMON := arm/fdt.o arm/gic.o arm/ioport.o arm/irq.o \ - arm/kvm.o arm/kvm-cpu.o + arm/kvm.o arm/kvm-cpu.o arm/timer.o HDRS_ARM_COMMON := arm/include ifeq ($(ARCH), arm) DEFINES += -DCONFIG_ARM OBJS += $(OBJS_ARM_COMMON) - OBJS += arm/aarch32/cortex-a15.o + OBJS += arm/aarch32/arm-cpu.o OBJS += arm/aarch32/kvm-cpu.o ARCH_INCLUDE := $(HDRS_ARM_COMMON) ARCH_INCLUDE += -Iarm/aarch32/include
@@ -175,7 +175,7 @@ endif ifeq ($(ARCH), arm64) DEFINES += -DCONFIG_ARM64 OBJS += $(OBJS_ARM_COMMON) - OBJS += arm/aarch64/cortex-a57.o + OBJS += arm/aarch64/arm-cpu.o OBJS += arm/aarch64/kvm-cpu.o ARCH_INCLUDE := $(HDRS_ARM_COMMON) ARCH_INCLUDE += -Iarm/aarch64/include
tools/kvm/arm/aarch32/arm-cpu.c new file +35 -0
@@ -0,0 +1,35 @@ +#include "kvm/kvm.h" +#include "kvm/kvm-cpu.h" +#include "kvm/util.h" + +#include "arm-common/gic.h" +#include "arm-common/timer.h" + +#include <linux/byteorder.h> +#include <linux/types.h> + +static void generate_fdt_nodes (void *fdt,struct kvm *kvm,u32 gic_phandle) +{ +int timer_interrupts[4 ] = {13 ,14 ,11 ,10 }; + +gic__generate_fdt_nodes (fdt, gic_phandle); +timer__generate_fdt_nodes (fdt, kvm, timer_interrupts); +} + +static int arm_cpu__vcpu_init (struct kvm_cpu *vcpu) +{ + vcpu->generate_fdt_nodes = generate_fdt_nodes; +return 0 ; +} + +static struct kvm_arm_target target_cortex_a15 = { + .id =KVM_ARM_TARGET_CORTEX_A15 , + .compatible ="arm,cortex-a15" , + .init = arm_cpu__vcpu_init, +}; + +static int arm_cpu__core_init (struct kvm *kvm) +{ +return kvm_cpu__register_kvm_arm_target (&target_cortex_a15); +} +core_init (arm_cpu__core_init);
tools/kvm/arm/aarch32/cortex-a15.c deleted +0 -61
61 lines not on this page · raw message
tools/kvm/arm/aarch64/arm-cpu.c new file +50 -0
50 lines not on this page · raw message
tools/kvm/arm/aarch64/cortex-a57.c deleted +0 -80
80 lines not on this page · raw message
tools/kvm/arm/include/arm-common/timer.h new file +6 -0
@@ -0,0 +1,6 @@ +#ifndef ARM_COMMON__TIMER_H +#define ARM_COMMON__TIMER_H + +void timer__generate_fdt_nodes (void *fdt,struct kvm *kvm,int *irqs); + +#endif /* ARM_COMMON__TIMER_H */
tools/kvm/arm/timer.c new file +38 -0
@@ -0,0 +1,38 @@ +#include "kvm/fdt.h" +#include "kvm/kvm.h" +#include "kvm/kvm-cpu.h" +#include "kvm/util.h" + +#include "arm-common/gic.h" +#include "arm-common/timer.h" + +void timer__generate_fdt_nodes (void *fdt,struct kvm *kvm,int *irqs) +{ +const char compatible[] ="arm,armv8-timer\0arm,armv7-timer" ; + +u32 cpu_mask = (((1 << kvm->nrcpus) -1 ) <<GIC_FDT_IRQ_PPI_CPU_SHIFT ) \ + &GIC_FDT_IRQ_PPI_CPU_MASK ; +u32 irq_prop[] = { +cpu_to_fdt32 (GIC_FDT_IRQ_TYPE_PPI ), +cpu_to_fdt32 (irqs[0 ]), +cpu_to_fdt32 (cpu_mask |GIC_FDT_IRQ_FLAGS_EDGE_LO_HI ), + +cpu_to_fdt32 (GIC_FDT_IRQ_TYPE_PPI ), +cpu_to_fdt32 (irqs[1 ]), +cpu_to_fdt32 (cpu_mask |GIC_FDT_IRQ_FLAGS_EDGE_LO_HI ), + +cpu_to_fdt32 (GIC_FDT_IRQ_TYPE_PPI ), +cpu_to_fdt32 (irqs[2 ]), +cpu_to_fdt32 (cpu_mask |GIC_FDT_IRQ_FLAGS_EDGE_LO_HI ), + +cpu_to_fdt32 (GIC_FDT_IRQ_TYPE_PPI ), +cpu_to_fdt32 (irqs[3 ]), +cpu_to_fdt32 (cpu_mask |GIC_FDT_IRQ_FLAGS_EDGE_LO_HI ), + }; + +_FDT (fdt_begin_node (fdt,"timer" )); +_FDT (fdt_property (fdt,"compatible" , compatible,sizeof (compatible))); +_FDT (fdt_property (fdt,"interrupts" , irq_prop,sizeof (irq_prop))); +_FDT (fdt_end_node (fdt)); +} +
Signature · 1 line
1.7.9.5
PATCH 2/2 kvm tools: arm: add support for ARM Cortex-A7
In reply to Jonathan AustinThe Cortex-A7 is very similar to the Cortex-A15 and as such there is very little extra infrastructure required for KVM tool to be able to create A7-guests.
This patch adds the basic support and allows booting of A7 guests on A7 hosts. It depends on Cortex-A7 support patches posted recently to the kvmarm list.
--- tools/kvm/arm/aarch32/arm-cpu.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
tools/kvm/arm/aarch32/arm-cpu.c +8 -1
@@ -28,8 +28,15 @@ static struct kvm_arm_target target_cortex_a15 = { .init = arm_cpu__vcpu_init, }; +static struct kvm_arm_target target_cortex_a7 = { + .id =KVM_ARM_TARGET_CORTEX_A7 , + .compatible ="arm,cortex-a7" , + .init = arm_cpu__vcpu_init, +}; +static int arm_cpu__core_init (struct kvm *kvm) { -return kvm_cpu__register_kvm_arm_target (&target_cortex_a15); +return (kvm_cpu__register_kvm_arm_target (&target_cortex_a15) || +kvm_cpu__register_kvm_arm_target (&target_cortex_a7)); }core_init (arm_cpu__core_init);
Signature · 1 line
1.7.9.5
Re: [PATCH 2/2] kvm tools: arm: add support for ARM Cortex-A7
Quoted 22 lines · Jonathan Austin
The Cortex-A7 is very similar to the Cortex-A15 and as such there is very little extra infrastructure required for KVM tool to be able to create A7-guests.
This patch adds the basic support and allows booting of A7 guests on A7 hosts. It depends on Cortex-A7 support patches posted recently to the kvmarm list.
Signed-off-by Jonathan Austin <[email protected]>--- tools/kvm/arm/aarch32/arm-cpu.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)tools/kvm/arm/aarch32/arm-cpu.c +1
-0@@ -28,8 +28,15 @@ static struct kvm_arm_target target_cortex_a15 = { .init = arm_cpu__vcpu_init, }; +static struct kvm_arm_target target_cortex_a7 = {
tools/kvm/arm/aarch32/arm-cpu.c static struct kvm_arm_target target_cortex_a15 = { · line 40
Quoted 10 lines
tools/kvm/arm/aarch32/arm-cpu.c +7
-1+ .id = KVM_ARM_TARGET_CORTEX_A7, + .compatible = "arm,cortex-a7", + .init = arm_cpu__vcpu_init, +}; +static int arm_cpu__core_init (struct kvm *kvm) { -return kvm_cpu__register_kvm_arm_target (&target_cortex_a15); +return (kvm_cpu__register_kvm_arm_target (&target_cortex_a15) || +kvm_cpu__register_kvm_arm_target (&target_cortex_a7));
However, we should hold off applying this to kvmtool until KVM_ARM_TARGET_CORTEX_A7 is defined in the kernel sources which it is shipped with. Do you have an ETA on this change going into the mainline kernel?
(in the meantime, I'm happy to stage stuff in my kvmtool/arm tree).
Will
Re: [PATCH 2/2] kvm tools: arm: add support for ARM Cortex-A7
Quoted 6 lines · Will Deacon
However, we should hold off applying this to kvmtool until
KVM_ARM_TARGET_CORTEX_A7is defined in the kernel sources which it is shipped with. Do you have an ETA on this change going into the mainline kernel?(in the meantime, I'm happy to stage stuff in my kvmtool/arm tree).
OK, I'll just wait for you or someone else to resend at a later time.
Pekka
Re: [PATCH 2/2] kvm tools: arm: add support for ARM Cortex-A7
In reply to Will DeaconQuoted 36 lines · Will Deacon
Quoted 22 lines · Jonathan Austin
The Cortex-A7 is very similar to the Cortex-A15 and as such there is very little extra infrastructure required for KVM tool to be able to create A7-guests.
This patch adds the basic support and allows booting of A7 guests on A7 hosts. It depends on Cortex-A7 support patches posted recently to the kvmarm list.
Signed-off-by Jonathan Austin <[email protected]>--- tools/kvm/arm/aarch32/arm-cpu.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)tools/kvm/arm/aarch32/arm-cpu.c +1
-0@@ -28,8 +28,15 @@ static struct kvm_arm_target target_cortex_a15 = { .init = arm_cpu__vcpu_init, }; +static struct kvm_arm_target target_cortex_a7 = {tools/kvm/arm/aarch32/arm-cpu.c static struct kvm_arm_target target_cortex_a15 = { · line 40
Quoted 10 lines
tools/kvm/arm/aarch32/arm-cpu.c +7
-1+ .id = KVM_ARM_TARGET_CORTEX_A7, + .compatible = "arm,cortex-a7", + .init = arm_cpu__vcpu_init, +}; +static int arm_cpu__core_init (struct kvm *kvm) { -return kvm_cpu__register_kvm_arm_target (&target_cortex_a15); +return (kvm_cpu__register_kvm_arm_target (&target_cortex_a15) || +kvm_cpu__register_kvm_arm_target (&target_cortex_a7));Acked-by Will Deacon <[email protected]>
Quoted 5 lines
However, we should hold off applying this to kvmtool until
KVM_ARM_TARGET_CORTEX_A7is defined in the kernel sources which it is shipped with. Do you have an ETA on this change going into the mainline kernel?
I plan to merge during next merge window.
-Christoffer
Re: [PATCH 2/2] kvm tools: arm: add support for ARM Cortex-A7
Quoted 7 lines · Christoffer Dall
Quoted 5 lines · Will Deacon
However, we should hold off applying this to kvmtool until
KVM_ARM_TARGET_CORTEX_A7is defined in the kernel sources which it is shipped with. Do you have an ETA on this change going into the mainline kernel?I plan to merge during next merge window.
Reminder, after cpu-host, please :-)
-- PMM
Re: [PATCH 2/2] kvm tools: arm: add support for ARM Cortex-A7
Quoted 12 lines · Peter Maydell
Quoted 7 lines · Christoffer Dall
Quoted 5 lines · Will Deacon
However, we should hold off applying this to kvmtool until
KVM_ARM_TARGET_CORTEX_A7is defined in the kernel sources which it is shipped with. Do you have an ETA on this change going into the mainline kernel?I plan to merge during next merge window.
Reminder, after cpu-host, please :-)
Yes, plan to merge that one too, I have to re-read Anup's final patch series later today, but I don't anticipate any more problems there.
Marc?
-Christoffer
Re: [PATCH 2/2] kvm tools: arm: add support for ARM Cortex-A7
Quoted 9 lines · Christoffer Dall
Quoted 8 lines · Peter Maydell
Quoted 6 lines · Christoffer Dall
Quoted 5 lines · Will Deacon
However, we should hold off applying this to kvmtool until
KVM_ARM_TARGET_CORTEX_A7is defined in the kernel sources which it is shipped with. Do you have an ETA on this change going into the mainline kernel?
Quoted 8 lines
Quoted 4 lines
Quoted 1 line
I plan to merge during next merge window.
Reminder, after cpu-host, please :-)
Yes, plan to merge that one too, I have to re-read Anup's final patch series later today, but I don't anticipate any more problems there.
Marc?
Still need to go through the patches, but it hopefully should be OK this time.
M.
Signature · 1 line
Jazz is not dead. It just smells funny...
Re: [PATCH 2/2] kvm tools: arm: add support for ARM Cortex-A7
In reply to Christoffer DallQuoted 11 lines · Christoffer Dall
Quoted 10 lines · Will Deacon
Quoted 9 lines · Jonathan Austin
The Cortex-A7 is very similar to the Cortex-A15 and as such there is very little extra infrastructure required for KVM tool to be able to create A7-guests.
This patch adds the basic support and allows booting of A7 guests on A7 hosts. It depends on Cortex-A7 support patches posted recently to the kvmarm list.
Signed-off-by Jonathan Austin <[email protected]>
[...]
Quoted 6 lines
Quoted 5 lines
However, we should hold off applying this to kvmtool until
KVM_ARM_TARGET_CORTEX_A7is defined in the kernel sources which it is shipped with. Do you have an ETA on this change going into the mainline kernel?I plan to merge during next merge window.
Great! Any chance you could publish them in your kvm-arm-next branch please?
Will
Re: [PATCH 2/2] kvm tools: arm: add support for ARM Cortex-A7
Quoted 15 lines · Will Deacon
Quoted 11 lines · Christoffer Dall
Quoted 10 lines · Will Deacon
Quoted 9 lines · Jonathan Austin
The Cortex-A7 is very similar to the Cortex-A15 and as such there is very little extra infrastructure required for KVM tool to be able to create A7-guests.
This patch adds the basic support and allows booting of A7 guests on A7 hosts. It depends on Cortex-A7 support patches posted recently to the kvmarm list.
Signed-off-by Jonathan Austin <[email protected]>[...]
Quoted 9 lines
Quoted 6 lines
Quoted 5 lines
However, we should hold off applying this to kvmtool until
KVM_ARM_TARGET_CORTEX_A7is defined in the kernel sources which it is shipped with. Do you have an ETA on this change going into the mainline kernel?I plan to merge during next merge window.
Great! Any chance you could publish them in your kvm-arm-next branch please?
Working on it, need to test them first, hopefully this weekend! Otherwise Monday.
-Christoffer