vGICv3 support
v11 cover vGICv3 support
This series introduces support for GICv3 by KVM. Software emulation is currently not supported.
v11 => v10
- Fixed minor issues with checkpatch and comments, reported by Eric Auger
- Make reusable kvm_gic_supports_attr(), moved to kvm-all.c and renamed as kvm_device_check_attr(). Useful for future live migration.
v9 => v10
- Renamed "gicversion" option to "gic-version" (was forgotten in v9)
- Data pointer in kvm_gic_access() is now void * because in case of vGICv3 this function is expected to operate on 64-bit registers too (GICD_IROUTER for instance)
v8 => v9
- Removed all limitations on CPU and IRQ number from the base class
- Added back missing properties, interface is now the same as in GICv2
- Refactored reusable parts of vGICv2 code, decreased number of changes
- Removed GIC type check from kvm_arch_irqchip_create(), no more need to specify GIC type early
- Fixed up all commit messages / logs
- Removed 'nvic' field assignment in virt machine (was forgotten in v8)
- CPU number limitation for 'virt' machine now comes from memory map (how many redistributors can be placed). With current layout it appears to be 126.
v7 => v8
- Removed all unused SW emulation code
- Removed unnecessary attributes from common class
- Set "unmigratable" flag for GICv3 device
- Removed unnecessary conditions from kvm_arm_gicv3_realize()
- Fixed GIC type setting in vexpress model, was done in wrong place
- Fixed condition style in hw/intc/Makefile.objs
- Cleaned up virt machine memory map
v6 => v7
- Wrap own GIC type definitions on top of KVM ones. Fixed build on non-ARM-Linux hosts
v5 => v6
- Fixed various checkpatch.pl style warnings
- Removed TODO in gicv3_init_irqs_and_mmio(), relevant memory API patch included
- gicv3_init_irqs_and_mmio() now takes 3 arguments instead of 4. It is more convenient to pass MMIO descriptors as array
v4 => v5
- 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
v3 => v4
- 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
v2 => v3
- 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
v1 => v2
- 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):
intc/gic: Extract some reusable vGIC code
arm_kvm: Do not assume particular GIC type in
kvm_arch_irqchip_create()
hw/intc: Initial implementation of vGICv3 hw/arm/virt: Add gic-version option to virt machine
Shlomo Pongratz (1):
hw/intc: Implement GIC-500 base class
hw/arm/virt.c | 111 ++++++++++++++++++++++----- hw/intc/Makefile.objs | 2 + hw/intc/arm_gic_kvm.c | 46 +++++------- hw/intc/arm_gicv3_common.c | 140 ++++++++++++++++++++++++++++++++++ hw/intc/arm_gicv3_kvm.c | 149 +++++++++++++++++++++++++++++++++++++ hw/intc/vgic_common.h | 55 ++++++++++++++ include/hw/arm/fdt.h | 2 +- include/hw/arm/virt.h | 5 +- include/hw/intc/arm_gicv3_common.h | 68 +++++++++++++++++ include/sysemu/kvm.h | 12 +++ kvm-all.c | 11 +++ target-arm/kvm.c | 10 +-- target-arm/kvm_arm.h | 10 +++ target-arm/machine.c | 18 +++++ 14 files changed, 582 insertions(+), 57 deletions(-) create mode 100644 hw/intc/arm_gicv3_common.c create mode 100644 hw/intc/arm_gicv3_kvm.c 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 v11 1/5 hw/intc: Implement GIC-500 base class
From: Shlomo Pongratz <[email protected]>
This class is to be used by both software and KVM implementations of GICv3
Currently it is mostly a placeholder, but in future it is supposed to hold qemu's representation of GICv3 state, which is necessary for migration.
The interface of this class is fully compatible with GICv2 one. This is done in order to simplify integration with existing code.
--- hw/intc/Makefile.objs | 1 + hw/intc/arm_gicv3_common.c | 140 +++++++++++++++++++++++++++++++++++++ include/hw/intc/arm_gicv3_common.h | 68 ++++++++++++++++++ 3 files changed, 209 insertions(+) create mode 100644 hw/intc/arm_gicv3_common.c 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 +140 -0
140 lines not on this page · raw message
include/hw/intc/arm_gicv3_common.h new file +68 -0
68 lines not on this page · raw message
Signature · 1 line
1.9.5.msysgit.0
PATCH v11 2/5 intc/gic: Extract some reusable vGIC code
In reply to Pavel FedinSome functions previously used only by vGICv2 are useful also for vGICv3 implementation. Untie them from GICState and make accessible from within other modules:
- kvm_arm_gic_set_irq()
- kvm_gic_access() - data pointer changed to void * because some GICv3 registers are 64-bit wide
- kvm_gicd_access()
- kvm_gicc_access() - actually GICv2-specific, but changed to keep the code style unified with kvm_gicd_access()
- kvm_gic_supports_attr() - moved to common code and renamed to kvm_device_check_attr()
Some of these changes are not used right now, but they will be helpful for implementing live migration
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 | 46 +++++++++++++++++++----------------------- hw/intc/vgic_common.h | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++ include/sysemu/kvm.h | 12 +++++++++++ kvm-all.c | 11 +++++++++++ 4 files changed, 98 insertions(+), 26 deletions(-) create mode 100644 hw/intc/vgic_common.h
hw/intc/arm_gic_kvm.c +20 -26
@@ -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,6 +87,13 @@ 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 ;
@@ -107,8 +114,8 @@ static bool kvm_gic_supports_attr(GICState *s, int group, int attrnum)return kvm_device_ioctl (s->dev_fd,KVM_HAS_DEVICE_ATTR , &attr) ==0 ; } -static void kvm_gic_access (GICState *s,int group,int offset, -int cpu,uint32_t *val,bool write) +void kvm_gic_access (int dev_fd,int group,int offset, +int cpu,void *val,bool write) {struct kvm_device_attr attr;int type;
@@ -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++)
@@ -559,7 +552,7 @@ static void kvm_arm_gic_realize(DeviceState *dev, Error **errp)return ; } -gic_init_irqs_and_mmio (s, kvm_arm_gic_set_irq,NULL ); +gic_init_irqs_and_mmio (s, kvm_arm_gicv2_set_irq,NULL );for (i =0 ; i < s->num_irq -GIC_INTERNAL ; i++) {qemu_irq irq =qdev_get_gpio_in (dev, i);
@@ -576,15 +569,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_device_check_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_device_check_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 +55 -0
55 lines not on this page · raw message
include/sysemu/kvm.h +12 -0
@@ -240,6 +240,18 @@ int kvm_device_ioctl(int fd, int type, ...);int kvm_vm_check_attr (KVMState *s,uint32_t group,uint64_t attr);/** +* kvm_device_check_attr - check for existence of a specific vm attribute +* @fd: The device file descriptor +* @group: the group +* @attr: the attribute of that group to query for +* +* Returns: 1 if the attribute exists +* 0 if the attribute either does not exist or if the vm device +* interface is unavailable +*/ +int kvm_device_check_attr (int fd,uint32_t group,uint64_t attr); + +/** * kvm_create_device - create a KVM device for the device control API * @KVMState: The KVMState pointer * @type: The KVM device type (see Documentation/virtual/kvm/devices in the
kvm-all.c +11 -0
@@ -2003,6 +2003,17 @@ int kvm_vm_check_attr(KVMState *s, uint32_t group, uint64_t attr)return ret ?0 :1 ; } +int kvm_device_check_attr (int dev_fd,uint32_t group,uint64_t attr) +{ +struct kvm_device_attr attribute = { + .group = group, + .attr = attr, + .flags =0 , + }; + +return kvm_device_ioctl (dev_fd,KVM_HAS_DEVICE_ATTR , &attribute) ?0 :1 ; +} +int kvm_has_sync_mmu (void ) {return kvm_check_extension (kvm_state,KVM_CAP_SYNC_MMU );
Signature · 1 line
1.9.5.msysgit.0
PATCH v11 3/5 arm_kvm: Do not assume particular GIC type in kvm_arch_irqchip_create()
In reply to Pavel FedinThis allows to use different GIC types from v2. There are no kernels which could advertise KVM_CAP_DEVICE_CTRL without the actual ability to create GIC with it.
--- target-arm/kvm.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-)
target-arm/kvm.c +1 -9
@@ -585,18 +585,10 @@ void kvm_arch_init_irq_routing(KVMState *s)int kvm_arch_irqchip_create (KVMState *s) { -int ret; -/* 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); -if (ret ==0 ) { -return 1 ; - } - -return 0 ; +return kvm_check_extension (s,KVM_CAP_DEVICE_CTRL ); } int kvm_arch_fixup_msi_route(struct kvm_irq_routing_entry *route,
Signature · 1 line
1.9.5.msysgit.0
PATCH v11 4/5 hw/intc: Initial implementation of vGICv3
In reply to Pavel FedinThis is the initial version of KVM-accelerated GICv3 support. State load and save are not yet supported, live migration is not possible.
In order to get correct class name in a simpler way, gicv3_class_name() function is implemented, similar to gic_class_name().
--- hw/intc/Makefile.objs | 1 + hw/intc/arm_gicv3_kvm.c | 149 ++++++++++++++++++++++++++++++++++++++++++++++++ target-arm/kvm_arm.h | 10 ++++ target-arm/machine.c | 18 ++++++ 4 files changed, 178 insertions(+) create mode 100644 hw/intc/arm_gicv3_kvm.c
hw/intc/Makefile.objs +1 -0
@@ -17,6 +17,7 @@ common-obj-$(CONFIG_OPENPIC) += openpic.o obj-$(CONFIG_APIC) += apic.o apic_common.o obj-$(CONFIG_ARM_GIC_KVM) += arm_gic_kvm.o +obj-$(call land,$(CONFIG_ARM_GIC_KVM),$(TARGET_AARCH64)) += arm_gicv3_kvm.o 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 +149 -0
149 lines not on this page · raw message
target-arm/kvm_arm.h +10 -0
@@ -196,4 +196,14 @@ static inline const char *gic_class_name(void) return kvm_irqchip_in_kernel() ? "kvm-arm-gic" : "arm_gic"; } +/** +* gicv3_class_name +* +* Return name of GICv3 class to use depending on whether KVM acceleration is +* in use. May throw an error if the chosen implementation is not available. +* +* Returns: class name to use +*/ +const char *gicv3_class_name (void ); +#endif
target-arm/machine.c +18 -0
@@ -1,5 +1,6 @@#include "hw/hw.h" #include "hw/boards.h" +#include "qemu/error-report.h" #include "sysemu/kvm.h" #include "kvm_arm.h" #include "internals.h"
@@ -328,3 +329,20 @@ const VMStateDescription vmstate_arm_cpu = { NULL } }; + +const char *gicv3_class_name (void ) +{ +if (kvm_irqchip_in_kernel ()) { +#ifdef TARGET_AARCH64 +return "kvm-arm-gicv3" ; +#else +error_report ("KVM GICv3 acceleration is not supported on this " +"platform\n" ); +#endif + }else { +/* TODO: Software emulation is not implemented yet */ +error_report ("KVM is currently required for GICv3 emulation\n" ); + } + +exit (1 ); +}
Signature · 1 line
1.9.5.msysgit.0
PATCH v11 5/5 hw/arm/virt: Add gic-version option to virt machine
In reply to Pavel FedinAdd gic_version to VirtMachineState, set it to value of the option and pass it around where necessary. Instantiate devices and fdt nodes according to the choice.
max_cpus for virt machine increased to 126 (calculated from redistributor space available in the memory map). GICv2 compatibility check happens inside arm_gic_common_realize().
ITS regions are added to the memory map too, however currently they are not used, just reserved.
--- hw/arm/virt.c | 111 +++++++++++++++++++++++++++++++++++++++++--------- include/hw/arm/fdt.h | 2 +- include/hw/arm/virt.h | 5 ++- 3 files changed, 96 insertions(+), 22 deletions(-)
hw/arm/virt.c +91 -20
@@ -50,6 +50,7 @@#include "hw/arm/fdt.h" #include "hw/intc/arm_gic_common.h" #include "kvm_arm.h" +#include "qapi/visitor.h" /* Number of external interrupt lines to configure the GIC with */ #define NUM_IRQS 256
@@ -79,6 +80,7 @@ typedef struct {typedef struct {MachineState parent;bool secure; +int32_t gic_version; }VirtMachineState ;#define TYPE_VIRT_MACHINE "virt"
@@ -109,6 +111,9 @@ static const MemMapEntry a15memmap[] = { [VIRT_GIC_DIST] = { 0x08000000, 0x00010000 }, [VIRT_GIC_CPU] = { 0x08010000, 0x00010000 }, [VIRT_GIC_V2M] = { 0x08020000, 0x00001000 }, + [VIRT_ITS_CONTROL] = { 0x08020000, 0x00010000 }, + [VIRT_ITS_TRANSLATION] = { 0x08030000, 0x00010000 }, + [VIRT_GIC_REDIST] = { 0x08040000, 0x00FC0000 }, [VIRT_UART] = { 0x09000000, 0x00001000 }, [VIRT_RTC] = { 0x09010000, 0x00001000 }, [VIRT_FW_CFG] = { 0x09020000, 0x0000000a },
@@ -258,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" );
@@ -285,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 );
@@ -321,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 ==3 ) { +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_GIC_REDIST ].base, +2 , vbi->memmap[VIRT_GIC_REDIST ].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); }
@@ -362,18 +393,18 @@ 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 */ +/* We create a standalone GIC */ DeviceState *gicdev;SysBusDevice *gicbusdev;const char *gictype;int i; - gictype =gic_class_name (); + gictype = (type ==3 ) ?gicv3_class_name () :gic_class_name (); gicdev =qdev_create (NULL , gictype); -qdev_prop_set_uint32 (gicdev,"revision" ,2 ); +qdev_prop_set_uint32 (gicdev,"revision" , type);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 +413,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 ==3 ) { +sysbus_mmio_map (gicbusdev,1 , vbi->memmap[VIRT_GIC_REDIST ].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
@@ -417,9 +452,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 ==2 ) { +create_v2m (vbi, pic); + } }static void create_uart (const VirtBoardInfo *vbi,qemu_irq *pic)
@@ -723,7 +760,10 @@ 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);
@@ -883,7 +923,7 @@ static void machvirt_init(MachineState *machine)create_flash (vbi); -create_gic (vbi, pic); +create_gic (vbi, pic, vms->gic_version);create_uart (vbi, pic);
@@ -941,6 +981,26 @@ 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) +{ +VirtMachineState *vms =VIRT_MACHINE (obj); + +visit_type_int32 (v, &vms->gic_version, name, errp); +} + +static void virt_set_gic_version (Object *obj,Visitor *v,void *opaque, +const char *name,Error **errp) +{ +VirtMachineState *vms =VIRT_MACHINE (obj); + +visit_type_int32 (v, &vms->gic_version, name, errp); +if (vms->gic_version !=2 && vms->gic_version !=3 ) { +error_report ("Only GICv2 and GICv3 supported currently\n" ); +exit (1 ); + } +} +static void virt_instance_init (Object *obj) {VirtMachineState *vms =VIRT_MACHINE (obj);
@@ -953,6 +1013,14 @@ 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->gic_version =2 ; +object_property_add (obj,"gic-version" ,"int" , virt_get_gic_version, + virt_set_gic_version,NULL ,NULL ,NULL ); +object_property_set_description (obj,"gic-version" , +"Set GIC version. " +"Valid values are 2 and 3" ,NULL ); }static void virt_class_init (ObjectClass *oc,void *data)
@@ -962,7 +1030,10 @@ 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 ; +/* Our maximum number of CPUs depends on how many redistributors +* we can fit into memory map +*/ + mc->max_cpus = a15memmap[VIRT_GIC_REDIST ].size /0x20000 ; 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 +4 -1
@@ -46,6 +46,10 @@ enum {VIRT_CPUPERIPHS ,VIRT_GIC_DIST ,VIRT_GIC_CPU , +VIRT_GIC_V2M , +VIRT_ITS_CONTROL , +VIRT_ITS_TRANSLATION , +VIRT_GIC_REDIST ,VIRT_UART ,VIRT_MMIO , VIRT_RTC,
@@ -54,7 +58,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
Re: [Qemu-devel] [PATCH v11 5/5] hw/arm/virt: Add gic-version option to virt machine
Quoted 227 lines · Pavel Fedin
Add
gic_versionto VirtMachineState, set it to value of the option and pass it around where necessary. Instantiate devices and fdt nodes according to the choice.
max_cpusfor virt machine increased to 126 (calculated from redistributor space available in the memory map). GICv2 compatibility check happens insidearm_gic_common_realize().ITS regions are added to the memory map too, however currently they are not used, just reserved.
Signed-off-by Pavel Fedin <[email protected]>--- hw/arm/virt.c | 111 +++++++++++++++++++++++++++++++++++++++++--------- include/hw/arm/fdt.h | 2 +- include/hw/arm/virt.h | 5 ++- 3 files changed, 96 insertions(+), 22 deletions(-)hw/arm/virt.c +79
-19@@ -50,6 +50,7 @@#include "hw/arm/fdt.h" #include "hw/intc/arm_gic_common.h" #include "kvm_arm.h" +#include "qapi/visitor.h" /* Number of external interrupt lines to configure the GIC with */ #define NUM_IRQS 256@@ -79,6 +80,7 @@ typedef struct {typedef struct {MachineState parent;bool secure; +int32_t gic_version; }VirtMachineState ;#define TYPE_VIRT_MACHINE "virt"@@ -109,6 +111,9 @@ static const MemMapEntry a15memmap[] = { [VIRT_GIC_DIST] = { 0x08000000, 0x00010000 }, [VIRT_GIC_CPU] = { 0x08010000, 0x00010000 }, [VIRT_GIC_V2M] = { 0x08020000, 0x00001000 }, + [VIRT_ITS_CONTROL] = { 0x08020000, 0x00010000 }, + [VIRT_ITS_TRANSLATION] = { 0x08030000, 0x00010000 }, + [VIRT_GIC_REDIST] = { 0x08040000, 0x00FC0000 }, [VIRT_UART] = { 0x09000000, 0x00001000 }, [VIRT_RTC] = { 0x09010000, 0x00001000 }, [VIRT_FW_CFG] = { 0x09020000, 0x0000000a },@@ -258,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" );@@ -285,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 );@@ -321,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 ==3 ) { +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_GIC_REDIST ].base, +2 , vbi->memmap[VIRT_GIC_REDIST ].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); }@@ -362,18 +393,18 @@ 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 */ +/* We create a standalone GIC */ DeviceState *gicdev;SysBusDevice *gicbusdev;const char *gictype;int i; - gictype =gic_class_name (); + gictype = (type ==3 ) ?gicv3_class_name () :gic_class_name (); gicdev =qdev_create (NULL , gictype); -qdev_prop_set_uint32 (gicdev,"revision" ,2 ); +qdev_prop_set_uint32 (gicdev,"revision" , type);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 +413,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 ==3 ) { +sysbus_mmio_map (gicbusdev,1 , vbi->memmap[VIRT_GIC_REDIST ].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 @@ -417,9 +452,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 ==2 ) { +create_v2m (vbi, pic); + } }static void create_uart (const VirtBoardInfo *vbi,qemu_irq *pic)@@ -723,7 +760,10 @@ 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);@@ -883,7 +923,7 @@ static void machvirt_init(MachineState *machine)create_flash (vbi); -create_gic (vbi, pic); +create_gic (vbi, pic, vms->gic_version);create_uart (vbi, pic);@@ -941,6 +981,26 @@ 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) +{ +VirtMachineState *vms =VIRT_MACHINE (obj); + +visit_type_int32 (v, &vms->gic_version, name, errp); +} + +static void virt_set_gic_version (Object *obj,Visitor *v,void *opaque, +const char *name,Error **errp) +{ +VirtMachineState *vms =VIRT_MACHINE (obj); + +visit_type_int32 (v, &vms->gic_version, name, errp); +if (vms->gic_version !=2 && vms->gic_version !=3 ) { +error_report ("Only GICv2 and GICv3 supported currently\n" ); +exit (1 ); + } +} +static void virt_instance_init (Object *obj) {VirtMachineState *vms =VIRT_MACHINE (obj);
hw/arm/virt.c static void virt_instance_init(Object *obj) · line 1018
Quoted 6 lines
hw/arm/virt.c +3
-0@@ -953,6 +1013,14 @@ 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->gic_version =2 ;
In KVM case instead of assigning GICv2 as default, can we probe the KVM for GICv3 presence using KVM_CREATE_DEVICE_TEST and give priority to GICv3? Any suggestions?
Thanks,
Ashok
Quoted 59 lines
hw/arm/virt.c +9
-1+object_property_add (obj,"gic-version" ,"int" , virt_get_gic_version, + virt_set_gic_version,NULL ,NULL ,NULL ); +object_property_set_description (obj,"gic-version" , +"Set GIC version. " +"Valid values are 2 and 3" ,NULL ); }static void virt_class_init (ObjectClass *oc,void *data)@@ -962,7 +1030,10 @@ 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 ; +/* Our maximum number of CPUs depends on how many redistributors +* we can fit into memory map +*/ + mc->max_cpus = a15memmap[VIRT_GIC_REDIST ].size /0x20000 ; 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 +4
-1@@ -46,6 +46,10 @@ enum {VIRT_CPUPERIPHS ,VIRT_GIC_DIST ,VIRT_GIC_CPU , +VIRT_GIC_V2M , +VIRT_ITS_CONTROL , +VIRT_ITS_TRANSLATION , +VIRT_GIC_REDIST ,VIRT_UART ,VIRT_MMIO , VIRT_RTC,@@ -54,7 +58,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
A message that is not in the archive (sent off-list or not yet received): "20150825134053.GB27329@ashoks"@broadcom.com
Re: [Qemu-devel] [PATCH v11 5/5] hw/arm/virt: Add gic-version option to virt machine
Hello!
Quoted 3 lines
In KVM case instead of assigning GICv2 as default, can we probe the KVM for GICv3 presence using
KVM_CREATE_DEVICE_TESTand give priority to GICv3?
We could, but i think this would hurt usability. I suggest that when the user chooses a
configuration, he/she expects to get something particular. And IMHO it's much better to default to GICv2 (to be backwards-compatible), and just report error in case if this is not supported by KVM, than to default to something, which is different on different machines and different kernels.
Libvirt guys already blame "virt" machine for being too flexible...
Kind regards,
Pavel Fedin
Expert Engineer
Samsung Electronics Research center Russia
Quoted 102 lines · Pavel Fedin
This series introduces support for GICv3 by KVM. Software emulation is currently not supported.
v11 => v10
- Fixed minor issues with checkpatch and comments, reported by Eric Auger
- Make reusablekvm_gic_supports_attr(), moved tokvm-all.cand renamed askvm_device_check_attr(). Useful for future live migration.v9 => v10
- Renamed "gicversion" option to "gic-version" (was forgotten in v9)
- Data pointer inkvm_gic_access()is now void * because in case of vGICv3 this function is expected to operate on 64-bit registers too (GICD_IROUTERfor instance)v8 => v9
- Removed all limitations on CPU and IRQ number from the base class
- Added back missing properties, interface is now the same as in GICv2
- Refactored reusable parts of vGICv2 code, decreased number of changes
- Removed GIC type check fromkvm_arch_irqchip_create(), no more need to specify GIC type early
- Fixed up all commit messages / logs
- Removed 'nvic' field assignment in virt machine (was forgotten in v8)
- CPU number limitation for 'virt' machine now comes from memory map (how many redistributors can be placed). With current layout it appears to be 126.v7 => v8
- Removed all unused SW emulation code
- Removed unnecessary attributes from common class
- Set "unmigratable" flag for GICv3 device
- Removed unnecessary conditions fromkvm_arm_gicv3_realize()
- Fixed GIC type setting in vexpress model, was done in wrong place
- Fixed condition style in hw/intc/Makefile.objs
- Cleaned up virt machine memory mapv6 => v7
- Wrap own GIC type definitions on top of KVM ones. Fixed build on non-ARM-Linux hostsv5 => v6
- Fixed various checkpatch.pl style warnings
- Removed TODO ingicv3_init_irqs_and_mmio(), relevant memory API patch included
-gicv3_init_irqs_and_mmio()now takes 3 arguments instead of 4. It is more convenient to pass MMIO descriptors as arrayv4 => v5
- Do not reintroduce several constants shared with GICv2, reuse them instead.
- Addedgicv3_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 fromvirt.cv3 => v4
- Fixed stupid build breakage in patch 0002
- Rebased on top of current master, patch 0003 adjusted according tokvm_irqchip_create()changes
- Added assertion against uninitializedkernel_irqchip_type
- Removedkernel_irqchip_typeinitialization from models which do not use KVM vGICv2 => v3
- 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 kernelv1 => v2
- 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
- RemovedREV_V3definition 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 machinePavel Fedin (4):
intc/gic: Extract some reusable vGIC code
arm_kvm: Do not assume particular GIC type in
kvm_arch_irqchip_create()
hw/intc: Initial implementation of vGICv3 hw/arm/virt: Add gic-version option to virt machineShlomo Pongratz (1):
hw/intc: Implement GIC-500 base classhw/arm/virt.c | 111 ++++++++++++++++++++++----- hw/intc/Makefile.objs | 2 + hw/intc/arm_gic_kvm.c | 46 +++++------- hw/intc/arm_gicv3_common.c | 140 ++++++++++++++++++++++++++++++++++ hw/intc/arm_gicv3_kvm.c | 149 +++++++++++++++++++++++++++++++++++++ hw/intc/vgic_common.h | 55 ++++++++++++++ include/hw/arm/fdt.h | 2 +- include/hw/arm/virt.h | 5 +- include/hw/intc/arm_gicv3_common.h | 68 +++++++++++++++++ include/sysemu/kvm.h | 12 +++ kvm-all.c | 11 +++
Quoted 13 lines
target-arm/kvm.c | 10 +-- target-arm/kvm_arm.h | 10 +++ target-arm/machine.c | 18 +++++ 14 files changed, 582 insertions(+), 57 deletions(-) create mode 100644 hw/intc/arm_gicv3_common.c create mode 100644 hw/intc/arm_gicv3_kvm.c create mode 100644 hw/intc/vgic_common.h create mode 100644 include/hw/intc/arm_gicv3_common.hSignature · 1 line
1.9.5.msysgit.0
Tested on Broadcom ARM64 processor hardware emulation platform and ARM Fast model.
Thanks,
Ashok