diff options
| author | Vladimir Murzin <vladimir.murzin@arm.com> | 2017-04-25 15:39:25 +0100 |
|---|---|---|
| committer | Will Deacon <will.deacon@arm.com> | 2017-06-09 11:16:47 +0100 |
| commit | 04ecf98aa44f5b9c9cab82168db8bd69239a382a (patch) | |
| tree | e852989cf5f619c7f7ec7d407a0288d2f459386b | |
| parent | 764dfba19d3b5a3a565b303464b6e336198eb6f9 (diff) | |
| download | kvmtool-04ecf98aa44f5b9c9cab82168db8bd69239a382a.tar.gz | |
arm: allow vGICv3 emulation
KVM/arm recently got support for vGICv3 (and vITS), which is evident
in the updated header file. So as now ARM has feature parity when it
comes to the GIC emulation, we can remove the special defines we had
in place to allow compilation for ARM(32).
For simplicity we now use 64K sized GIC regions everywhere, as GICv3
mandates them.
[Andre: some update, reword commit message]
Acked-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Vladimir Murzin <vladimir.murzin@arm.com>
Acked-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Andre Przywara <andre.przywara@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
| -rw-r--r-- | arm/aarch32/arm-cpu.c | 2 | ||||
| -rw-r--r-- | arm/aarch32/include/kvm/kvm-arch.h | 3 | ||||
| -rw-r--r-- | arm/aarch64/include/kvm/kvm-arch.h | 3 | ||||
| -rw-r--r-- | arm/gic.c | 9 | ||||
| -rw-r--r-- | arm/include/arm-common/kvm-arch.h | 2 |
5 files changed, 3 insertions, 16 deletions
diff --git a/arm/aarch32/arm-cpu.c b/arm/aarch32/arm-cpu.c index 27a8e17f..16bba552 100644 --- a/arm/aarch32/arm-cpu.c +++ b/arm/aarch32/arm-cpu.c @@ -12,7 +12,7 @@ static void generate_fdt_nodes(void *fdt, struct kvm *kvm) { int timer_interrupts[4] = {13, 14, 11, 10}; - gic__generate_fdt_nodes(fdt, IRQCHIP_GICV2); + gic__generate_fdt_nodes(fdt, kvm->cfg.arch.irqchip); timer__generate_fdt_nodes(fdt, kvm, timer_interrupts); } diff --git a/arm/aarch32/include/kvm/kvm-arch.h b/arm/aarch32/include/kvm/kvm-arch.h index 1632e3c5..cd31e729 100644 --- a/arm/aarch32/include/kvm/kvm-arch.h +++ b/arm/aarch32/include/kvm/kvm-arch.h @@ -1,9 +1,6 @@ #ifndef KVM__KVM_ARCH_H #define KVM__KVM_ARCH_H -#define ARM_GIC_DIST_SIZE 0x1000 -#define ARM_GIC_CPUI_SIZE 0x2000 - #define ARM_KERN_OFFSET(...) 0x8000 #define ARM_MAX_MEMORY(...) ARM_LOMAP_MAX_MEMORY diff --git a/arm/aarch64/include/kvm/kvm-arch.h b/arm/aarch64/include/kvm/kvm-arch.h index 4925736d..9de623ac 100644 --- a/arm/aarch64/include/kvm/kvm-arch.h +++ b/arm/aarch64/include/kvm/kvm-arch.h @@ -1,9 +1,6 @@ #ifndef KVM__KVM_ARCH_H #define KVM__KVM_ARCH_H -#define ARM_GIC_DIST_SIZE 0x10000 -#define ARM_GIC_CPUI_SIZE 0x20000 - #define ARM_KERN_OFFSET(kvm) ((kvm)->cfg.arch.aarch32_guest ? \ 0x8000 : \ 0x80000) @@ -9,15 +9,6 @@ #include <linux/kernel.h> #include <linux/kvm.h> -/* Those names are not defined for ARM (yet) */ -#ifndef KVM_VGIC_V3_ADDR_TYPE_DIST -#define KVM_VGIC_V3_ADDR_TYPE_DIST 2 -#endif - -#ifndef KVM_VGIC_V3_ADDR_TYPE_REDIST -#define KVM_VGIC_V3_ADDR_TYPE_REDIST 3 -#endif - static int gic_fd = -1; static u64 gic_redists_base; static u64 gic_redists_size; diff --git a/arm/include/arm-common/kvm-arch.h b/arm/include/arm-common/kvm-arch.h index 0f5fb7ff..c83c45fc 100644 --- a/arm/include/arm-common/kvm-arch.h +++ b/arm/include/arm-common/kvm-arch.h @@ -18,6 +18,8 @@ #define ARM_GIC_DIST_BASE (ARM_AXI_AREA - ARM_GIC_DIST_SIZE) #define ARM_GIC_CPUI_BASE (ARM_GIC_DIST_BASE - ARM_GIC_CPUI_SIZE) #define ARM_GIC_SIZE (ARM_GIC_DIST_SIZE + ARM_GIC_CPUI_SIZE) +#define ARM_GIC_DIST_SIZE 0x10000 +#define ARM_GIC_CPUI_SIZE 0x20000 #define ARM_IOPORT_SIZE (ARM_MMIO_AREA - ARM_IOPORT_AREA) #define ARM_VIRTIO_MMIO_SIZE (ARM_AXI_AREA - (ARM_MMIO_AREA + ARM_GIC_SIZE)) |