OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

hw/arm/virt: Introduce VirtGICType enum type 

We plan to introduce yet another value for the gic version (nosel).
As we already use exotic values such as 0 and -1, let's introduce
a dedicated enum type and let vms->gic_version take this
type.

Signed-off-by: Eric Auger <eric.auger@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Andrew Jones <drjones@redhat.com>
Message-id: 20200311131618.7187-3-eric.auger@redhat.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Eric Auger 2020-03-11 14:16:14 +01:00 committed by Peter Maydell
parent 71b296d981
commit d04460e587
2 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
hw/arm/virt.c
View File

@ -299,7 +299,7 @@ static void fdt_add_timer_nodes(const VirtMachineState *vms)
irqflags = GIC_FDT_IRQ_FLAGS_EDGE_LO_HI; irqflags = GIC_FDT_IRQ_FLAGS_EDGE_LO_HI;
} }
if (vms->gic_version == 2) { if (vms->gic_version == VIRT_GIC_VERSION_2) {
irqflags = deposit32(irqflags, GIC_FDT_IRQ_PPI_CPU_START, irqflags = deposit32(irqflags, GIC_FDT_IRQ_PPI_CPU_START,
GIC_FDT_IRQ_PPI_CPU_WIDTH, GIC_FDT_IRQ_PPI_CPU_WIDTH,
(1 << vms->smp_cpus) - 1); (1 << vms->smp_cpus) - 1);
@ -440,7 +440,7 @@ static void fdt_add_gic_node(VirtMachineState *vms)
qemu_fdt_setprop_cell(vms->fdt, nodename, "#address-cells", 0x2); qemu_fdt_setprop_cell(vms->fdt, nodename, "#address-cells", 0x2);
qemu_fdt_setprop_cell(vms->fdt, nodename, "#size-cells", 0x2); qemu_fdt_setprop_cell(vms->fdt, nodename, "#size-cells", 0x2);
qemu_fdt_setprop(vms->fdt, nodename, "ranges", NULL, 0); qemu_fdt_setprop(vms->fdt, nodename, "ranges", NULL, 0);
if (vms->gic_version == 3) { if (vms->gic_version == VIRT_GIC_VERSION_3) {
int nb_redist_regions = virt_gicv3_redist_region_count(vms); int nb_redist_regions = virt_gicv3_redist_region_count(vms);
qemu_fdt_setprop_string(vms->fdt, nodename, "compatible", qemu_fdt_setprop_string(vms->fdt, nodename, "compatible",
@ -519,7 +519,7 @@ static void fdt_add_pmu_nodes(const VirtMachineState *vms)
} }
} }
if (vms->gic_version == 2) { if (vms->gic_version == VIRT_GIC_VERSION_2) {
irqflags = deposit32(irqflags, GIC_FDT_IRQ_PPI_CPU_START, irqflags = deposit32(irqflags, GIC_FDT_IRQ_PPI_CPU_START,
GIC_FDT_IRQ_PPI_CPU_WIDTH, GIC_FDT_IRQ_PPI_CPU_WIDTH,
(1 << vms->smp_cpus) - 1); (1 << vms->smp_cpus) - 1);
@ -1470,7 +1470,7 @@ static uint64_t virt_cpu_mp_affinity(VirtMachineState *vms, int idx)
* purposes are to make TCG consistent (with 64-bit KVM hosts) * purposes are to make TCG consistent (with 64-bit KVM hosts)
* and to improve SGI efficiency. * and to improve SGI efficiency.
*/ */
if (vms->gic_version == 3) { if (vms->gic_version == VIRT_GIC_VERSION_3) {
clustersz = GICV3_TARGETLIST_BITS; clustersz = GICV3_TARGETLIST_BITS;
} else { } else {
clustersz = GIC_TARGETLIST_BITS; clustersz = GIC_TARGETLIST_BITS;
@ -1561,15 +1561,15 @@ static void machvirt_init(MachineState *machine)
/* We can probe only here because during property set /* We can probe only here because during property set
* KVM is not available yet * KVM is not available yet
*/ */
if (vms->gic_version <= 0) { if (vms->gic_version == VIRT_GIC_VERSION_HOST ||
/* "host" or "max" */ vms->gic_version == VIRT_GIC_VERSION_MAX) {
if (!kvm_enabled()) { if (!kvm_enabled()) {
if (vms->gic_version == 0) { if (vms->gic_version == VIRT_GIC_VERSION_HOST) {
error_report("gic-version=host requires KVM"); error_report("gic-version=host requires KVM");
exit(1); exit(1);
} else { } else {
/* "max": currently means 3 for TCG */ /* "max": currently means 3 for TCG */
vms->gic_version = 3; vms->gic_version = VIRT_GIC_VERSION_3;
} }
} else { } else {
vms->gic_version = kvm_arm_vgic_probe(); vms->gic_version = kvm_arm_vgic_probe();
@ -1628,7 +1628,7 @@ static void machvirt_init(MachineState *machine)
/* The maximum number of CPUs depends on the GIC version, or on how /* The maximum number of CPUs depends on the GIC version, or on how
* many redistributors we can fit into the memory map. * many redistributors we can fit into the memory map.
*/ */
if (vms->gic_version == 3) { if (vms->gic_version == VIRT_GIC_VERSION_3) {
virt_max_cpus = virt_max_cpus =
vms->memmap[VIRT_GIC_REDIST].size / GICV3_REDIST_SIZE; vms->memmap[VIRT_GIC_REDIST].size / GICV3_REDIST_SIZE;
virt_max_cpus += virt_max_cpus +=
@ -1856,7 +1856,7 @@ static void virt_set_its(Object *obj, bool value, Error **errp)
static char *virt_get_gic_version(Object *obj, Error **errp) static char *virt_get_gic_version(Object *obj, Error **errp)
{ {
VirtMachineState *vms = VIRT_MACHINE(obj); VirtMachineState *vms = VIRT_MACHINE(obj);
const char *val = vms->gic_version == 3 ? "3" : "2"; const char *val = vms->gic_version == VIRT_GIC_VERSION_3 ? "3" : "2";
return g_strdup(val); return g_strdup(val);
} }
@ -1866,13 +1866,13 @@ static void virt_set_gic_version(Object *obj, const char *value, Error **errp)
VirtMachineState *vms = VIRT_MACHINE(obj); VirtMachineState *vms = VIRT_MACHINE(obj);
if (!strcmp(value, "3")) { if (!strcmp(value, "3")) {
vms->gic_version = 3; vms->gic_version = VIRT_GIC_VERSION_3;
} else if (!strcmp(value, "2")) { } else if (!strcmp(value, "2")) {
vms->gic_version = 2; vms->gic_version = VIRT_GIC_VERSION_2;
} else if (!strcmp(value, "host")) { } else if (!strcmp(value, "host")) {
vms->gic_version = 0; /* Will probe later */ vms->gic_version = VIRT_GIC_VERSION_HOST; /* Will probe later */
} else if (!strcmp(value, "max")) { } else if (!strcmp(value, "max")) {
vms->gic_version = -1; /* Will probe later */ vms->gic_version = VIRT_GIC_VERSION_MAX; /* Will probe later */
} else { } else {
error_setg(errp, "Invalid gic-version value"); error_setg(errp, "Invalid gic-version value");
error_append_hint(errp, "Valid values are 3, 2, host, max.\n"); error_append_hint(errp, "Valid values are 3, 2, host, max.\n");
@ -2141,7 +2141,7 @@ static void virt_instance_init(Object *obj)
"physical address space above 32 bits", "physical address space above 32 bits",
NULL); NULL);
/* Default GIC type is v2 */ /* Default GIC type is v2 */
vms->gic_version = 2; vms->gic_version = VIRT_GIC_VERSION_2;
object_property_add_str(obj, "gic-version", virt_get_gic_version, object_property_add_str(obj, "gic-version", virt_get_gic_version,
virt_set_gic_version, NULL); virt_set_gic_version, NULL);
object_property_set_description(obj, "gic-version", object_property_set_description(obj, "gic-version",

11
include/hw/arm/virt.h
View File

@ -95,6 +95,13 @@ typedef enum VirtIOMMUType {
VIRT_IOMMU_VIRTIO, VIRT_IOMMU_VIRTIO,
} VirtIOMMUType; } VirtIOMMUType;
typedef enum VirtGICType {
VIRT_GIC_VERSION_MAX,
VIRT_GIC_VERSION_HOST,
VIRT_GIC_VERSION_2,
VIRT_GIC_VERSION_3,
} VirtGICType;
typedef struct MemMapEntry { typedef struct MemMapEntry {
hwaddr base; hwaddr base;
hwaddr size; hwaddr size;
@ -123,7 +130,7 @@ typedef struct {
bool highmem_ecam; bool highmem_ecam;
bool its; bool its;
bool virt; bool virt;
int32_t gic_version; VirtGICType gic_version;
VirtIOMMUType iommu; VirtIOMMUType iommu;
uint16_t virtio_iommu_bdf; uint16_t virtio_iommu_bdf;
struct arm_boot_info bootinfo; struct arm_boot_info bootinfo;
@ -162,7 +169,7 @@ static inline int virt_gicv3_redist_region_count(VirtMachineState *vms)
uint32_t redist0_capacity = uint32_t redist0_capacity =
vms->memmap[VIRT_GIC_REDIST].size / GICV3_REDIST_SIZE; vms->memmap[VIRT_GIC_REDIST].size / GICV3_REDIST_SIZE;
assert(vms->gic_version == 3); assert(vms->gic_version == VIRT_GIC_VERSION_3);
return vms->smp_cpus > redist0_capacity ? 2 : 1; return vms->smp_cpus > redist0_capacity ? 2 : 1;
} }