vGICv3 support
v4 cover vGICv3 support
This series introduces support for GICv3 by KVM. Software emulation is currently not supported.
Differences from v4:
- Do not reintroduce several constants shared with GICv2, reuse them instead.
- Added gicv3_init_irqs_and_mmio() in base class, to be used by both software emulation and KVM code. Avoids code duplication.
- Do not add NULL msi-parent phandle to PCI device in the FDT
- Removed a couple of stale things from virt.c
Differences from v3:
- Fixed stupid build breakage in patch 0002
- Rebased on top of current master, patch 0003 adjusted according to kvm_irqchip_create() changes
- Added assertion against uninitialized kernel_irqchip_type
- Removed kernel_irqchip_type initialization from models which do not use KVM vGIC
Differences from v2:
- Removed some unrelated and unnecessary changes from virt machine, occasionally slipped in; some of them caused qemu to crash on ARM32.
- Fixed build for ARM32; vGICv3 code requires definitions which are present only in ARM64 kernel
Differences from v1:
- Base class included, taken from the series by Shlomo Pongratz:
http://lists.nongnu.org/archive/html/qemu-devel/2015-06/msg01512.html
The code is refactored as little as possible in order to simplify further addition of software emulation:
- Minor fixes in code style and comments, according to old reviews
- Removed REV_V3 definition because it's currently not used, and it does not add any meaning to number 3.
- Removed reserved regions for MBI and ITS (except for 'virt' machine memory map). These should go to separate classes when implemented.
- Improved commit messages
- vGIC patches restructured
- Use 'gicversion' option instead of virt-v3 machine
Pavel Fedin (4):
Extract some reusable vGIC code
Introduce irqchip type specification for KVM
Initial implementation of vGICv3
Add gicversion option to virt machine
Shlomo Pongratz (1):
Implement GIC-500 base class
hw/arm/vexpress.c | 1 + hw/arm/virt.c | 140 ++++++++++++++++---- hw/intc/Makefile.objs | 4 + hw/intc/arm_gic_kvm.c | 84 ++++++------ hw/intc/arm_gicv3_common.c | 260 +++++++++++++++++++++++++++++++++++++ hw/intc/arm_gicv3_kvm.c | 159 +++++++++++++++++++++++ hw/intc/gicv3_internal.h | 156 ++++++++++++++++++++++ hw/intc/vgic_common.h | 43 ++++++ include/hw/arm/fdt.h | 2 +- include/hw/arm/virt.h | 6 +- include/hw/boards.h | 1 + include/hw/intc/arm_gicv3_common.h | 113 ++++++++++++++++ include/sysemu/kvm.h | 3 +- kvm-all.c | 2 +- stubs/kvm.c | 2 +- target-arm/kvm.c | 13 +- 16 files changed, 915 insertions(+), 74 deletions(-) create mode 100644 hw/intc/arm_gicv3_common.c create mode 100644 hw/intc/arm_gicv3_kvm.c create mode 100644 hw/intc/gicv3_internal.h create mode 100644 hw/intc/vgic_common.h create mode 100644 include/hw/intc/arm_gicv3_common.h
Signature · 1 line
1.9.5.msysgit.0
PATCH v5 2/5 Extract some reusable vGIC code
These functions are useful also for vGICv3 implementation. Make them accessible from within other modules.
Actually kvm_dist_get() and kvm_dist_put() could also be made reusable, but they would require two extra parameters (s->dev_fd and s->num_cpu) as well as lots of typecasts of 's' to DeviceState * and back to GICState *. This makes the code very ugly so i decided to stop at this point. I tried also an approach with making a base class for all possible GICs, but it would contain only three variables (dev_fd, cpu_num and irq_num), and accessing them through the rest of the code would be again tedious (either ugly casts or qemu-style separate object pointer). So i disliked it too.
--- hw/intc/arm_gic_kvm.c | 84 ++++++++++++++++++++++++--------------------------- hw/intc/vgic_common.h | 43 ++++++++++++++++++++++++++ 2 files changed, 82 insertions(+), 45 deletions(-) create mode 100644 hw/intc/vgic_common.h
hw/intc/arm_gic_kvm.c +39 -45
@@ -23,6 +23,7 @@#include "sysemu/kvm.h" #include "kvm_arm.h" #include "gic_internal.h" +#include "vgic_common.h" //#define DEBUG_GIC_KVM
@@ -52,7 +53,7 @@ typedef struct KVMARMGICClass {void (*parent_reset)(DeviceState *dev); } KVMARMGICClass; -static void kvm_arm_gic_set_irq (void *opaque,int irq,int level) +void kvm_arm_gic_set_irq (uint32_t num_irq,int irq,int level) {/* Meaning of the 'irq' parameter: * [0..N-1] : external interrupts
@@ -63,10 +64,9 @@ static void kvm_arm_gic_set_irq(void *opaque, int irq, int level)* has separate fields in the irq number for type, * CPU number and interrupt number. */ -GICState *s = (GICState *)opaque;int kvm_irq, irqtype, cpu; -if (irq < (s->num_irq -GIC_INTERNAL )) { +if (irq < (num_irq -GIC_INTERNAL )) {/* External interrupt. The kernel numbers these like the GIC * hardware, with external interrupt IDs starting after the * internal ones.
@@ -77,7 +77,7 @@ static void kvm_arm_gic_set_irq(void *opaque, int irq, int level) }else {/* Internal interrupt: decode into (cpu, interrupt id) */ irqtype =KVM_ARM_IRQ_TYPE_PPI ; - irq -= (s->num_irq -GIC_INTERNAL ); + irq -= (num_irq -GIC_INTERNAL ); cpu = irq /GIC_INTERNAL ; irq %=GIC_INTERNAL ; }
@@ -87,12 +87,19 @@ static void kvm_arm_gic_set_irq(void *opaque, int irq, int level)kvm_set_irq (kvm_state, kvm_irq, !!level); } +static void kvm_arm_gicv2_set_irq (void *opaque,int irq,int level) +{ +GICState *s = (GICState *)opaque; + +kvm_arm_gic_set_irq (s->num_irq, irq, level); +} +static bool kvm_arm_gic_can_save_restore (GICState *s) {return s->dev_fd >=0 ; } -static bool kvm_gic_supports_attr (GICState *s,int group,int attrnum) +bool kvm_gic_supports_attr (int dev_fd,int group,int attrnum) {struct kvm_device_attr attr = { .group = group,
@@ -100,14 +107,14 @@ static bool kvm_gic_supports_attr(GICState *s, int group, int attrnum) .flags = 0, }; -if (s->dev_fd ==-1 ) { +if (dev_fd ==-1 ) {return false; } -return kvm_device_ioctl (s->dev_fd,KVM_HAS_DEVICE_ATTR , &attr) ==0 ; +return kvm_device_ioctl (dev_fd,KVM_HAS_DEVICE_ATTR , &attr) ==0 ; } -static void kvm_gic_access (GICState *s,int group,int offset, +void kvm_gic_access (int dev_fd,int group,int offset,int cpu,uint32_t *val,bool write) {struct kvm_device_attr attr;
@@ -130,7 +137,7 @@ static void kvm_gic_access(GICState *s, int group, int offset, type =KVM_GET_DEVICE_ATTR ; } - err =kvm_device_ioctl (s->dev_fd, type, &attr); + err =kvm_device_ioctl (dev_fd, type, &attr);if (err <0 ) {fprintf (stderr,"KVM_{SET/GET}_DEVICE_ATTR failed: %s\n" ,strerror (-err));
@@ -138,20 +145,6 @@ static void kvm_gic_access(GICState *s, int group, int offset, } } -static void kvm_gicd_access (GICState *s,int offset,int cpu, -uint32_t *val,bool write) -{ -kvm_gic_access (s,KVM_DEV_ARM_VGIC_GRP_DIST_REGS , - offset, cpu, val, write); -} - -static void kvm_gicc_access (GICState *s,int offset,int cpu, -uint32_t *val,bool write) -{ -kvm_gic_access (s,KVM_DEV_ARM_VGIC_GRP_CPU_REGS , - offset, cpu, val, write); -} -#define for_each_irq_reg (_ctr, _max_irq, _field_width) \ for (_ctr = 0; _ctr < ((_max_irq) / (32 / (_field_width))); _ctr++)
@@ -291,7 +284,7 @@ static void kvm_dist_get(GICState *s, uint32_t offset, int width, irq = i * regsz; cpu =0 ;while ((cpu < s->num_cpu && irq <GIC_INTERNAL ) || cpu ==0 ) { -kvm_gicd_access (s, offset, cpu, ®, false); +kvm_gicd_access (s->dev_fd, offset, cpu, ®, false);for (j =0 ; j < regsz; j++) { field =extract32 (reg, j * width, width);translate_fn (s, irq + j, cpu, &field, false);
@@ -324,7 +317,7 @@ static void kvm_dist_put(GICState *s, uint32_t offset, int width,translate_fn (s, irq + j, cpu, &field, true); reg =deposit32 (reg, j * width, width, field); } -kvm_gicd_access (s, offset, cpu, ®, true); +kvm_gicd_access (s->dev_fd, offset, cpu, ®, true); cpu++; }
@@ -355,10 +348,10 @@ static void kvm_arm_gic_put(GICState *s)/* s->ctlr -> GICD_CTLR */ reg = s->ctlr; -kvm_gicd_access (s,0x0 ,0 , ®, true); +kvm_gicd_access (s->dev_fd,0x0 ,0 , ®, true);/* Sanity checking on GICD_TYPER and s->num_irq, s->num_cpu */ -kvm_gicd_access (s,0x4 ,0 , ®, false); +kvm_gicd_access (s->dev_fd,0x4 ,0 , ®, false); num_irq = ((reg &0x1f ) +1 ) *32 ; num_cpu = ((reg &0xe0 ) >>5 ) +1 ;
@@ -416,24 +409,24 @@ static void kvm_arm_gic_put(GICState *s)for (cpu =0 ; cpu < s->num_cpu; cpu++) {/* s->cpu_ctlr[cpu] -> GICC_CTLR */ reg = s->cpu_ctlr[cpu]; -kvm_gicc_access (s,0x00 , cpu, ®, true); +kvm_gicc_access (s->dev_fd,0x00 , cpu, ®, true);/* s->priority_mask[cpu] -> GICC_PMR */ reg = (s->priority_mask[cpu] &0xff ); -kvm_gicc_access (s,0x04 , cpu, ®, true); +kvm_gicc_access (s->dev_fd,0x04 , cpu, ®, true);/* s->bpr[cpu] -> GICC_BPR */ reg = (s->bpr[cpu] &0x7 ); -kvm_gicc_access (s,0x08 , cpu, ®, true); +kvm_gicc_access (s->dev_fd,0x08 , cpu, ®, true);/* s->abpr[cpu] -> GICC_ABPR */ reg = (s->abpr[cpu] &0x7 ); -kvm_gicc_access (s,0x1c , cpu, ®, true); +kvm_gicc_access (s->dev_fd,0x1c , cpu, ®, true);/* s->apr[n][cpu] -> GICC_APRn */ for (i =0 ; i <4 ; i++) { reg = s->apr[i][cpu]; -kvm_gicc_access (s,0xd0 + i *4 , cpu, ®, true); +kvm_gicc_access (s->dev_fd,0xd0 + i *4 , cpu, ®, true); } } }
@@ -454,11 +447,11 @@ static void kvm_arm_gic_get(GICState *s)*/ /* GICD_CTLR -> s->ctlr */ -kvm_gicd_access (s,0x0 ,0 , ®, false); +kvm_gicd_access (s->dev_fd,0x0 ,0 , ®, false); s->ctlr = reg;/* Sanity checking on GICD_TYPER -> s->num_irq, s->num_cpu */ -kvm_gicd_access (s,0x4 ,0 , ®, false); +kvm_gicd_access (s->dev_fd,0x4 ,0 , ®, false); s->num_irq = ((reg &0x1f ) +1 ) *32 ; s->num_cpu = ((reg &0xe0 ) >>5 ) +1 ;
@@ -469,7 +462,7 @@ static void kvm_arm_gic_get(GICState *s) }/* GICD_IIDR -> ? */ -kvm_gicd_access (s,0x8 ,0 , ®, false); +kvm_gicd_access (s->dev_fd,0x8 ,0 , ®, false);/* Clear all the IRQ settings */ for (i =0 ; i < s->num_irq; i++) {
@@ -507,24 +500,24 @@ static void kvm_arm_gic_get(GICState *s)for (cpu =0 ; cpu < s->num_cpu; cpu++) {/* GICC_CTLR -> s->cpu_ctlr[cpu] */ -kvm_gicc_access (s,0x00 , cpu, ®, false); +kvm_gicc_access (s->dev_fd,0x00 , cpu, ®, false); s->cpu_ctlr[cpu] = reg;/* GICC_PMR -> s->priority_mask[cpu] */ -kvm_gicc_access (s,0x04 , cpu, ®, false); +kvm_gicc_access (s->dev_fd,0x04 , cpu, ®, false); s->priority_mask[cpu] = (reg &0xff );/* GICC_BPR -> s->bpr[cpu] */ -kvm_gicc_access (s,0x08 , cpu, ®, false); +kvm_gicc_access (s->dev_fd,0x08 , cpu, ®, false); s->bpr[cpu] = (reg &0x7 );/* GICC_ABPR -> s->abpr[cpu] */ -kvm_gicc_access (s,0x1c , cpu, ®, false); +kvm_gicc_access (s->dev_fd,0x1c , cpu, ®, false); s->abpr[cpu] = (reg &0x7 );/* GICC_APRn -> s->apr[n][cpu] */ for (i =0 ; i <4 ; i++) { -kvm_gicc_access (s,0xd0 + i *4 , cpu, ®, false); +kvm_gicc_access (s->dev_fd,0xd0 + i *4 , cpu, ®, false); s->apr[i][cpu] = reg; } }
@@ -569,7 +562,7 @@ static void kvm_arm_gic_realize(DeviceState *dev, Error **errp)* ... */ i += (GIC_INTERNAL * s->num_cpu); -qdev_init_gpio_in (dev, kvm_arm_gic_set_irq, i); +qdev_init_gpio_in (dev, kvm_arm_gicv2_set_irq, i);for (i =0 ; i < s->num_irq -GIC_INTERNAL ; i++) {qemu_irq irq =qdev_get_gpio_in (dev, i);
@@ -596,15 +589,16 @@ static void kvm_arm_gic_realize(DeviceState *dev, Error **errp)return ; } -if (kvm_gic_supports_attr (s,KVM_DEV_ARM_VGIC_GRP_NR_IRQS ,0 )) { +if (kvm_gic_supports_attr (s->dev_fd,KVM_DEV_ARM_VGIC_GRP_NR_IRQS ,0 )) {uint32_t numirqs = s->num_irq; -kvm_gic_access (s,KVM_DEV_ARM_VGIC_GRP_NR_IRQS ,0 ,0 , &numirqs,1 ); +kvm_gic_access (s->dev_fd,KVM_DEV_ARM_VGIC_GRP_NR_IRQS ,0 ,0 , + &numirqs,1 ); }/* Tell the kernel to complete VGIC initialization now */ -if (kvm_gic_supports_attr (s,KVM_DEV_ARM_VGIC_GRP_CTRL , +if (kvm_gic_supports_attr (s->dev_fd,KVM_DEV_ARM_VGIC_GRP_CTRL ,KVM_DEV_ARM_VGIC_CTRL_INIT )) { -kvm_gic_access (s,KVM_DEV_ARM_VGIC_GRP_CTRL , +kvm_gic_access (s->dev_fd,KVM_DEV_ARM_VGIC_GRP_CTRL ,KVM_DEV_ARM_VGIC_CTRL_INIT ,0 ,0 ,1 ); }
hw/intc/vgic_common.h new file +43 -0
43 lines not on this page · raw message
Signature · 1 line
1.9.5.msysgit.0
PATCH v5 3/5 Introduce irqchip type specification for KVM
In reply to Pavel FedinThis patch introduces kernel_irqchip_type member in Machine class, which it passed to kvm_arch_irqchip_create. It allows machine models to specify correct GIC type during KVM capability verification. The variable is defined as int in order to be architecture-agnostic for potential future uses by other architectures.
--- hw/arm/vexpress.c | 1 + hw/arm/virt.c | 3 +++ include/hw/boards.h | 1 + include/sysemu/kvm.h | 3 ++- kvm-all.c | 2 +- stubs/kvm.c | 2 +- target-arm/kvm.c | 13 +++++++++++-- 7 files changed, 20 insertions(+), 5 deletions(-)
hw/arm/vexpress.c +1 -0
@@ -556,6 +556,7 @@ static void vexpress_common_init(MachineState *machine)const hwaddr *map = daughterboard->motherboard_map;int i; + machine->kernel_irqchip_type =KVM_DEV_TYPE_ARM_VGIC_V2 ; daughterboard->init (vms, machine->ram_size, machine->cpu_model, pic);/*
hw/arm/virt.c +3 -0
@@ -945,6 +945,9 @@ static void virt_instance_init(Object *obj)"Set on/off to enable/disable the ARM " "Security Extensions (TrustZone)" , NULL); + +/* Default GIC type is v2 */ + vms->parent.kernel_irqchip_type =KVM_DEV_TYPE_ARM_VGIC_V2 ; }static void virt_class_init (ObjectClass *oc,void *data)
include/hw/boards.h +1 -0
@@ -127,6 +127,7 @@ struct MachineState {char *accel;bool kernel_irqchip_allowed;bool kernel_irqchip_required; +int kernel_irqchip_type;int kvm_shadow_mem;char *dtb;char *dumpdtb;
include/sysemu/kvm.h +2 -1
@@ -434,6 +434,7 @@ void kvm_init_irq_routing(KVMState *s);/** * kvm_arch_irqchip_create: * @KVMState: The KVMState pointer +* @type: irqchip type, architecture-specific * * Allow architectures to create an in-kernel irq chip themselves. *
@@ -441,7 +442,7 @@ void kvm_init_irq_routing(KVMState *s);* 0: irq chip was not created * > 0: irq chip was created */ -int kvm_arch_irqchip_create (KVMState *s); +int kvm_arch_irqchip_create (KVMState *s,int type);/** * kvm_set_one_reg - set a register value in KVM via KVM_SET_ONE_REG ioctl
kvm-all.c +1 -1
@@ -1395,7 +1395,7 @@ static void kvm_irqchip_create(MachineState *machine, KVMState *s)/* First probe and see if there's a arch-specific hook to create the * in-kernel irqchip for us */ - ret =kvm_arch_irqchip_create (s); + ret =kvm_arch_irqchip_create (s, machine->kernel_irqchip_type);if (ret ==0 ) { ret =kvm_vm_ioctl (s,KVM_CREATE_IRQCHIP ); }
stubs/kvm.c +1 -1
@@ -1,7 +1,7 @@#include "qemu-common.h" #include "sysemu/kvm.h" -int kvm_arch_irqchip_create (KVMState *s) +int kvm_arch_irqchip_create (KVMState *s,int type) {return 0 ; }
target-arm/kvm.c +11 -2
@@ -579,19 +579,28 @@ void kvm_arch_init_irq_routing(KVMState *s) { } -int kvm_arch_irqchip_create (KVMState *s) +int kvm_arch_irqchip_create (KVMState *s,int type) {int ret; +/* Failure here means forgotten initialization of +* machine->kernel_irqchip_type in model code +*/ +assert (type !=0 ); +/* If we can create the VGIC using the newer device control API, we * let the device do this when it initializes itself, otherwise we * fall back to the old API */ - ret =kvm_create_device (s,KVM_DEV_TYPE_ARM_VGIC_V2 , true); + ret =kvm_create_device (s, type, true);if (ret ==0 ) {return 1 ; } +/* Fallback will create VGIC v2 */ +if (type !=KVM_DEV_TYPE_ARM_VGIC_V2 ) { +return ret; + }return 0 ; }
Signature · 1 line
1.9.5.msysgit.0
PATCH v5 4/5 Initial implementation of vGICv3
In reply to Pavel FedinGet/put routines are missing, live migration is not possible.
--- hw/intc/Makefile.objs | 3 + hw/intc/arm_gicv3_kvm.c | 159 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 162 insertions(+) create mode 100644 hw/intc/arm_gicv3_kvm.c
hw/intc/Makefile.objs +3 -0
@@ -17,6 +17,9 @@ common-obj-$(CONFIG_OPENPIC) += openpic.o obj-$(CONFIG_APIC) += apic.o apic_common.o obj-$(CONFIG_ARM_GIC_KVM) += arm_gic_kvm.o +ifeq ($(ARCH), aarch64) # Only 64-bit KVM can use these +obj-$(CONFIG_ARM_GIC_KVM) += arm_gicv3_kvm.o +endif obj-$(CONFIG_STELLARIS) += armv7m_nvic.o obj-$(CONFIG_EXYNOS4) += exynos4210_gic.o exynos4210_combiner.o obj-$(CONFIG_GRLIB) += grlib_irqmp.o
hw/intc/arm_gicv3_kvm.c new file +159 -0
159 lines not on this page · raw message
Signature · 1 line
1.9.5.msysgit.0
PATCH v5 5/5 Add gicversion option to virt machine
In reply to Pavel FedinSet kernel_irqchip_type according to value of the option and pass it around where necessary. Instantiate devices and fdt nodes according to the choice.
mac_cpus for virt machine increased to 64. GICv2 compatibility check happens inside arm_gic_common_realize().
--- hw/arm/virt.c | 137 ++++++++++++++++++++++++++++++++++++++++++-------- include/hw/arm/fdt.h | 2 +- include/hw/arm/virt.h | 6 ++- 3 files changed, 121 insertions(+), 24 deletions(-)
hw/arm/virt.c +115 -22
@@ -48,6 +48,8 @@#include "hw/arm/sysbus-fdt.h" #include "hw/platform-bus.h" #include "hw/arm/fdt.h" +#include "linux/kvm.h" /* For KVM_DEV_TYPE_ARM_VGIC_V{2|3} */ +#include "qapi/visitor.h" /* Number of external interrupt lines to configure the GIC with */ #define NUM_IRQS 256
@@ -106,7 +108,12 @@ static const MemMapEntry a15memmap[] = { /* GIC distributor and CPU interfaces sit inside the CPU peripheral space */ [VIRT_GIC_DIST] = { 0x08000000, 0x00010000 }, [VIRT_GIC_CPU] = { 0x08010000, 0x00010000 }, - [VIRT_GIC_V2M] = { 0x08020000, 0x00001000 }, + [VIRT_GIC_V2M] = { 0x08020000, 0x00010000 }, +/* On v3 VIRT_GIC_DIST_MBI and VIRT_ITS_CONTROL take place of +* VIRT_GIC_CPU and VIRT_GIC_V2M respectively + */ + [VIRT_ITS_TRANSLATION] = { 0x08030000, 0x00010000 }, + [VIRT_LPI] = { 0x08040000, 0x00800000 }, [VIRT_UART] = { 0x09000000, 0x00001000 }, [VIRT_RTC] = { 0x09010000, 0x00001000 }, [VIRT_FW_CFG] = { 0x09020000, 0x0000000a },
@@ -256,10 +263,13 @@ static void fdt_add_timer_nodes(const VirtBoardInfo *vbi)* they are edge-triggered. */ ARMCPU *armcpu; +uint32_t max;uint32_t irqflags =GIC_FDT_IRQ_FLAGS_EDGE_LO_HI ; +/* Argument is 32 bit but 8 bits are reserved for flags */ + max = (vbi->smp_cpus >=24 ) ?24 : vbi->smp_cpus; irqflags =deposit32 (irqflags,GIC_FDT_IRQ_PPI_CPU_START , -GIC_FDT_IRQ_PPI_CPU_WIDTH , (1 << vbi->smp_cpus) -1 ); +GIC_FDT_IRQ_PPI_CPU_WIDTH , (1 << max) -1 );qemu_fdt_add_subnode (vbi->fdt,"/timer" );
@@ -283,6 +293,18 @@ static void fdt_add_cpu_nodes(const VirtBoardInfo *vbi) {int cpu; +/* +* From Documentation/devicetree/bindings/arm/cpus.txt +* On ARM v8 64-bit systems value should be set to 2, +* that corresponds to the MPIDR_EL1 register size. +* If MPIDR_EL1[63:32] value is equal to 0 on all CPUs +* in the system, #address-cells can be set to 1, since +* MPIDR_EL1[63:32] bits are not used for CPUs +* identification. +* +* Now GIC500 doesn't support affinities 2 & 3 so currently +* #address-cells can stay 1 until future GIC +*/ qemu_fdt_add_subnode (vbi->fdt,"/cpus" );qemu_fdt_setprop_cell (vbi->fdt,"/cpus" ,"#address-cells" ,0x1 );qemu_fdt_setprop_cell (vbi->fdt,"/cpus" ,"#size-cells" ,0x0 );
@@ -319,25 +341,36 @@ static void fdt_add_v2m_gic_node(VirtBoardInfo *vbi)qemu_fdt_setprop_cell (vbi->fdt,"/intc/v2m" ,"phandle" , vbi->v2m_phandle); } -static void fdt_add_gic_node (VirtBoardInfo *vbi) +static void fdt_add_gic_node (VirtBoardInfo *vbi,int type) { vbi->gic_phandle =qemu_fdt_alloc_phandle (vbi->fdt);qemu_fdt_setprop_cell (vbi->fdt,"/" ,"interrupt-parent" , vbi->gic_phandle);qemu_fdt_add_subnode (vbi->fdt,"/intc" ); -/* 'cortex-a15-gic' means 'GIC v2' */ -qemu_fdt_setprop_string (vbi->fdt,"/intc" ,"compatible" , -"arm,cortex-a15-gic" );qemu_fdt_setprop_cell (vbi->fdt,"/intc" ,"#interrupt-cells" ,3 );qemu_fdt_setprop (vbi->fdt,"/intc" ,"interrupt-controller" ,NULL ,0 ); -qemu_fdt_setprop_sized_cells (vbi->fdt,"/intc" ,"reg" , -2 , vbi->memmap[VIRT_GIC_DIST ].base, -2 , vbi->memmap[VIRT_GIC_DIST ].size, -2 , vbi->memmap[VIRT_GIC_CPU ].base, -2 , vbi->memmap[VIRT_GIC_CPU ].size);qemu_fdt_setprop_cell (vbi->fdt,"/intc" ,"#address-cells" ,0x2 );qemu_fdt_setprop_cell (vbi->fdt,"/intc" ,"#size-cells" ,0x2 );qemu_fdt_setprop (vbi->fdt,"/intc" ,"ranges" ,NULL ,0 ); +if (type ==KVM_DEV_TYPE_ARM_VGIC_V3 ) { +qemu_fdt_setprop_string (vbi->fdt,"/intc" ,"compatible" , +"arm,gic-v3" ); +qemu_fdt_setprop_sized_cells (vbi->fdt,"/intc" ,"reg" , +2 , vbi->memmap[VIRT_GIC_DIST ].base, +2 , vbi->memmap[VIRT_GIC_DIST ].size, +2 , vbi->memmap[VIRT_LPI ].base, +2 , vbi->memmap[VIRT_LPI ].size); + }else { +/* 'cortex-a15-gic' means 'GIC v2' */ +qemu_fdt_setprop_string (vbi->fdt,"/intc" ,"compatible" , +"arm,cortex-a15-gic" ); +qemu_fdt_setprop_sized_cells (vbi->fdt,"/intc" ,"reg" , +2 , vbi->memmap[VIRT_GIC_DIST ].base, +2 , vbi->memmap[VIRT_GIC_DIST ].size, +2 , vbi->memmap[VIRT_GIC_CPU ].base, +2 , vbi->memmap[VIRT_GIC_CPU ].size); + } +qemu_fdt_setprop_cell (vbi->fdt,"/intc" ,"phandle" , vbi->gic_phandle); }
@@ -360,20 +393,35 @@ static void create_v2m(VirtBoardInfo *vbi, qemu_irq *pic)fdt_add_v2m_gic_node (vbi); } -static void create_gic (VirtBoardInfo *vbi,qemu_irq *pic) +static void create_gic (VirtBoardInfo *vbi,qemu_irq *pic,int type) {/* We create a standalone GIC v2 */ DeviceState *gicdev;SysBusDevice *gicbusdev; -const char *gictype ="arm_gic" ; +const char *gictype;int i; -if (kvm_irqchip_in_kernel ()) { - gictype ="kvm-arm-gic" ; +if (type ==KVM_DEV_TYPE_ARM_VGIC_V3 ) { +/* TODO: Software emulation is not implemented yet */ +if (!kvm_irqchip_in_kernel ()) { +fprintf (stderr,"KVM is currently required for GICv3 emulation\n" ); +exit (1 ); + } + gictype ="kvm-arm-gicv3" ; + }else { + gictype =kvm_irqchip_in_kernel () ?"kvm-arm-gic" :"arm_gic" ; } gicdev =qdev_create (NULL , gictype); -qdev_prop_set_uint32 (gicdev,"revision" ,2 ); + +for (i =0 ; i < vbi->smp_cpus; i++) { +CPUState *cpu =qemu_get_cpu (i); +CPUARMState *env = cpu->env_ptr; + env->nvic = gicdev; + } + +qdev_prop_set_uint32 (gicdev,"revision" , + type ==KVM_DEV_TYPE_ARM_VGIC_V3 ?3 :2 );qdev_prop_set_uint32 (gicdev,"num-cpu" , smp_cpus);/* Note that the num-irq property counts both internal and external * interrupts; there are always 32 of the former (mandated by GIC spec).
@@ -382,7 +430,11 @@ static void create_gic(VirtBoardInfo *vbi, qemu_irq *pic)qdev_init_nofail (gicdev); gicbusdev =SYS_BUS_DEVICE (gicdev);sysbus_mmio_map (gicbusdev,0 , vbi->memmap[VIRT_GIC_DIST ].base); -sysbus_mmio_map (gicbusdev,1 , vbi->memmap[VIRT_GIC_CPU ].base); +if (type ==KVM_DEV_TYPE_ARM_VGIC_V3 ) { +sysbus_mmio_map (gicbusdev,1 , vbi->memmap[VIRT_LPI ].base); + }else { +sysbus_mmio_map (gicbusdev,1 , vbi->memmap[VIRT_GIC_CPU ].base); + }/* Wire the outputs from each CPU's generic timer to the * appropriate GIC PPI inputs, and the GIC's IRQ output to
@@ -409,9 +461,11 @@ static void create_gic(VirtBoardInfo *vbi, qemu_irq *pic) pic[i] =qdev_get_gpio_in (gicdev, i); } -fdt_add_gic_node (vbi); +fdt_add_gic_node (vbi, type); -create_v2m (vbi, pic); +if (type ==KVM_DEV_TYPE_ARM_VGIC_V2 ) { +create_v2m (vbi, pic); + } }static void create_uart (const VirtBoardInfo *vbi,qemu_irq *pic)
@@ -715,7 +769,9 @@ static void create_pcie(const VirtBoardInfo *vbi, qemu_irq *pic)qemu_fdt_setprop_cells (vbi->fdt, nodename,"bus-range" ,0 , nr_pcie_buses -1 ); -qemu_fdt_setprop_cells (vbi->fdt, nodename,"msi-parent" , vbi->v2m_phandle); +if (vbi->v2m_phandle) { +qemu_fdt_setprop_cells (vbi->fdt, nodename,"msi-parent" , vbi->v2m_phandle); + }qemu_fdt_setprop_sized_cells (vbi->fdt, nodename,"reg" ,2 , base_ecam,2 , size_ecam);
@@ -875,7 +931,7 @@ static void machvirt_init(MachineState *machine)create_flash (vbi); -create_gic (vbi, pic); +create_gic (vbi, pic, machine->kernel_irqchip_type);create_uart (vbi, pic);
@@ -933,6 +989,37 @@ static void virt_set_secure(Object *obj, bool value, Error **errp) vms->secure = value; } +static void virt_get_gic_version (Object *obj,Visitor *v,void *opaque, +const char *name,Error **errp) +{ +MachineState *ms =MACHINE (obj); +int32_t value = (ms->kernel_irqchip_type ==KVM_DEV_TYPE_ARM_VGIC_V3 ) ? +3 :2 ; + +visit_type_int32 (v, &value, name, errp); +} + +static void virt_set_gic_version (Object *obj,Visitor *v,void *opaque, +const char *name,Error **errp) +{ +MachineState *ms =MACHINE (obj); +int32_t value; + +visit_type_int32 (v, &value, name, errp); + +switch (value) { +case 3 : + ms->kernel_irqchip_type =KVM_DEV_TYPE_ARM_VGIC_V3 ; +break ; +case 2 : + ms->kernel_irqchip_type =KVM_DEV_TYPE_ARM_VGIC_V2 ; +break ; +default : +error_report ("Only GICv2 and GICv3 supported currently\n" ); +exit (1 ); + } +} +static void virt_instance_init (Object *obj) {VirtMachineState *vms =VIRT_MACHINE (obj);
@@ -948,6 +1035,11 @@ static void virt_instance_init(Object *obj)/* Default GIC type is v2 */ vms->parent.kernel_irqchip_type =KVM_DEV_TYPE_ARM_VGIC_V2 ; +object_property_add (obj,"gicversion" ,"int" , virt_get_gic_version, + virt_set_gic_version,NULL ,NULL ,NULL ); +object_property_set_description (obj,"gicversion" , +"Set GIC version. " +"Valid values are 2 and 3" ,NULL ); }static void virt_class_init (ObjectClass *oc,void *data)
@@ -957,7 +1049,8 @@ static void virt_class_init(ObjectClass *oc, void *data) mc->name =TYPE_VIRT_MACHINE ; mc->desc ="ARM Virtual Machine" , mc->init = machvirt_init; - mc->max_cpus =8 ; +/* With gic3 full implementation (with bitops) rase the lmit to 128 */ + mc->max_cpus =64 ; mc->has_dynamic_sysbus = true; mc->block_default_type =IF_VIRTIO ; mc->no_cdrom =1 ;
include/hw/arm/fdt.h +1 -1
@@ -29,6 +29,6 @@#define GIC_FDT_IRQ_FLAGS_LEVEL_LO 8#define GIC_FDT_IRQ_PPI_CPU_START 8 -#define GIC_FDT_IRQ_PPI_CPU_WIDTH 8 +#define GIC_FDT_IRQ_PPI_CPU_WIDTH 24#endif
include/hw/arm/virt.h +5 -1
@@ -46,6 +46,11 @@ enum {VIRT_CPUPERIPHS ,VIRT_GIC_DIST ,VIRT_GIC_CPU , +VIRT_GIC_V2M , +VIRT_GIC_DIST_MBI =VIRT_GIC_CPU , +VIRT_ITS_CONTROL =VIRT_GIC_V2M , +VIRT_ITS_TRANSLATION , +VIRT_LPI ,VIRT_UART ,VIRT_MMIO , VIRT_RTC,
@@ -54,7 +59,6 @@ enum {VIRT_PCIE_MMIO ,VIRT_PCIE_PIO ,VIRT_PCIE_ECAM , -VIRT_GIC_V2M , VIRT_PLATFORM_BUS, };
Signature · 1 line
1.9.5.msysgit.0
PATCH v5 1/5 Implement GIC-500 base class
In reply to Pavel FedinFrom: Shlomo Pongratz <[email protected]>
This class is to be used by both software and KVM implementations of GICv3
--- hw/intc/Makefile.objs | 1 + hw/intc/arm_gicv3_common.c | 260 +++++++++++++++++++++++++++++++++++++ hw/intc/gicv3_internal.h | 156 ++++++++++++++++++++++ include/hw/intc/arm_gicv3_common.h | 113 ++++++++++++++++ 4 files changed, 530 insertions(+) create mode 100644 hw/intc/arm_gicv3_common.c create mode 100644 hw/intc/gicv3_internal.h create mode 100644 include/hw/intc/arm_gicv3_common.h
hw/intc/Makefile.objs +1 -0
@@ -12,6 +12,7 @@ common-obj-$(CONFIG_IOAPIC) += ioapic_common.o common-obj-$(CONFIG_ARM_GIC) += arm_gic_common.o common-obj-$(CONFIG_ARM_GIC) += arm_gic.o common-obj-$(CONFIG_ARM_GIC) += arm_gicv2m.o +common-obj-$(CONFIG_ARM_GIC) += arm_gicv3_common.o common-obj-$(CONFIG_OPENPIC) += openpic.o obj-$(CONFIG_APIC) += apic.o apic_common.o
hw/intc/arm_gicv3_common.c new file +260 -0
260 lines not on this page · raw message
hw/intc/gicv3_internal.h new file +156 -0
156 lines not on this page · raw message
include/hw/intc/arm_gicv3_common.h new file +113 -0
113 lines not on this page · raw message
Signature · 1 line
1.9.5.msysgit.0