hw/arm: Minor cleanups around MPCore code
v2 cover hw/arm: Minor cleanups around MPCore code
(series fully reviewed)
Hi,
This series contains the non-controversial and already reviewed patches (rebased) from this previous series:
"Remove one use of qemu_get_cpu() in A7/A15 MPCore priv"
https://lore.kernel.org/qemu-devel/[email protected]/
Posted separately to avoid keeping rebasing.
Regards,
Phil.
Philippe Mathieu-Daudé (6):
hw/arm/boot: Propagate vCPU to arm_load_dtb() hw/arm/fsl-imx6: Add local 'mpcore/gic' variables hw/arm/fsl-imx6ul: Add local 'mpcore/gic' variables hw/arm/fsl-imx7: Add local 'mpcore/gic' variables hw/cpu/arm: Alias 'num-cpu' property on TYPE_REALVIEW_MPCORE hw/cpu/arm: Declare CPU QOM types using DEFINE_TYPES() macro
include/hw/arm/boot.h | 4 ++- hw/arm/boot.c | 11 +++---- hw/arm/fsl-imx6.c | 52 +++++++++++++------------------- hw/arm/fsl-imx6ul.c | 64 +++++++++++++++++----------------------- hw/arm/fsl-imx7.c | 52 +++++++++++++++----------------- hw/arm/virt.c | 2 +- hw/cpu/a15mpcore.c | 21 ++++++------- hw/cpu/a9mpcore.c | 21 ++++++------- hw/cpu/arm11mpcore.c | 21 ++++++------- hw/cpu/realview_mpcore.c | 29 +++++++----------- 10 files changed, 118 insertions(+), 159 deletions(-)
Signature · 1 line
2.47.1
PATCH v2 1/6 hw/arm/boot: Propagate vCPU to arm_load_dtb()
In heterogeneous setup the first vCPU might not be the one expected, better pass it explicitly.
--- include/hw/arm/boot.h | 4 +++- hw/arm/boot.c | 11 ++++++----- hw/arm/virt.c | 2 +- 3 files changed, 10 insertions(+), 7 deletions(-)
include/hw/arm/boot.h +3 -1
@@ -160,6 +160,7 @@ AddressSpace *arm_boot_address_space(ARMCPU *cpu,* @binfo: struct describing the boot environment * @addr_limit: upper limit of the available memory area at @addr * @as: address space to load image to +* @cpu: ARM CPU object * * Load a device tree supplied by the machine or by the user with the * '-dtb' command line option, and put it at offset @addr in target
@@ -176,7 +177,8 @@ AddressSpace *arm_boot_address_space(ARMCPU *cpu,* Note: Must not be called unless have_dtb(binfo) is true. */ int arm_load_dtb (hwaddr addr,const struct arm_boot_info *binfo, -hwaddr addr_limit,AddressSpace *as,MachineState *ms); +hwaddr addr_limit,AddressSpace *as,MachineState *ms, +ARMCPU *cpu);/* Write a secure board setup routine with a dummy handler for SMCs */ void arm_write_secure_board_setup_dummy_smc(ARMCPU *cpu,
hw/arm/boot.c +6 -5
@@ -432,13 +432,12 @@ out:return ret; } -static void fdt_add_psci_node (void *fdt) +static void fdt_add_psci_node (void *fdt,ARMCPU *armcpu) {uint32_t cpu_suspend_fn;uint32_t cpu_off_fn;uint32_t cpu_on_fn;uint32_t migrate_fn; -ARMCPU *armcpu =ARM_CPU (qemu_get_cpu (0 ));const char *psci_method;int64_t psci_conduit;int rc;
@@ -512,7 +511,8 @@ static void fdt_add_psci_node(void *fdt) }int arm_load_dtb (hwaddr addr,const struct arm_boot_info *binfo, -hwaddr addr_limit,AddressSpace *as,MachineState *ms) +hwaddr addr_limit,AddressSpace *as,MachineState *ms, +ARMCPU *cpu) {void *fdt =NULL ;int size, rc, n =0 ;
@@ -655,7 +655,7 @@ int arm_load_dtb(hwaddr addr, const struct arm_boot_info *binfo, } } -fdt_add_psci_node (fdt); +fdt_add_psci_node (fdt, cpu);if (binfo->modify_dtb) { binfo->modify_dtb (binfo, fdt);
@@ -1327,7 +1327,8 @@ void arm_load_kernel(ARMCPU *cpu, MachineState *ms, struct arm_boot_info *info)* decided whether to enable PSCI and set the psci-conduit CPU properties. */ if (!info->skip_dtb_autoload &&have_dtb (info)) { -if (arm_load_dtb (info->dtb_start, info, info->dtb_limit, as, ms) <0 ) { +if (arm_load_dtb (info->dtb_start, info, info->dtb_limit, + as, ms, cpu) <0 ) {exit (1 ); } }
hw/arm/virt.c +1 -1
@@ -1746,7 +1746,7 @@ void virt_machine_done(Notifier *notifier, void *data) vms->memmap[VIRT_PLATFORM_BUS ].size, vms->irqmap[VIRT_PLATFORM_BUS]); } -if (arm_load_dtb (info->dtb_start, info, info->dtb_limit, as, ms) <0 ) { +if (arm_load_dtb (info->dtb_start, info, info->dtb_limit, as, ms, cpu) <0 ) {exit (1 ); }
Signature · 1 line
2.47.1
PATCH v2 2/6 hw/arm/fsl-imx6: Add local 'mpcore/gic' variables
In reply to Philippe Mathieu-DaudéThe A9MPCore forward the IRQs from its internal GIC. To make the code clearer, add the 'mpcore' and 'gic' variables.
--- hw/arm/fsl-imx6.c | 52 +++++++++++++++++++---------------------------- 1 file changed, 21 insertions(+), 31 deletions(-)
hw/arm/fsl-imx6.c +21 -31
@@ -117,6 +117,8 @@ static void fsl_imx6_realize(DeviceState *dev, Error **errp)uint16_t i;qemu_irq irq;unsigned int smp_cpus = ms->smp.cpus; +DeviceState *mpcore =DEVICE (&s->a9mpcore); +DeviceState *gic;if (smp_cpus >FSL_IMX6_NUM_CPUS ) { error_setg(errp, "%s: Only %d CPUs are supported (%d requested)",
@@ -143,21 +145,21 @@ static void fsl_imx6_realize(DeviceState *dev, Error **errp) } } -object_property_set_int (OBJECT (&s->a9mpcore),"num-cpu" , smp_cpus, - &error_abort); +object_property_set_int (OBJECT (mpcore),"num-cpu" , smp_cpus, &error_abort); -object_property_set_int (OBJECT (&s->a9mpcore),"num-irq" , +object_property_set_int (OBJECT (mpcore),"num-irq" ,FSL_IMX6_MAX_IRQ +GIC_INTERNAL , &error_abort); -if (!sysbus_realize (SYS_BUS_DEVICE (&s->a9mpcore), errp)) { +if (!sysbus_realize (SYS_BUS_DEVICE (mpcore), errp)) {return ; } -sysbus_mmio_map (SYS_BUS_DEVICE (&s->a9mpcore),0 ,FSL_IMX6_A9MPCORE_ADDR ); +sysbus_mmio_map (SYS_BUS_DEVICE (mpcore),0 ,FSL_IMX6_A9MPCORE_ADDR ); + gic = mpcore;for (i =0 ; i < smp_cpus; i++) { -sysbus_connect_irq (SYS_BUS_DEVICE (&s->a9mpcore), i, +sysbus_connect_irq (SYS_BUS_DEVICE (gic), i,qdev_get_gpio_in (DEVICE (&s->cpu[i]),ARM_CPU_IRQ )); -sysbus_connect_irq (SYS_BUS_DEVICE (&s->a9mpcore), i + smp_cpus, +sysbus_connect_irq (SYS_BUS_DEVICE (gic), i + smp_cpus,qdev_get_gpio_in (DEVICE (&s->cpu[i]),ARM_CPU_FIQ )); }
@@ -195,8 +197,7 @@ static void fsl_imx6_realize(DeviceState *dev, Error **errp)sysbus_mmio_map (SYS_BUS_DEVICE (&s->uart[i]),0 , serial_table[i].addr);sysbus_connect_irq (SYS_BUS_DEVICE (&s->uart[i]),0 , -qdev_get_gpio_in (DEVICE (&s->a9mpcore), - serial_table[i].irq)); +qdev_get_gpio_in (gic, serial_table[i].irq)); } s->gpt.ccm =IMX_CCM (&s->ccm);
@@ -207,8 +208,7 @@ static void fsl_imx6_realize(DeviceState *dev, Error **errp)sysbus_mmio_map (SYS_BUS_DEVICE (&s->gpt),0 ,FSL_IMX6_GPT_ADDR );sysbus_connect_irq (SYS_BUS_DEVICE (&s->gpt),0 , -qdev_get_gpio_in (DEVICE (&s->a9mpcore), -FSL_IMX6_GPT_IRQ )); +qdev_get_gpio_in (gic,FSL_IMX6_GPT_IRQ ));/* Initialize all EPIT timers */ for (i =0 ; i <FSL_IMX6_NUM_EPITS ; i++) {
@@ -228,8 +228,7 @@ static void fsl_imx6_realize(DeviceState *dev, Error **errp)sysbus_mmio_map (SYS_BUS_DEVICE (&s->epit[i]),0 , epit_table[i].addr);sysbus_connect_irq (SYS_BUS_DEVICE (&s->epit[i]),0 , -qdev_get_gpio_in (DEVICE (&s->a9mpcore), - epit_table[i].irq)); +qdev_get_gpio_in (gic, epit_table[i].irq)); }/* Initialize all I2C */
@@ -249,8 +248,7 @@ static void fsl_imx6_realize(DeviceState *dev, Error **errp)sysbus_mmio_map (SYS_BUS_DEVICE (&s->i2c[i]),0 , i2c_table[i].addr);sysbus_connect_irq (SYS_BUS_DEVICE (&s->i2c[i]),0 , -qdev_get_gpio_in (DEVICE (&s->a9mpcore), - i2c_table[i].irq)); +qdev_get_gpio_in (gic, i2c_table[i].irq)); }/* Initialize all GPIOs */
@@ -307,11 +305,9 @@ static void fsl_imx6_realize(DeviceState *dev, Error **errp)sysbus_mmio_map (SYS_BUS_DEVICE (&s->gpio[i]),0 , gpio_table[i].addr);sysbus_connect_irq (SYS_BUS_DEVICE (&s->gpio[i]),0 , -qdev_get_gpio_in (DEVICE (&s->a9mpcore), - gpio_table[i].irq_low)); +qdev_get_gpio_in (gic, gpio_table[i].irq_low));sysbus_connect_irq (SYS_BUS_DEVICE (&s->gpio[i]),1 , -qdev_get_gpio_in (DEVICE (&s->a9mpcore), - gpio_table[i].irq_high)); +qdev_get_gpio_in (gic, gpio_table[i].irq_high)); }/* Initialize all SDHC */
@@ -338,8 +334,7 @@ static void fsl_imx6_realize(DeviceState *dev, Error **errp) }sysbus_mmio_map (SYS_BUS_DEVICE (&s->esdhc[i]),0 , esdhc_table[i].addr);sysbus_connect_irq (SYS_BUS_DEVICE (&s->esdhc[i]),0 , -qdev_get_gpio_in (DEVICE (&s->a9mpcore), - esdhc_table[i].irq)); +qdev_get_gpio_in (gic, esdhc_table[i].irq)); }/* USB */
@@ -360,8 +355,7 @@ static void fsl_imx6_realize(DeviceState *dev, Error **errp)sysbus_mmio_map (SYS_BUS_DEVICE (&s->usb[i]),0 ,FSL_IMX6_USBOH3_USB_ADDR + i *0x200 );sysbus_connect_irq (SYS_BUS_DEVICE (&s->usb[i]),0 , -qdev_get_gpio_in (DEVICE (&s->a9mpcore), - FSL_IMX6_USBn_IRQ[i])); +qdev_get_gpio_in (gic, FSL_IMX6_USBn_IRQ[i])); }/* Initialize all ECSPI */
@@ -384,8 +378,7 @@ static void fsl_imx6_realize(DeviceState *dev, Error **errp)sysbus_mmio_map (SYS_BUS_DEVICE (&s->spi[i]),0 , spi_table[i].addr);sysbus_connect_irq (SYS_BUS_DEVICE (&s->spi[i]),0 , -qdev_get_gpio_in (DEVICE (&s->a9mpcore), - spi_table[i].irq)); +qdev_get_gpio_in (gic, spi_table[i].irq)); } object_property_set_uint(OBJECT(&s->eth), "phy-num", s->phy_num,
@@ -396,11 +389,9 @@ static void fsl_imx6_realize(DeviceState *dev, Error **errp) }sysbus_mmio_map (SYS_BUS_DEVICE (&s->eth),0 ,FSL_IMX6_ENET_ADDR );sysbus_connect_irq (SYS_BUS_DEVICE (&s->eth),0 , -qdev_get_gpio_in (DEVICE (&s->a9mpcore), -FSL_IMX6_ENET_MAC_IRQ )); +qdev_get_gpio_in (gic,FSL_IMX6_ENET_MAC_IRQ ));sysbus_connect_irq (SYS_BUS_DEVICE (&s->eth),1 , -qdev_get_gpio_in (DEVICE (&s->a9mpcore), -FSL_IMX6_ENET_MAC_1588_IRQ )); +qdev_get_gpio_in (gic,FSL_IMX6_ENET_MAC_1588_IRQ ));/* * SNVS
@@ -427,8 +418,7 @@ static void fsl_imx6_realize(DeviceState *dev, Error **errp)sysbus_mmio_map (SYS_BUS_DEVICE (&s->wdt[i]),0 , FSL_IMX6_WDOGn_ADDR[i]);sysbus_connect_irq (SYS_BUS_DEVICE (&s->wdt[i]),0 , -qdev_get_gpio_in (DEVICE (&s->a9mpcore), - FSL_IMX6_WDOGn_IRQ[i])); +qdev_get_gpio_in (gic, FSL_IMX6_WDOGn_IRQ[i])); }/*
Signature · 1 line
2.47.1
PATCH v2 3/6 hw/arm/fsl-imx6ul: Add local 'mpcore/gic' variables
In reply to Philippe Mathieu-DaudéThe A7MPCore forward the IRQs from its internal GIC. To make the code clearer, add the 'mpcore' and 'gic' variables. Rename 'd' variable as 'cpu'.
--- hw/arm/fsl-imx6ul.c | 64 +++++++++++++++++++-------------------------- 1 file changed, 27 insertions(+), 37 deletions(-)
hw/arm/fsl-imx6ul.c +27 -37
@@ -157,10 +157,12 @@ static void fsl_imx6ul_realize(DeviceState *dev, Error **errp) {MachineState *ms =MACHINE (qdev_get_machine ());FslIMX6ULState *s =FSL_IMX6UL (dev); +DeviceState *mpcore =DEVICE (&s->a7mpcore);int i;char name[NAME_SIZE ]; -SysBusDevice *sbd; -DeviceState *d; +DeviceState *gic; +SysBusDevice *gicsbd; +DeviceState *cpu;if (ms->smp.cpus >1 ) { error_setg(errp, "%s: Only a single CPU is supported (%d requested)",
@@ -173,19 +175,19 @@ static void fsl_imx6ul_realize(DeviceState *dev, Error **errp)/* * A7MPCORE */ -object_property_set_int (OBJECT (&s->a7mpcore),"num-cpu" ,1 , &error_abort); -object_property_set_int (OBJECT (&s->a7mpcore),"num-irq" , +object_property_set_int (OBJECT (mpcore),"num-cpu" ,1 , &error_abort); +object_property_set_int (OBJECT (mpcore),"num-irq" ,FSL_IMX6UL_MAX_IRQ +GIC_INTERNAL , &error_abort); -sysbus_realize (SYS_BUS_DEVICE (&s->a7mpcore), &error_abort); -sysbus_mmio_map (SYS_BUS_DEVICE (&s->a7mpcore),0 ,FSL_IMX6UL_A7MPCORE_ADDR ); +sysbus_realize (SYS_BUS_DEVICE (mpcore), &error_abort); +sysbus_mmio_map (SYS_BUS_DEVICE (mpcore),0 ,FSL_IMX6UL_A7MPCORE_ADDR ); - sbd =SYS_BUS_DEVICE (&s->a7mpcore); - d =DEVICE (&s->cpu); - -sysbus_connect_irq (sbd,0 ,qdev_get_gpio_in (d,ARM_CPU_IRQ )); -sysbus_connect_irq (sbd,1 ,qdev_get_gpio_in (d,ARM_CPU_FIQ )); -sysbus_connect_irq (sbd,2 ,qdev_get_gpio_in (d,ARM_CPU_VIRQ )); -sysbus_connect_irq (sbd,3 ,qdev_get_gpio_in (d,ARM_CPU_VFIQ )); + gic = mpcore; + gicsbd =SYS_BUS_DEVICE (gic); + cpu =DEVICE (&s->cpu); +sysbus_connect_irq (gicsbd,0 ,qdev_get_gpio_in (cpu,ARM_CPU_IRQ )); +sysbus_connect_irq (gicsbd,1 ,qdev_get_gpio_in (cpu,ARM_CPU_FIQ )); +sysbus_connect_irq (gicsbd,2 ,qdev_get_gpio_in (cpu,ARM_CPU_VIRQ )); +sysbus_connect_irq (gicsbd,3 ,qdev_get_gpio_in (cpu,ARM_CPU_VFIQ ));/* * A7MPCORE DAP
@@ -244,8 +246,7 @@ static void fsl_imx6ul_realize(DeviceState *dev, Error **errp) FSL_IMX6UL_GPTn_ADDR[i]);sysbus_connect_irq (SYS_BUS_DEVICE (&s->gpt[i]),0 , -qdev_get_gpio_in (DEVICE (&s->a7mpcore), - FSL_IMX6UL_GPTn_IRQ[i])); +qdev_get_gpio_in (gic, FSL_IMX6UL_GPTn_IRQ[i])); }/*
@@ -269,8 +270,7 @@ static void fsl_imx6ul_realize(DeviceState *dev, Error **errp) FSL_IMX6UL_EPITn_ADDR[i]);sysbus_connect_irq (SYS_BUS_DEVICE (&s->epit[i]),0 , -qdev_get_gpio_in (DEVICE (&s->a7mpcore), - FSL_IMX6UL_EPITn_IRQ[i])); +qdev_get_gpio_in (gic, FSL_IMX6UL_EPITn_IRQ[i])); }/*
@@ -307,12 +307,10 @@ static void fsl_imx6ul_realize(DeviceState *dev, Error **errp) FSL_IMX6UL_GPIOn_ADDR[i]);sysbus_connect_irq (SYS_BUS_DEVICE (&s->gpio[i]),0 , -qdev_get_gpio_in (DEVICE (&s->a7mpcore), - FSL_IMX6UL_GPIOn_LOW_IRQ[i])); +qdev_get_gpio_in (gic, FSL_IMX6UL_GPIOn_LOW_IRQ[i]));sysbus_connect_irq (SYS_BUS_DEVICE (&s->gpio[i]),1 , -qdev_get_gpio_in (DEVICE (&s->a7mpcore), - FSL_IMX6UL_GPIOn_HIGH_IRQ[i])); +qdev_get_gpio_in (gic, FSL_IMX6UL_GPIOn_HIGH_IRQ[i])); }/*
@@ -366,8 +364,7 @@ static void fsl_imx6ul_realize(DeviceState *dev, Error **errp) FSL_IMX6UL_SPIn_ADDR[i]);sysbus_connect_irq (SYS_BUS_DEVICE (&s->spi[i]),0 , -qdev_get_gpio_in (DEVICE (&s->a7mpcore), - FSL_IMX6UL_SPIn_IRQ[i])); +qdev_get_gpio_in (gic, FSL_IMX6UL_SPIn_IRQ[i])); }/*
@@ -392,8 +389,7 @@ static void fsl_imx6ul_realize(DeviceState *dev, Error **errp)sysbus_mmio_map (SYS_BUS_DEVICE (&s->i2c[i]),0 , FSL_IMX6UL_I2Cn_ADDR[i]);sysbus_connect_irq (SYS_BUS_DEVICE (&s->i2c[i]),0 , -qdev_get_gpio_in (DEVICE (&s->a7mpcore), - FSL_IMX6UL_I2Cn_IRQ[i])); +qdev_get_gpio_in (gic, FSL_IMX6UL_I2Cn_IRQ[i])); }/*
@@ -430,8 +426,7 @@ static void fsl_imx6ul_realize(DeviceState *dev, Error **errp) FSL_IMX6UL_UARTn_ADDR[i]);sysbus_connect_irq (SYS_BUS_DEVICE (&s->uart[i]),0 , -qdev_get_gpio_in (DEVICE (&s->a7mpcore), - FSL_IMX6UL_UARTn_IRQ[i])); +qdev_get_gpio_in (gic, FSL_IMX6UL_UARTn_IRQ[i])); }/*
@@ -480,12 +475,10 @@ static void fsl_imx6ul_realize(DeviceState *dev, Error **errp) FSL_IMX6UL_ENETn_ADDR[i]);sysbus_connect_irq (SYS_BUS_DEVICE (&s->eth[i]),0 , -qdev_get_gpio_in (DEVICE (&s->a7mpcore), - FSL_IMX6UL_ENETn_IRQ[i])); +qdev_get_gpio_in (gic, FSL_IMX6UL_ENETn_IRQ[i]));sysbus_connect_irq (SYS_BUS_DEVICE (&s->eth[i]),1 , -qdev_get_gpio_in (DEVICE (&s->a7mpcore), - FSL_IMX6UL_ENETn_TIMER_IRQ[i])); +qdev_get_gpio_in (gic, FSL_IMX6UL_ENETn_TIMER_IRQ[i])); }/*
@@ -521,8 +514,7 @@ static void fsl_imx6ul_realize(DeviceState *dev, Error **errp)sysbus_mmio_map (SYS_BUS_DEVICE (&s->usb[i]),0 , FSL_IMX6UL_USB02_USBn_ADDR[i]);sysbus_connect_irq (SYS_BUS_DEVICE (&s->usb[i]),0 , -qdev_get_gpio_in (DEVICE (&s->a7mpcore), - FSL_IMX6UL_USBn_IRQ[i])); +qdev_get_gpio_in (gic, FSL_IMX6UL_USBn_IRQ[i])); }/*
@@ -547,8 +539,7 @@ static void fsl_imx6ul_realize(DeviceState *dev, Error **errp) FSL_IMX6UL_USDHCn_ADDR[i]);sysbus_connect_irq (SYS_BUS_DEVICE (&s->usdhc[i]),0 , -qdev_get_gpio_in (DEVICE (&s->a7mpcore), - FSL_IMX6UL_USDHCn_IRQ[i])); +qdev_get_gpio_in (gic, FSL_IMX6UL_USDHCn_IRQ[i])); }/*
@@ -580,8 +571,7 @@ static void fsl_imx6ul_realize(DeviceState *dev, Error **errp)sysbus_mmio_map (SYS_BUS_DEVICE (&s->wdt[i]),0 , FSL_IMX6UL_WDOGn_ADDR[i]);sysbus_connect_irq (SYS_BUS_DEVICE (&s->wdt[i]),0 , -qdev_get_gpio_in (DEVICE (&s->a7mpcore), - FSL_IMX6UL_WDOGn_IRQ[i])); +qdev_get_gpio_in (gic, FSL_IMX6UL_WDOGn_IRQ[i])); }/*
Signature · 1 line
2.47.1
PATCH v2 4/6 hw/arm/fsl-imx7: Add local 'mpcore/gic' variables
In reply to Philippe Mathieu-DaudéThe A7MPCore forward the IRQs from its internal GIC. To make the code clearer, add the 'mpcore' and 'gic' variables.
--- hw/arm/fsl-imx7.c | 52 +++++++++++++++++++++-------------------------- 1 file changed, 23 insertions(+), 29 deletions(-)
hw/arm/fsl-imx7.c +23 -29
@@ -166,7 +166,8 @@ static void fsl_imx7_realize(DeviceState *dev, Error **errp) {MachineState *ms =MACHINE (qdev_get_machine ());FslIMX7State *s =FSL_IMX7 (dev); -Object *o; +DeviceState *mpcore =DEVICE (&s->a7mpcore); +DeviceState *gic;int i;qemu_irq irq;char name[NAME_SIZE ];
@@ -182,7 +183,7 @@ static void fsl_imx7_realize(DeviceState *dev, Error **errp)* CPUs */ for (i =0 ; i < smp_cpus; i++) { - o =OBJECT (&s->cpu[i]); +Object *o =OBJECT (&s->cpu[i]);/* On uniprocessor, the CBAR is set to 0 */ if (smp_cpus >1 ) {
@@ -205,16 +206,15 @@ static void fsl_imx7_realize(DeviceState *dev, Error **errp)/* * A7MPCORE */ -object_property_set_int (OBJECT (&s->a7mpcore),"num-cpu" , smp_cpus, - &error_abort); -object_property_set_int (OBJECT (&s->a7mpcore),"num-irq" , +object_property_set_int (OBJECT (mpcore),"num-cpu" , smp_cpus, &error_abort); +object_property_set_int (OBJECT (mpcore),"num-irq" ,FSL_IMX7_MAX_IRQ +GIC_INTERNAL , &error_abort); +sysbus_realize (SYS_BUS_DEVICE (mpcore), &error_abort); +sysbus_mmio_map (SYS_BUS_DEVICE (mpcore),0 ,FSL_IMX7_A7MPCORE_ADDR ); -sysbus_realize (SYS_BUS_DEVICE (&s->a7mpcore), &error_abort); -sysbus_mmio_map (SYS_BUS_DEVICE (&s->a7mpcore),0 ,FSL_IMX7_A7MPCORE_ADDR ); - + gic = mpcore;for (i =0 ; i < smp_cpus; i++) { -SysBusDevice *sbd =SYS_BUS_DEVICE (&s->a7mpcore); +SysBusDevice *sbd =SYS_BUS_DEVICE (gic);DeviceState *d =DEVICE (qemu_get_cpu (i)); irq =qdev_get_gpio_in (d,ARM_CPU_IRQ );
@@ -255,8 +255,7 @@ static void fsl_imx7_realize(DeviceState *dev, Error **errp)sysbus_realize (SYS_BUS_DEVICE (&s->gpt[i]), &error_abort);sysbus_mmio_map (SYS_BUS_DEVICE (&s->gpt[i]),0 , FSL_IMX7_GPTn_ADDR[i]);sysbus_connect_irq (SYS_BUS_DEVICE (&s->gpt[i]),0 , -qdev_get_gpio_in (DEVICE (&s->a7mpcore), - FSL_IMX7_GPTn_IRQ[i])); +qdev_get_gpio_in (gic, FSL_IMX7_GPTn_IRQ[i])); }/*
@@ -298,12 +297,10 @@ static void fsl_imx7_realize(DeviceState *dev, Error **errp) FSL_IMX7_GPIOn_ADDR[i]);sysbus_connect_irq (SYS_BUS_DEVICE (&s->gpio[i]),0 , -qdev_get_gpio_in (DEVICE (&s->a7mpcore), - FSL_IMX7_GPIOn_LOW_IRQ[i])); +qdev_get_gpio_in (gic, FSL_IMX7_GPIOn_LOW_IRQ[i]));sysbus_connect_irq (SYS_BUS_DEVICE (&s->gpio[i]),1 , -qdev_get_gpio_in (DEVICE (&s->a7mpcore), - FSL_IMX7_GPIOn_HIGH_IRQ[i])); +qdev_get_gpio_in (gic, FSL_IMX7_GPIOn_HIGH_IRQ[i])); }/*
@@ -355,8 +352,7 @@ static void fsl_imx7_realize(DeviceState *dev, Error **errp)sysbus_mmio_map (SYS_BUS_DEVICE (&s->spi[i]),0 , FSL_IMX7_SPIn_ADDR[i]);sysbus_connect_irq (SYS_BUS_DEVICE (&s->spi[i]),0 , -qdev_get_gpio_in (DEVICE (&s->a7mpcore), - FSL_IMX7_SPIn_IRQ[i])); +qdev_get_gpio_in (gic, FSL_IMX7_SPIn_IRQ[i])); }/*
@@ -381,8 +377,7 @@ static void fsl_imx7_realize(DeviceState *dev, Error **errp)sysbus_mmio_map (SYS_BUS_DEVICE (&s->i2c[i]),0 , FSL_IMX7_I2Cn_ADDR[i]);sysbus_connect_irq (SYS_BUS_DEVICE (&s->i2c[i]),0 , -qdev_get_gpio_in (DEVICE (&s->a7mpcore), - FSL_IMX7_I2Cn_IRQ[i])); +qdev_get_gpio_in (gic, FSL_IMX7_I2Cn_IRQ[i])); }/*
@@ -416,7 +411,7 @@ static void fsl_imx7_realize(DeviceState *dev, Error **errp)sysbus_mmio_map (SYS_BUS_DEVICE (&s->uart[i]),0 , FSL_IMX7_UARTn_ADDR[i]); - irq =qdev_get_gpio_in (DEVICE (&s->a7mpcore), FSL_IMX7_UARTn_IRQ[i]); + irq =qdev_get_gpio_in (gic, FSL_IMX7_UARTn_IRQ[i]);sysbus_connect_irq (SYS_BUS_DEVICE (&s->uart[i]),0 , irq); }
@@ -454,9 +449,9 @@ static void fsl_imx7_realize(DeviceState *dev, Error **errp)sysbus_mmio_map (SYS_BUS_DEVICE (&s->eth[i]),0 , FSL_IMX7_ENETn_ADDR[i]); - irq =qdev_get_gpio_in (DEVICE (&s->a7mpcore),FSL_IMX7_ENET_IRQ (i,0 )); + irq =qdev_get_gpio_in (gic,FSL_IMX7_ENET_IRQ (i,0 ));sysbus_connect_irq (SYS_BUS_DEVICE (&s->eth[i]),0 , irq); - irq =qdev_get_gpio_in (DEVICE (&s->a7mpcore),FSL_IMX7_ENET_IRQ (i,3 )); + irq =qdev_get_gpio_in (gic,FSL_IMX7_ENET_IRQ (i,3 ));sysbus_connect_irq (SYS_BUS_DEVICE (&s->eth[i]),1 , irq); }
@@ -483,7 +478,7 @@ static void fsl_imx7_realize(DeviceState *dev, Error **errp)sysbus_mmio_map (SYS_BUS_DEVICE (&s->usdhc[i]),0 , FSL_IMX7_USDHCn_ADDR[i]); - irq =qdev_get_gpio_in (DEVICE (&s->a7mpcore), FSL_IMX7_USDHCn_IRQ[i]); + irq =qdev_get_gpio_in (gic, FSL_IMX7_USDHCn_IRQ[i]);sysbus_connect_irq (SYS_BUS_DEVICE (&s->usdhc[i]),0 , irq); }
@@ -522,8 +517,7 @@ static void fsl_imx7_realize(DeviceState *dev, Error **errp)sysbus_mmio_map (SYS_BUS_DEVICE (&s->wdt[i]),0 , FSL_IMX7_WDOGn_ADDR[i]);sysbus_connect_irq (SYS_BUS_DEVICE (&s->wdt[i]),0 , -qdev_get_gpio_in (DEVICE (&s->a7mpcore), - FSL_IMX7_WDOGn_IRQ[i])); +qdev_get_gpio_in (gic, FSL_IMX7_WDOGn_IRQ[i])); }/*
@@ -606,11 +600,11 @@ static void fsl_imx7_realize(DeviceState *dev, Error **errp) irq =qdev_get_gpio_in (DEVICE (&s->a7mpcore),FSL_IMX7_PCI_INTD_MSI_IRQ );qdev_connect_gpio_out (DEVICE (&s->pcie4_msi_irq),0 , irq); - irq =qdev_get_gpio_in (DEVICE (&s->a7mpcore),FSL_IMX7_PCI_INTA_IRQ ); + irq =qdev_get_gpio_in (gic,FSL_IMX7_PCI_INTA_IRQ );sysbus_connect_irq (SYS_BUS_DEVICE (&s->pcie),0 , irq); - irq =qdev_get_gpio_in (DEVICE (&s->a7mpcore),FSL_IMX7_PCI_INTB_IRQ ); + irq =qdev_get_gpio_in (gic,FSL_IMX7_PCI_INTB_IRQ );sysbus_connect_irq (SYS_BUS_DEVICE (&s->pcie),1 , irq); - irq =qdev_get_gpio_in (DEVICE (&s->a7mpcore),FSL_IMX7_PCI_INTC_IRQ ); + irq =qdev_get_gpio_in (gic,FSL_IMX7_PCI_INTC_IRQ );sysbus_connect_irq (SYS_BUS_DEVICE (&s->pcie),2 , irq); irq =qdev_get_gpio_in (DEVICE (&s->pcie4_msi_irq),0 );sysbus_connect_irq (SYS_BUS_DEVICE (&s->pcie),3 , irq);
@@ -643,7 +637,7 @@ static void fsl_imx7_realize(DeviceState *dev, Error **errp)sysbus_mmio_map (SYS_BUS_DEVICE (&s->usb[i]),0 , FSL_IMX7_USBn_ADDR[i]); - irq =qdev_get_gpio_in (DEVICE (&s->a7mpcore), FSL_IMX7_USBn_IRQ[i]); + irq =qdev_get_gpio_in (gic, FSL_IMX7_USBn_IRQ[i]);sysbus_connect_irq (SYS_BUS_DEVICE (&s->usb[i]),0 , irq);snprintf (name,NAME_SIZE ,"usbmisc%d" , i);
Signature · 1 line
2.47.1
PATCH v2 5/6 hw/cpu/arm: Alias 'num-cpu' property on TYPE_REALVIEW_MPCORE
In reply to Philippe Mathieu-DaudéNo need to duplicate and forward the 'num-cpu' property from TYPE_ARM11MPCORE_PRIV to TYPE_REALVIEW_MPCORE, alias it with QOM object_property_add_alias().
--- hw/cpu/realview_mpcore.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-)
hw/cpu/realview_mpcore.c +1 -7
@@ -14,7 +14,6 @@#include "hw/cpu/arm11mpcore.h" #include "hw/intc/realview_gic.h" #include "hw/irq.h" -#include "hw/qdev-properties.h" #include "qom/object.h" #define TYPE_REALVIEW_MPCORE_RIRQ "realview_mpcore"
@@ -68,7 +67,6 @@ static void realview_mpcore_realize(DeviceState *dev, Error **errp)int n;int i; -qdev_prop_set_uint32 (priv,"num-cpu" , s->num_cpu);if (!sysbus_realize (SYS_BUS_DEVICE (&s->priv), errp)) {return ; }
@@ -100,6 +98,7 @@ static void mpcore_rirq_init(Object *obj)int i;object_initialize_child (obj,"a11priv" , &s->priv,TYPE_ARM11MPCORE_PRIV ); +object_property_add_alias (obj,"num-cpu" ,OBJECT (&s->priv),"num-cpu" ); privbusdev =SYS_BUS_DEVICE (&s->priv);sysbus_init_mmio (sbd,sysbus_mmio_get_region (privbusdev,0 ));
@@ -108,16 +107,11 @@ static void mpcore_rirq_init(Object *obj) } } -static const Property mpcore_rirq_properties[] = { -DEFINE_PROP_UINT32 ("num-cpu" , mpcore_rirq_state, num_cpu,1 ), -}; -static void mpcore_rirq_class_init (ObjectClass *klass,void *data) {DeviceClass *dc =DEVICE_CLASS (klass); dc->realize = realview_mpcore_realize; -device_class_set_props (dc, mpcore_rirq_properties); }static const TypeInfo mpcore_rirq_info = {
Signature · 1 line
2.47.1
PATCH v2 6/6 hw/cpu/arm: Declare CPU QOM types using DEFINE_TYPES() macro
In reply to Philippe Mathieu-DaudéWhen multiple QOM types are registered in the same file, it is simpler to use the the DEFINE_TYPES() macro. In particular because type array declared with such macro are easier to review.
--- hw/cpu/a15mpcore.c | 21 +++++++++------------ hw/cpu/a9mpcore.c | 21 +++++++++------------ hw/cpu/arm11mpcore.c | 21 +++++++++------------ hw/cpu/realview_mpcore.c | 21 +++++++++------------ 4 files changed, 36 insertions(+), 48 deletions(-)
hw/cpu/a15mpcore.c +9 -12
@@ -164,17 +164,14 @@ static void a15mp_priv_class_init(ObjectClass *klass, void *data)/* We currently have no saveable state */ } -static const TypeInfo a15mp_priv_info = { - .name =TYPE_A15MPCORE_PRIV , - .parent =TYPE_SYS_BUS_DEVICE , - .instance_size =sizeof (A15MPPrivState), - .instance_init = a15mp_priv_initfn, - .class_init = a15mp_priv_class_init, +static const TypeInfo a15mp_types[] = { + { + .name =TYPE_A15MPCORE_PRIV , + .parent =TYPE_SYS_BUS_DEVICE , + .instance_size =sizeof (A15MPPrivState), + .instance_init = a15mp_priv_initfn, + .class_init = a15mp_priv_class_init, + }, }; -static void a15mp_register_types (void ) -{ -type_register_static (&a15mp_priv_info); -} - -type_init (a15mp_register_types) +DEFINE_TYPES (a15mp_types)
hw/cpu/a9mpcore.c +9 -12
@@ -177,17 +177,14 @@ static void a9mp_priv_class_init(ObjectClass *klass, void *data)device_class_set_props (dc, a9mp_priv_properties); } -static const TypeInfo a9mp_priv_info = { - .name =TYPE_A9MPCORE_PRIV , - .parent =TYPE_SYS_BUS_DEVICE , - .instance_size =sizeof (A9MPPrivState), - .instance_init = a9mp_priv_initfn, - .class_init = a9mp_priv_class_init, +static const TypeInfo a9mp_types[] = { + { + .name =TYPE_A9MPCORE_PRIV , + .parent =TYPE_SYS_BUS_DEVICE , + .instance_size =sizeof (A9MPPrivState), + .instance_init = a9mp_priv_initfn, + .class_init = a9mp_priv_class_init, + }, }; -static void a9mp_register_types (void ) -{ -type_register_static (&a9mp_priv_info); -} - -type_init (a9mp_register_types) +DEFINE_TYPES (a9mp_types)
hw/cpu/arm11mpcore.c +9 -12
@@ -152,17 +152,14 @@ static void mpcore_priv_class_init(ObjectClass *klass, void *data)device_class_set_props (dc, mpcore_priv_properties); } -static const TypeInfo mpcore_priv_info = { - .name =TYPE_ARM11MPCORE_PRIV , - .parent =TYPE_SYS_BUS_DEVICE , - .instance_size =sizeof (ARM11MPCorePriveState), - .instance_init = mpcore_priv_initfn, - .class_init = mpcore_priv_class_init, +static const TypeInfo arm11mp_types[] = { + { + .name =TYPE_ARM11MPCORE_PRIV , + .parent =TYPE_SYS_BUS_DEVICE , + .instance_size =sizeof (ARM11MPCorePriveState), + .instance_init = mpcore_priv_initfn, + .class_init = mpcore_priv_class_init, + }, }; -static void arm11mpcore_register_types (void ) -{ -type_register_static (&mpcore_priv_info); -} - -type_init (arm11mpcore_register_types) +DEFINE_TYPES (arm11mp_types)
hw/cpu/realview_mpcore.c +9 -12
@@ -114,17 +114,14 @@ static void mpcore_rirq_class_init(ObjectClass *klass, void *data) dc->realize = realview_mpcore_realize; } -static const TypeInfo mpcore_rirq_info = { - .name =TYPE_REALVIEW_MPCORE_RIRQ , - .parent =TYPE_SYS_BUS_DEVICE , - .instance_size =sizeof (mpcore_rirq_state), - .instance_init = mpcore_rirq_init, - .class_init = mpcore_rirq_class_init, +static const TypeInfo realview_mpcore_types[] = { + { + .name =TYPE_REALVIEW_MPCORE_RIRQ , + .parent =TYPE_SYS_BUS_DEVICE , + .instance_size =sizeof (mpcore_rirq_state), + .instance_init = mpcore_rirq_init, + .class_init = mpcore_rirq_class_init, + }, }; -static void realview_mpcore_register_types (void ) -{ -type_register_static (&mpcore_rirq_info); -} - -type_init (realview_mpcore_register_types) +DEFINE_TYPES (realview_mpcore_types)
Signature · 1 line
2.47.1
Peter Maydell
AppliedQuoted 16 lines · Philippe Mathieu-Daudé
(series fully reviewed)
Hi,
This series contains the non-controversial and already reviewed patches (rebased) from this previous series:
"Remove one use ofqemu_get_cpu()in A7/A15 MPCore priv"
https://lore.kernel.org/qemu-devel/[email protected]/Posted separately to avoid keeping rebasing.
Regards,
Phil.
Quoted 8 lines
Philippe Mathieu-Daudé (6):
hw/arm/boot: Propagate vCPU toarm_load_dtb()hw/arm/fsl-imx6: Add local 'mpcore/gic' variables hw/arm/fsl-imx6ul: Add local 'mpcore/gic' variables hw/arm/fsl-imx7: Add local 'mpcore/gic' variables hw/cpu/arm: Alias 'num-cpu' property onTYPE_REALVIEW_MPCOREhw/cpu/arm: Declare CPU QOM types usingDEFINE_TYPES()macro
Applied to target-arm.next, thanks.
-- PMM