hw/sysbus: Add sysbus_init_irqs and reduce SYSBUS_DEVICE_GPIO_IRQ scope
Subsystems (6)
v2 cover hw/sysbus: Add sysbus_init_irqs and reduce SYSBUS_DEVICE_GPIO_IRQ scope
Since v1:
- Removed pointless QOM casts on a preliminary series [*] (Markus)
- Added Richard R-b tags
This series:
- Remove uses (out of sysbus.c) to the SYSBUS_DEVICE_GPIO_IRQ definition, using proper SysBus API methods,
- Reduce SYSBUS_DEVICE_GPIO_IRQ scope, making it SysBus API internal,
- Convert various for() loops iterating over sysbus_init_irq() by calling a single sysbus_init_irqs() instead. Mostly an automatic convertion except 4 files.
The resulting code looks nicer IMHO, and is possibly less bug prone.
Based-on: <[email protected]>
"bulk: Remove pointless QOM casts"
[*] https://lore.kernel.org/qemu-devel/[email protected]/
Philippe Mathieu-Daudé (7):
hw/arm/xlnx-versal: Do not open-code sysbus_connect_irq() hw/usb/xlnx: Do not open-code sysbus_pass_irq() hw/sysbus: Introduce sysbus_init_irqs() hw/usb/hcd-xhci: Use sysbus_init_irqs() hw/sysbus: Make SYSBUS_DEVICE_GPIO_IRQ API internal
hw: Simplify using sysbus_init_irqs() [automatic]
hw: Simplify using sysbus_init_irqs() [manual]
include/hw/sysbus.h | 3 +-- hw/arm/smmuv3.c | 6 +----- hw/arm/stellaris.c | 5 +---- hw/arm/strongarm.c | 5 +---- hw/arm/versatilepb.c | 5 +---- hw/arm/xlnx-versal.c | 4 +--- hw/char/pl011.c | 5 +---- hw/char/renesas_sci.c | 5 +---- hw/core/platform-bus.c | 5 +---- hw/core/sysbus.c | 9 ++++++++- hw/dma/pl330.c | 4 +--- hw/dma/sifive_pdma.c | 5 +---- hw/gpio/sifive_gpio.c | 5 +---- hw/i386/kvm/xen_evtchn.c | 5 +---- hw/intc/arm_gic_common.c | 20 +++++--------------- hw/intc/arm_gicv2m.c | 5 +---- hw/intc/exynos4210_combiner.c | 5 +---- hw/intc/loongarch_extioi.c | 7 ++----- hw/intc/loongson_liointc.c | 5 +---- hw/intc/omap_intc.c | 3 +-- hw/intc/openpic.c | 6 ++---- hw/intc/slavio_intctl.c | 6 ++---- hw/misc/avr_power.c | 4 +--- hw/misc/macio/gpio.c | 5 +---- hw/misc/stm32f4xx_exti.c | 5 +---- hw/net/cadence_gem.c | 5 +---- hw/net/mcf_fec.c | 5 +---- hw/pci-host/designware.c | 5 +---- hw/pci-host/gpex.c | 2 +- hw/pci-host/ppce500.c | 4 +--- hw/pci-host/raven.c | 4 +--- hw/pci-host/sh_pci.c | 5 +---- hw/pci-host/versatile.c | 4 +--- hw/ppc/ppc405_uc.c | 10 ++-------- hw/ppc/ppc440_uc.c | 6 ++---- hw/ppc/ppc4xx_devs.c | 4 +--- hw/ppc/ppc4xx_pci.c | 5 +---- hw/ssi/ibex_spi_host.c | 5 +---- hw/ssi/imx_spi.c | 5 +---- hw/ssi/sifive_spi.c | 5 +---- hw/ssi/xilinx_spi.c | 5 +---- hw/ssi/xilinx_spips.c | 4 +--- hw/ssi/xlnx-versal-ospi.c | 4 +--- hw/timer/allwinner-a10-pit.c | 4 +--- hw/timer/exynos4210_mct.c | 4 +--- hw/timer/hpet.c | 4 +--- hw/timer/renesas_cmt.c | 5 +---- hw/timer/renesas_tmr.c | 9 +++------ hw/timer/sifive_pwm.c | 5 +---- hw/usb/hcd-xhci-sysbus.c | 5 ++--- hw/usb/xlnx-usb-subsystem.c | 2 +- 51 files changed, 70 insertions(+), 197 deletions(-)
Signature · 1 line
2.38.1
PATCH v2 1/7 hw/arm/xlnx-versal: Do not open-code sysbus_connect_irq()
The SYSBUS_DEVICE_GPIO_IRQ definition should be internal to the SysBus API. Here we simply open-coded sysbus_connect_irq(). Replace to use the proper API.
--- hw/arm/xlnx-versal.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
hw/arm/xlnx-versal.c +1 -3
@@ -704,9 +704,7 @@ static void versal_unimp(Versal *s) gpio_in); gpio_in =qdev_get_gpio_in_named (DEVICE (s),"irq-parity-imr-dummy" ,0 ); -qdev_connect_gpio_out_named (DEVICE (&s->pmc.iou.slcr), -SYSBUS_DEVICE_GPIO_IRQ ,0 , - gpio_in); +sysbus_connect_irq (SYS_BUS_DEVICE (&s->pmc.iou.slcr),0 , gpio_in); }static void versal_realize (DeviceState *dev,Error **errp)
Signature · 1 line
2.38.1
PATCH v2 2/7 hw/usb/xlnx: Do not open-code sysbus_pass_irq()
In reply to Philippe Mathieu-DaudéThe SYSBUS_DEVICE_GPIO_IRQ definition should be internal to the SysBus API. Here we simply open-coded sysbus_pass_irq(). Replace to use the proper API.
--- hw/usb/xlnx-usb-subsystem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
hw/usb/xlnx-usb-subsystem.c +1 -1
@@ -49,7 +49,7 @@ static void versal_usb2_realize(DeviceState *dev, Error **errp) }sysbus_init_mmio (sbd, &s->dwc3_mr);sysbus_init_mmio (sbd, &s->usb2Ctrl_mr); -qdev_pass_gpios (DEVICE (&s->dwc3.sysbus_xhci), dev,SYSBUS_DEVICE_GPIO_IRQ ); +sysbus_pass_irq (sbd,SYS_BUS_DEVICE (&s->dwc3.sysbus_xhci)); }static void versal_usb2_init (Object *obj)
Signature · 1 line
2.38.1
PATCH v2 3/7 hw/sysbus: Introduce sysbus_init_irqs()
In reply to Philippe Mathieu-DaudéThe SysBus API currently only provides a method to initialize a single IRQ: sysbus_init_irq(). When we want to initialize multiple SysBus IRQs, we have to call this function multiple times. In order to allow further simplifications, introduce the sysbus_init_irqs() method.
--- include/hw/sysbus.h | 1 + hw/core/sysbus.c | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-)
include/hw/sysbus.h +1 -0
@@ -70,6 +70,7 @@ typedef void FindSysbusDeviceFunc(SysBusDevice *sbdev, void *opaque);void sysbus_init_mmio (SysBusDevice *dev,MemoryRegion *memory);MemoryRegion *sysbus_mmio_get_region (SysBusDevice *dev,int n);void sysbus_init_irq (SysBusDevice *dev,qemu_irq *p); +void sysbus_init_irqs (SysBusDevice *dev,qemu_irq *p,unsigned count);void sysbus_pass_irq (SysBusDevice *dev,SysBusDevice *target);void sysbus_init_ioports (SysBusDevice *dev,uint32_t ioport,uint32_t size);
hw/core/sysbus.c +6 -1
@@ -175,10 +175,15 @@ void sysbus_mmio_map_overlap(SysBusDevice *dev, int n, hwaddr addr,sysbus_mmio_map_common (dev, n, addr, true, priority); } +void sysbus_init_irqs (SysBusDevice *dev,qemu_irq *p,unsigned count) +{ +qdev_init_gpio_out_named (DEVICE (dev), p,SYSBUS_DEVICE_GPIO_IRQ , count); +} +/* Request an IRQ source. The actual IRQ object may be populated later. */ void sysbus_init_irq (SysBusDevice *dev,qemu_irq *p) { -qdev_init_gpio_out_named (DEVICE (dev), p,SYSBUS_DEVICE_GPIO_IRQ ,1 ); +sysbus_init_irqs (dev, p,1 ); }/* Pass IRQs from a target device. */
Signature · 1 line
2.38.1
PATCH v2 4/7 hw/usb/hcd-xhci: Use sysbus_init_irqs()
In reply to Philippe Mathieu-DaudéThe SYSBUS_DEVICE_GPIO_IRQ definition should be internal to the SysBus API. Use the recently introduced sysbus_init_irqs() method to avoid using this internal definition.
--- hw/usb/hcd-xhci-sysbus.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
hw/usb/hcd-xhci-sysbus.c +2 -3
@@ -40,9 +40,6 @@ static void xhci_sysbus_realize(DeviceState *dev, Error **errp)if (!qdev_realize (DEVICE (&s->xhci),NULL , errp)) {return ; } - s->irq =g_new0 (qemu_irq, s->xhci.numintrs); -qdev_init_gpio_out_named (dev, s->irq,SYSBUS_DEVICE_GPIO_IRQ , - s->xhci.numintrs);if (s->xhci.dma_mr) { s->xhci.as =g_malloc0 (sizeof (AddressSpace));address_space_init (s->xhci.as, s->xhci.dma_mr,NULL );
@@ -50,6 +47,8 @@ static void xhci_sysbus_realize(DeviceState *dev, Error **errp) s->xhci.as = &address_space_memory; } + s->irq =g_new0 (qemu_irq, s->xhci.numintrs); +sysbus_init_irqs (SYS_BUS_DEVICE (dev), s->irq, s->xhci.numintrs);sysbus_init_mmio (SYS_BUS_DEVICE (dev), &s->xhci.mem); }
Signature · 1 line
2.38.1
PATCH v2 5/7 hw/sysbus: Make SYSBUS_DEVICE_GPIO_IRQ API internal
In reply to Philippe Mathieu-DaudéSince we don't have any use of the SYSBUS_DEVICE_GPIO_IRQ definition outside of sysbus.c, we can reduce its scope, making it internal to the API.
--- include/hw/sysbus.h | 2 -- hw/core/sysbus.c | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-)
include/hw/sysbus.h +0 -2
@@ -26,8 +26,6 @@ OBJECT_DECLARE_TYPE(SysBusDevice, SysBusDeviceClass,* classes overriding it are not required to invoke its implementation. */ -#define SYSBUS_DEVICE_GPIO_IRQ "sysbus-irq" -struct SysBusDeviceClass {/*< private >*/ DeviceClass parent_class;
hw/core/sysbus.c +2 -0
@@ -24,6 +24,8 @@#include "monitor/monitor.h" #include "exec/address-spaces.h" +#define SYSBUS_DEVICE_GPIO_IRQ "sysbus-irq" +static void sysbus_dev_print (Monitor *mon,DeviceState *dev,int indent);static char *sysbus_get_fw_dev_path (DeviceState *dev);
Signature · 1 line
2.38.1
PATCH v2 6/7 hw: Simplify using sysbus_init_irqs() [automatic]
In reply to Philippe Mathieu-DaudéChange created mechanically using the following coccinelle semantic patch:
@@
expression array;
identifier i;
expression sbd, count;
@@
- for (i = 0; i < count; i++) {
- sysbus_init_irq(sbd, &array[i]);
- }
+ sysbus_init_irqs(sbd, array, count);--- hw/arm/smmuv3.c | 6 +----- hw/arm/stellaris.c | 5 +---- hw/arm/strongarm.c | 5 +---- hw/arm/versatilepb.c | 5 +---- hw/char/pl011.c | 5 +---- hw/char/renesas_sci.c | 5 +---- hw/core/platform-bus.c | 5 +---- hw/dma/pl330.c | 4 +--- hw/dma/sifive_pdma.c | 5 +---- hw/gpio/sifive_gpio.c | 5 +---- hw/i386/kvm/xen_evtchn.c | 5 +---- hw/intc/arm_gic_common.c | 20 +++++--------------- hw/intc/arm_gicv2m.c | 5 +---- hw/intc/exynos4210_combiner.c | 5 +---- hw/intc/loongarch_extioi.c | 7 ++----- hw/intc/loongson_liointc.c | 5 +---- hw/intc/openpic.c | 6 ++---- hw/intc/slavio_intctl.c | 6 ++---- hw/misc/avr_power.c | 4 +--- hw/misc/macio/gpio.c | 5 +---- hw/misc/stm32f4xx_exti.c | 5 +---- hw/net/cadence_gem.c | 5 +---- hw/net/mcf_fec.c | 5 +---- hw/pci-host/designware.c | 5 +---- hw/pci-host/ppce500.c | 4 +--- hw/pci-host/raven.c | 4 +--- hw/pci-host/sh_pci.c | 5 +---- hw/pci-host/versatile.c | 4 +--- hw/ppc/ppc405_uc.c | 10 ++-------- hw/ppc/ppc440_uc.c | 6 ++---- hw/ppc/ppc4xx_devs.c | 4 +--- hw/ppc/ppc4xx_pci.c | 5 +---- hw/ssi/ibex_spi_host.c | 5 +---- hw/ssi/imx_spi.c | 5 +---- hw/ssi/sifive_spi.c | 5 +---- hw/ssi/xilinx_spi.c | 5 +---- hw/ssi/xilinx_spips.c | 4 +--- hw/ssi/xlnx-versal-ospi.c | 4 +--- hw/timer/allwinner-a10-pit.c | 4 +--- hw/timer/exynos4210_mct.c | 4 +--- hw/timer/hpet.c | 4 +--- hw/timer/renesas_cmt.c | 5 +---- hw/timer/sifive_pwm.c | 5 +---- 43 files changed, 52 insertions(+), 178 deletions(-)
hw/arm/smmuv3.c +1 -5
@@ -1692,11 +1692,7 @@ static const MemoryRegionOps smmu_mem_ops = {static void smmu_init_irq (SMMUv3State *s,SysBusDevice *dev) { -int i; - -for (i =0 ; i <ARRAY_SIZE (s->irq); i++) { -sysbus_init_irq (dev, &s->irq[i]); - } +sysbus_init_irqs (dev, s->irq,ARRAY_SIZE (s->irq)); }static void smmu_reset_hold (Object *obj)
hw/arm/stellaris.c +1 -4
@@ -934,11 +934,8 @@ static void stellaris_adc_init(Object *obj)DeviceState *dev =DEVICE (obj);StellarisADCState *s =STELLARIS_ADC (obj);SysBusDevice *sbd =SYS_BUS_DEVICE (obj); -int n; -for (n =0 ; n <4 ; n++) { -sysbus_init_irq (sbd, &s->irq[n]); - } +sysbus_init_irqs (sbd, s->irq,4 );memory_region_init_io (&s->iomem, obj, &stellaris_adc_ops, s,"adc" ,0x1000 );
hw/arm/strongarm.c +1 -4
@@ -658,7 +658,6 @@ static void strongarm_gpio_initfn(Object *obj)DeviceState *dev =DEVICE (obj);StrongARMGPIOInfo *s =STRONGARM_GPIO (obj);SysBusDevice *sbd =SYS_BUS_DEVICE (obj); -int i;qdev_init_gpio_in (dev, strongarm_gpio_set,28 );qdev_init_gpio_out (dev, s->handler,28 );
@@ -667,9 +666,7 @@ static void strongarm_gpio_initfn(Object *obj) "gpio", 0x1000);sysbus_init_mmio (sbd, &s->iomem); -for (i =0 ; i <11 ; i++) { -sysbus_init_irq (sbd, &s->irqs[i]); - } +sysbus_init_irqs (sbd, s->irqs,11 );sysbus_init_irq (sbd, &s->irqX); }
hw/arm/versatilepb.c +1 -4
@@ -160,12 +160,9 @@ static void vpb_sic_init(Object *obj)DeviceState *dev =DEVICE (obj);vpb_sic_state *s =VERSATILE_PB_SIC (obj);SysBusDevice *sbd =SYS_BUS_DEVICE (obj); -int i;qdev_init_gpio_in (dev, vpb_sic_set_irq,32 ); -for (i =0 ; i <32 ; i++) { -sysbus_init_irq (sbd, &s->parent[i]); - } +sysbus_init_irqs (sbd, s->parent,32 ); s->irq =31 ;memory_region_init_io (&s->iomem, obj, &vpb_sic_ops, s,"vpb-sic" ,0x1000 );
hw/char/pl011.c +1 -4
@@ -442,13 +442,10 @@ static void pl011_init(Object *obj) {SysBusDevice *sbd =SYS_BUS_DEVICE (obj);PL011State *s =PL011 (obj); -int i;memory_region_init_io (&s->iomem,OBJECT (s), &pl011_ops, s,"pl011" ,0x1000 );sysbus_init_mmio (sbd, &s->iomem); -for (i =0 ; i <ARRAY_SIZE (s->irq); i++) { -sysbus_init_irq (sbd, &s->irq[i]); - } +sysbus_init_irqs (sbd, s->irq,ARRAY_SIZE (s->irq)); s->clk =qdev_init_clock_in (DEVICE (obj),"clk" , pl011_clock_update, s, ClockUpdate);
hw/char/renesas_sci.c +1 -4
@@ -286,15 +286,12 @@ static void rsci_init(Object *obj) {SysBusDevice *d =SYS_BUS_DEVICE (obj);RSCIState *sci =RSCI (obj); -int i;memory_region_init_io (&sci->memory,OBJECT (sci), &sci_ops, sci,"renesas-sci" ,0x8 );sysbus_init_mmio (d, &sci->memory); -for (i =0 ; i <SCI_NR_IRQ ; i++) { -sysbus_init_irq (d, &sci->irq[i]); - } +sysbus_init_irqs (d, sci->irq,SCI_NR_IRQ );timer_init_ns (&sci->timer,QEMU_CLOCK_VIRTUAL , txend, sci); }
hw/core/platform-bus.c +1 -4
@@ -182,7 +182,6 @@ static void platform_bus_realize(DeviceState *dev, Error **errp) {PlatformBusDevice *pbus;SysBusDevice *d; -int i; d =SYS_BUS_DEVICE (dev); pbus =PLATFORM_BUS_DEVICE (dev);
@@ -193,9 +192,7 @@ static void platform_bus_realize(DeviceState *dev, Error **errp) pbus->used_irqs =bitmap_new (pbus->num_irqs); pbus->irqs =g_new0 (qemu_irq, pbus->num_irqs); -for (i =0 ; i < pbus->num_irqs; i++) { -sysbus_init_irq (d, &pbus->irqs[i]); - } +sysbus_init_irqs (d, pbus->irqs, pbus->num_irqs);/* some devices might be initialized before so update used IRQs map */ plaform_bus_refresh_irqs (pbus);
hw/dma/pl330.c +1 -3
@@ -1620,9 +1620,7 @@ static void pl330_realize(DeviceState *dev, Error **errp) s->manager.is_manager = true; s->irq =g_new0 (qemu_irq, s->num_events); -for (i =0 ; i < s->num_events; i++) { -sysbus_init_irq (SYS_BUS_DEVICE (dev), &s->irq[i]); - } +sysbus_init_irqs (SYS_BUS_DEVICE (dev), s->irq, s->num_events);qdev_init_gpio_in (dev, pl330_dma_stop_irq,PL330_PERIPH_NUM );
hw/dma/sifive_pdma.c +1 -4
@@ -454,15 +454,12 @@ static const MemoryRegionOps sifive_pdma_ops = {static void sifive_pdma_realize (DeviceState *dev,Error **errp) {SiFivePDMAState *s =SIFIVE_PDMA (dev); -int i;memory_region_init_io (&s->iomem,OBJECT (dev), &sifive_pdma_ops, s,TYPE_SIFIVE_PDMA ,SIFIVE_PDMA_REG_SIZE );sysbus_init_mmio (SYS_BUS_DEVICE (dev), &s->iomem); -for (i =0 ; i <SIFIVE_PDMA_IRQS ; i++) { -sysbus_init_irq (SYS_BUS_DEVICE (dev), &s->irq[i]); - } +sysbus_init_irqs (SYS_BUS_DEVICE (dev), s->irq,SIFIVE_PDMA_IRQS ); }static void sifive_pdma_class_init (ObjectClass *klass,void *data)
hw/gpio/sifive_gpio.c +1 -4
@@ -362,10 +362,7 @@ static void sifive_gpio_realize(DeviceState *dev, Error **errp) TYPE_SIFIVE_GPIO, SIFIVE_GPIO_SIZE);sysbus_init_mmio (SYS_BUS_DEVICE (dev), &s->mmio); - -for (int i =0 ; i < s->ngpio; i++) { -sysbus_init_irq (SYS_BUS_DEVICE (dev), &s->irq[i]); - } +sysbus_init_irqs (SYS_BUS_DEVICE (dev), s->irq, s->ngpio);qdev_init_gpio_in (DEVICE (s), sifive_gpio_set, s->ngpio);qdev_init_gpio_out (DEVICE (s), s->output, s->ngpio);
hw/i386/kvm/xen_evtchn.c +1 -4
@@ -303,16 +303,13 @@ void xen_evtchn_create(void) {XenEvtchnState *s =XEN_EVTCHN (sysbus_create_simple (TYPE_XEN_EVTCHN ,-1 ,NULL )); -int i; xen_evtchn_singleton = s;qemu_mutex_init (&s->port_lock); s->gsi_bh =aio_bh_new (qemu_get_aio_context (), gsi_assert_bh, s); -for (i =0 ; i <IOAPIC_NUM_PINS ; i++) { -sysbus_init_irq (SYS_BUS_DEVICE (s), &s->gsis[i]); - } +sysbus_init_irqs (SYS_BUS_DEVICE (s), s->gsis,IOAPIC_NUM_PINS );/* * The Xen scheme for encoding PIRQ# into an MSI message is not
hw/intc/arm_gic_common.c +5 -15
@@ -143,22 +143,12 @@ void gic_init_irqs_and_mmio(GICState *s, qemu_irq_handler handler, i += (GIC_INTERNAL * s->num_cpu);qdev_init_gpio_in (DEVICE (s), handler, i); -for (i =0 ; i < s->num_cpu; i++) { -sysbus_init_irq (sbd, &s->parent_irq[i]); - } -for (i =0 ; i < s->num_cpu; i++) { -sysbus_init_irq (sbd, &s->parent_fiq[i]); - } -for (i =0 ; i < s->num_cpu; i++) { -sysbus_init_irq (sbd, &s->parent_virq[i]); - } -for (i =0 ; i < s->num_cpu; i++) { -sysbus_init_irq (sbd, &s->parent_vfiq[i]); - } +sysbus_init_irqs (sbd, s->parent_irq, s->num_cpu); +sysbus_init_irqs (sbd, s->parent_fiq, s->num_cpu); +sysbus_init_irqs (sbd, s->parent_virq, s->num_cpu); +sysbus_init_irqs (sbd, s->parent_vfiq, s->num_cpu);if (s->virt_extn) { -for (i =0 ; i < s->num_cpu; i++) { -sysbus_init_irq (sbd, &s->maintenance_irq[i]); - } +sysbus_init_irqs (sbd, s->maintenance_irq, s->num_cpu); }/* Distributor */
hw/intc/arm_gicv2m.c +1 -4
@@ -135,7 +135,6 @@ static const MemoryRegionOps gicv2m_ops = {static void gicv2m_realize (DeviceState *dev,Error **errp) {ARMGICv2mState *s =ARM_GICV2M (dev); -int i;if (s->num_spi >GICV2M_NUM_SPI_MAX ) { error_setg(errp,
@@ -151,9 +150,7 @@ static void gicv2m_realize(DeviceState *dev, Error **errp)return ; } -for (i =0 ; i < s->num_spi; i++) { -sysbus_init_irq (SYS_BUS_DEVICE (dev), &s->spi[i]); - } +sysbus_init_irqs (SYS_BUS_DEVICE (dev), s->spi, s->num_spi); msi_nonbroken = true; kvm_gsi_direct_mapping = true;
hw/intc/exynos4210_combiner.c +1 -4
@@ -309,16 +309,13 @@ static void exynos4210_combiner_init(Object *obj)DeviceState *dev =DEVICE (obj);Exynos4210CombinerState *s =EXYNOS4210_COMBINER (obj);SysBusDevice *sbd =SYS_BUS_DEVICE (obj); -unsigned int i;/* Allocate general purpose input signals and connect a handler to each of * them */ qdev_init_gpio_in (dev, exynos4210_combiner_handler,IIC_NIRQ );/* Connect SysBusDev irqs to device specific irqs */ -for (i =0 ; i <IIC_NGRP ; i++) { -sysbus_init_irq (sbd, &s->output_irq[i]); - } +sysbus_init_irqs (sbd, s->output_irq,IIC_NGRP );memory_region_init_io (&s->iomem, obj, &exynos4210_combiner_ops, s,"exynos4210-combiner" ,IIC_REGION_SIZE );
hw/intc/loongarch_extioi.c +2 -5
@@ -273,12 +273,9 @@ static void loongarch_extioi_instance_init(Object *obj) {SysBusDevice *dev =SYS_BUS_DEVICE (obj);LoongArchExtIOI *s =LOONGARCH_EXTIOI (obj); -int i, cpu, pin; - -for (i =0 ; i <EXTIOI_IRQS ; i++) { -sysbus_init_irq (dev, &s->irq[i]); - } +int cpu, pin; +sysbus_init_irqs (dev, s->irq,EXTIOI_IRQS );qdev_init_gpio_in (DEVICE (obj), extioi_setirq,EXTIOI_IRQS );for (cpu =0 ; cpu <EXTIOI_CPUS ; cpu++) {
hw/intc/loongson_liointc.c +1 -4
@@ -221,13 +221,10 @@ static void irq_handler(void *opaque, int irq, int level)static void loongson_liointc_init (Object *obj) {struct loongson_liointc *p =LOONGSON_LIOINTC (obj); -int i;qdev_init_gpio_in (DEVICE (obj), irq_handler,32 ); -for (i =0 ; i <NUM_PARENTS ; i++) { -sysbus_init_irq (SYS_BUS_DEVICE (obj), &p->parent_irq[i]); - } +sysbus_init_irqs (SYS_BUS_DEVICE (obj), p->parent_irq,NUM_PARENTS );memory_region_init_io (&p->mmio, obj, &pic_ops, p,TYPE_LOONGSON_LIOINTC ,R_END );
hw/intc/openpic.c +2 -4
@@ -1505,7 +1505,7 @@ static void openpic_realize(DeviceState *dev, Error **errp) {SysBusDevice *d =SYS_BUS_DEVICE (dev);OpenPICState *opp =OPENPIC (dev); -int i, j; +int i;int list_count =0 ;static const MemReg list_le[] = { {"glb" , &openpic_glb_ops_le,
@@ -1597,9 +1597,7 @@ static void openpic_realize(DeviceState *dev, Error **errp)for (i =0 ; i < opp->nb_cpus; i++) { opp->dst[i].irqs =g_new0 (qemu_irq,OPENPIC_OUTPUT_NB ); -for (j =0 ; j <OPENPIC_OUTPUT_NB ; j++) { -sysbus_init_irq (d, &opp->dst[i].irqs[j]); - } +sysbus_init_irqs (d, opp->dst[i].irqs,OPENPIC_OUTPUT_NB ); opp->dst[i].raised.queue_size =IRQQUEUE_SIZE_BITS ; opp->dst[i].raised.queue =bitmap_new (IRQQUEUE_SIZE_BITS );
hw/intc/slavio_intctl.c +2 -4
@@ -419,7 +419,7 @@ static void slavio_intctl_init(Object *obj)DeviceState *dev =DEVICE (obj);SLAVIO_INTCTLState *s =SLAVIO_INTCTL (obj);SysBusDevice *sbd =SYS_BUS_DEVICE (obj); -unsigned int i, j; +unsigned int i;char slave_name[45 ];qdev_init_gpio_in (dev, slavio_set_irq_all,32 +MAX_CPUS );
@@ -430,9 +430,7 @@ static void slavio_intctl_init(Object *obj)for (i =0 ; i <MAX_CPUS ; i++) {snprintf (slave_name,sizeof (slave_name),"slave-interrupt-controller-%i" , i); -for (j =0 ; j <MAX_PILS ; j++) { -sysbus_init_irq (sbd, &s->cpu_irqs[i][j]); - } +sysbus_init_irqs (sbd, s->cpu_irqs[i],MAX_PILS );memory_region_init_io (&s->slaves[i].iomem,OBJECT (s), &slavio_intctl_mem_ops, &s->slaves[i], slave_name,INTCTL_SIZE );
hw/misc/avr_power.c +1 -3
@@ -83,10 +83,8 @@ static void avr_mask_init(Object *dev)memory_region_init_io (&s->iomem, dev, &avr_mask_ops, s,TYPE_AVR_MASK ,0x01 );sysbus_init_mmio (busdev, &s->iomem); +sysbus_init_irqs (busdev, s->irq,8 ); -for (int i =0 ; i <8 ; i++) { -sysbus_init_irq (busdev, &s->irq[i]); - } s->val =0x00 ; }
hw/misc/macio/gpio.c +1 -4
@@ -153,11 +153,8 @@ static void macio_gpio_init(Object *obj) {SysBusDevice *sbd =SYS_BUS_DEVICE (obj);MacIOGPIOState *s =MACIO_GPIO (obj); -int i; -for (i =0 ; i <10 ; i++) { -sysbus_init_irq (sbd, &s->gpio_extirqs[i]); - } +sysbus_init_irqs (sbd, s->gpio_extirqs,10 );memory_region_init_io (&s->gpiomem,OBJECT (s), &macio_gpio_ops, obj,"gpio" ,0x30 );
hw/misc/stm32f4xx_exti.c +1 -4
@@ -135,11 +135,8 @@ static const MemoryRegionOps stm32f4xx_exti_ops = {static void stm32f4xx_exti_init (Object *obj) {STM32F4xxExtiState *s =STM32F4XX_EXTI (obj); -int i; -for (i =0 ; i <NUM_INTERRUPT_OUT_LINES ; i++) { -sysbus_init_irq (SYS_BUS_DEVICE (obj), &s->irq[i]); - } +sysbus_init_irqs (SYS_BUS_DEVICE (obj), s->irq,NUM_INTERRUPT_OUT_LINES );memory_region_init_io (&s->mmio, obj, &stm32f4xx_exti_ops, s,TYPE_STM32F4XX_EXTI ,0x400 );
hw/net/cadence_gem.c +1 -4
@@ -1606,7 +1606,6 @@ static NetClientInfo net_gem_info = {static void gem_realize (DeviceState *dev,Error **errp) {CadenceGEMState *s =CADENCE_GEM (dev); -int i;address_space_init (&s->dma_as, s->dma_mr ? s->dma_mr :get_system_memory (),"dma" );
@@ -1626,9 +1625,7 @@ static void gem_realize(DeviceState *dev, Error **errp)return ; } -for (i =0 ; i < s->num_priority_queues; ++i) { -sysbus_init_irq (SYS_BUS_DEVICE (dev), &s->irq[i]); - } +sysbus_init_irqs (SYS_BUS_DEVICE (dev), s->irq, s->num_priority_queues);qemu_macaddr_default_if_unset (&s->conf.macaddr);
hw/net/mcf_fec.c +1 -4
@@ -651,13 +651,10 @@ static void mcf_fec_instance_init(Object *obj) {SysBusDevice *sbd =SYS_BUS_DEVICE (obj);mcf_fec_state *s =MCF_FEC_NET (obj); -int i;memory_region_init_io (&s->iomem, obj, &mcf_fec_ops, s,"fec" ,0x400 );sysbus_init_mmio (sbd, &s->iomem); -for (i =0 ; i <FEC_NUM_IRQ ; i++) { -sysbus_init_irq (sbd, &s->irq[i]); - } +sysbus_init_irqs (sbd, s->irq,FEC_NUM_IRQ ); }static Property mcf_fec_properties[] = {
hw/pci-host/designware.c +1 -4
@@ -668,11 +668,8 @@ static void designware_pcie_host_realize(DeviceState *dev, Error **errp)PCIHostState *pci =PCI_HOST_BRIDGE (dev);DesignwarePCIEHost *s =DESIGNWARE_PCIE_HOST (dev);SysBusDevice *sbd =SYS_BUS_DEVICE (dev); -size_t i; -for (i =0 ; i <ARRAY_SIZE (s->pci.irqs); i++) { -sysbus_init_irq (sbd, &s->pci.irqs[i]); - } +sysbus_init_irqs (sbd, s->pci.irqs,ARRAY_SIZE (s->pci.irqs)); memory_region_init_io(&s->mmio, OBJECT(s),
hw/pci-host/ppce500.c +1 -3
@@ -446,9 +446,7 @@ static void e500_pcihost_realize(DeviceState *dev, Error **errp) h =PCI_HOST_BRIDGE (dev); s =PPC_E500_PCI_HOST_BRIDGE (dev); -for (i =0 ; i <ARRAY_SIZE (s->irq); i++) { -sysbus_init_irq (sbd, &s->irq[i]); - } +sysbus_init_irqs (sbd, s->irq,ARRAY_SIZE (s->irq));for (i =0 ; i <PCI_NUM_PINS ; i++) { s->irq_num[i] = s->first_pin_irq + i;
hw/pci-host/raven.c +1 -3
@@ -239,9 +239,7 @@ static void raven_pcihost_realizefn(DeviceState *d, Error **errp)int i;if (s->is_legacy_prep) { -for (i =0 ; i <PCI_NUM_PINS ; i++) { -sysbus_init_irq (dev, &s->pci_irqs[i]); - } +sysbus_init_irqs (dev, s->pci_irqs,PCI_NUM_PINS ); }else {/* According to PReP specification section 6.1.6 "System Interrupt * Assignments", all PCI interrupts are routed via IRQ 15 */
hw/pci-host/sh_pci.c +1 -4
@@ -121,11 +121,8 @@ static void sh_pci_device_realize(DeviceState *dev, Error **errp)SysBusDevice *sbd =SYS_BUS_DEVICE (dev);SHPCIState *s =SH_PCI_HOST_BRIDGE (dev);PCIHostState *phb =PCI_HOST_BRIDGE (s); -int i; -for (i =0 ; i <4 ; i++) { -sysbus_init_irq (sbd, &s->irq[i]); - } +sysbus_init_irqs (sbd, s->irq,4 ); phb->bus = pci_register_root_bus(dev, "pci", sh_pci_set_irq, sh_pci_map_irq, s->irq,
hw/pci-host/versatile.c +1 -3
@@ -412,9 +412,7 @@ static void pci_vpb_realize(DeviceState *dev, Error **errp)object_initialize (&s->pci_dev,sizeof (s->pci_dev),TYPE_VERSATILE_PCI_HOST ); -for (i =0 ; i <4 ; i++) { -sysbus_init_irq (sbd, &s->irq[i]); - } +sysbus_init_irqs (sbd, s->irq,4 );if (s->realview) { mapfn = pci_vpb_rv_map_irq;
hw/ppc/ppc405_uc.c +2 -8
@@ -265,11 +265,8 @@ static void ppc405_dma_realize(DeviceState *dev, Error **errp) {Ppc405DmaState *dma =PPC405_DMA (dev);Ppc4xxDcrDeviceState *dcr =PPC4xx_DCR_DEVICE (dev); -int i; -for (i =0 ; i <ARRAY_SIZE (dma->irqs); i++) { -sysbus_init_irq (SYS_BUS_DEVICE (dma), &dma->irqs[i]); - } +sysbus_init_irqs (SYS_BUS_DEVICE (dma), dma->irqs,ARRAY_SIZE (dma->irqs));ppc4xx_dcr_register (dcr,DMA0_CR0 , dma, &dcr_read_dma, &dcr_write_dma);ppc4xx_dcr_register (dcr,DMA0_CT0 , dma, &dcr_read_dma, &dcr_write_dma);
@@ -702,15 +699,12 @@ static void ppc405_gpt_realize(DeviceState *dev, Error **errp) {Ppc405GptState *s =PPC405_GPT (dev);SysBusDevice *sbd =SYS_BUS_DEVICE (dev); -int i; s->timer =timer_new_ns (QEMU_CLOCK_VIRTUAL , &ppc4xx_gpt_cb, s);memory_region_init_io (&s->iomem,OBJECT (s), &gpt_ops, s,"gpt" ,0xd4 );sysbus_init_mmio (sbd, &s->iomem); -for (i =0 ; i <ARRAY_SIZE (s->irqs); i++) { -sysbus_init_irq (sbd, &s->irqs[i]); - } +sysbus_init_irqs (sbd, s->irqs,ARRAY_SIZE (s->irqs)); }static void ppc405_gpt_finalize (Object *obj)
hw/ppc/ppc440_uc.c +2 -4
@@ -1004,7 +1004,7 @@ static void ppc460ex_pcie_realize(DeviceState *dev, Error **errp) {PPC460EXPCIEState *s =PPC460EX_PCIE_HOST (dev);PCIHostState *pci =PCI_HOST_BRIDGE (dev); -int i, id; +int id;char buf[16 ];switch (s->dcrn_base) {
@@ -1020,9 +1020,7 @@ static void ppc460ex_pcie_realize(DeviceState *dev, Error **errp) }snprintf (buf,sizeof (buf),"pcie%d-io" , id);memory_region_init (&s->iomem,OBJECT (s), buf,UINT64_MAX ); -for (i =0 ; i <4 ; i++) { -sysbus_init_irq (SYS_BUS_DEVICE (dev), &s->irq[i]); - } +sysbus_init_irqs (SYS_BUS_DEVICE (dev), s->irq,4 );snprintf (buf,sizeof (buf),"pcie.%d" , id); pci->bus = pci_register_root_bus(DEVICE(s), buf, ppc460ex_set_irq, pci_swizzle_map_irq_fn, s, &s->iomem,
hw/ppc/ppc4xx_devs.c +1 -3
@@ -193,9 +193,7 @@ static void ppc4xx_mal_realize(DeviceState *dev, Error **errp) mal->rxctpr =g_new0 (uint32_t, mal->rxcnum); mal->rcbs =g_new0 (uint32_t, mal->rxcnum); -for (i =0 ; i <ARRAY_SIZE (mal->irqs); i++) { -sysbus_init_irq (SYS_BUS_DEVICE (dev), &mal->irqs[i]); - } +sysbus_init_irqs (SYS_BUS_DEVICE (dev), mal->irqs,ARRAY_SIZE (mal->irqs));ppc4xx_dcr_register (dcr,MAL0_CFG , mal, &dcr_read_mal, &dcr_write_mal);ppc4xx_dcr_register (dcr,MAL0_ESR , mal, &dcr_read_mal, &dcr_write_mal);
hw/ppc/ppc4xx_pci.c +1 -4
@@ -318,14 +318,11 @@ static void ppc4xx_pcihost_realize(DeviceState *dev, Error **errp)PPC4xxPCIState *s;PCIHostState *h;PCIBus *b; -int i; h =PCI_HOST_BRIDGE (dev); s =PPC4xx_PCI_HOST_BRIDGE (dev); -for (i =0 ; i <ARRAY_SIZE (s->irq); i++) { -sysbus_init_irq (sbd, &s->irq[i]); - } +sysbus_init_irqs (sbd, s->irq,ARRAY_SIZE (s->irq)); b = pci_register_root_bus(dev, NULL, ppc4xx_pci_set_irq, ppc4xx_pci_map_irq, s->irq, get_system_memory(),
hw/ssi/ibex_spi_host.c +1 -4
@@ -589,14 +589,11 @@ static void fifo_trigger_update(void *opaque)static void ibex_spi_host_realize (DeviceState *dev,Error **errp) {IbexSPIHostState *s =IBEX_SPI_HOST (dev); -int i; s->ssi =ssi_create_bus (dev,"ssi" ); s->cs_lines =g_new0 (qemu_irq, s->num_cs); -for (i =0 ; i < s->num_cs; ++i) { -sysbus_init_irq (SYS_BUS_DEVICE (dev), &s->cs_lines[i]); - } +sysbus_init_irqs (SYS_BUS_DEVICE (dev), s->cs_lines, s->num_cs);/* Setup CONFIGOPTS Multi-register */ s->config_opts =g_new0 (uint32_t, s->num_cs);
hw/ssi/imx_spi.c +1 -4
@@ -458,7 +458,6 @@ static const struct MemoryRegionOps imx_spi_ops = {static void imx_spi_realize (DeviceState *dev,Error **errp) {IMXSPIState *s =IMX_SPI (dev); -int i; s->bus =ssi_create_bus (dev,"spi" );
@@ -467,9 +466,7 @@ static void imx_spi_realize(DeviceState *dev, Error **errp)sysbus_init_mmio (SYS_BUS_DEVICE (dev), &s->iomem);sysbus_init_irq (SYS_BUS_DEVICE (dev), &s->irq); -for (i =0 ; i <ECSPI_NUM_CS ; ++i) { -sysbus_init_irq (SYS_BUS_DEVICE (dev), &s->cs_lines[i]); - } +sysbus_init_irqs (SYS_BUS_DEVICE (dev), s->cs_lines,ECSPI_NUM_CS );fifo32_create (&s->tx_fifo,ECSPI_FIFO_SIZE );fifo32_create (&s->rx_fifo,ECSPI_FIFO_SIZE );
hw/ssi/sifive_spi.c +1 -4
@@ -310,15 +310,12 @@ static void sifive_spi_realize(DeviceState *dev, Error **errp) {SysBusDevice *sbd =SYS_BUS_DEVICE (dev);SiFiveSPIState *s =SIFIVE_SPI (dev); -int i; s->spi =ssi_create_bus (dev,"spi" );sysbus_init_irq (sbd, &s->irq); s->cs_lines =g_new0 (qemu_irq, s->num_cs); -for (i =0 ; i < s->num_cs; i++) { -sysbus_init_irq (sbd, &s->cs_lines[i]); - } +sysbus_init_irqs (sbd, s->cs_lines, s->num_cs);memory_region_init_io (&s->mmio,OBJECT (s), &sifive_spi_ops, s,TYPE_SIFIVE_SPI ,0x1000 );
hw/ssi/xilinx_spi.c +1 -4
@@ -327,7 +327,6 @@ static void xilinx_spi_realize(DeviceState *dev, Error **errp) {SysBusDevice *sbd =SYS_BUS_DEVICE (dev);XilinxSPI *s =XILINX_SPI (dev); -int i;DB_PRINT ("\n" );
@@ -335,9 +334,7 @@ static void xilinx_spi_realize(DeviceState *dev, Error **errp)sysbus_init_irq (sbd, &s->irq); s->cs_lines =g_new0 (qemu_irq, s->num_cs); -for (i =0 ; i < s->num_cs; ++i) { -sysbus_init_irq (sbd, &s->cs_lines[i]); - } +sysbus_init_irqs (sbd, s->cs_lines, s->num_cs);memory_region_init_io (&s->mmio,OBJECT (s), &spi_ops, s,"xilinx-spi" ,R_MAX *4 );
hw/ssi/xilinx_spips.c +1 -3
@@ -1294,9 +1294,7 @@ static void xilinx_spips_realize(DeviceState *dev, Error **errp) s->cs_lines_state =g_new0 (bool, s->num_cs * s->num_busses);sysbus_init_irq (sbd, &s->irq); -for (i =0 ; i < s->num_cs * s->num_busses; ++i) { -sysbus_init_irq (sbd, &s->cs_lines[i]); - } +sysbus_init_irqs (sbd, s->cs_lines, s->num_cs * s->num_busses);memory_region_init_io (&s->iomem,OBJECT (s), xsc->reg_ops, s,"spi" ,XLNX_ZYNQMP_SPIPS_R_MAX *4 );
hw/ssi/xlnx-versal-ospi.c +1 -3
@@ -1740,9 +1740,7 @@ static void xlnx_versal_ospi_realize(DeviceState *dev, Error **errp) s->num_cs =4 ; s->spi =ssi_create_bus (dev,"spi0" ); s->cs_lines =g_new0 (qemu_irq, s->num_cs); -for (int i =0 ; i < s->num_cs; ++i) { -sysbus_init_irq (sbd, &s->cs_lines[i]); - } +sysbus_init_irqs (sbd, s->cs_lines, s->num_cs);fifo8_create (&s->rx_fifo,RXFF_SZ );fifo8_create (&s->tx_fifo,TXFF_SZ );
hw/timer/allwinner-a10-pit.c +1 -3
@@ -263,9 +263,7 @@ static void a10_pit_init(Object *obj)SysBusDevice *sbd =SYS_BUS_DEVICE (obj);uint8_t i; -for (i =0 ; i <AW_A10_PIT_TIMER_NR ; i++) { -sysbus_init_irq (sbd, &s->irq[i]); - } +sysbus_init_irqs (sbd, s->irq,AW_A10_PIT_TIMER_NR );memory_region_init_io (&s->iomem,OBJECT (s), &a10_pit_ops, s,TYPE_AW_A10_PIT ,0x400 );sysbus_init_mmio (sbd, &s->iomem);
hw/timer/exynos4210_mct.c +1 -3
@@ -1521,9 +1521,7 @@ static void exynos4210_mct_init(Object *obj) }/* IRQs */ -for (i =0 ; i <MCT_GT_CMP_NUM ; i++) { -sysbus_init_irq (dev, &s->g_timer.irq[i]); - } +sysbus_init_irqs (dev, s->g_timer.irq,MCT_GT_CMP_NUM );for (i =0 ; i <2 ; i++) {sysbus_init_irq (dev, &s->l_timer[i].irq); }
hw/timer/hpet.c +1 -3
@@ -756,9 +756,7 @@ static void hpet_realize(DeviceState *dev, Error **errp) s->hpet_id = hpet_cfg.count++; -for (i =0 ; i <HPET_NUM_IRQ_ROUTES ; i++) { -sysbus_init_irq (sbd, &s->irqs[i]); - } +sysbus_init_irqs (sbd, s->irqs,HPET_NUM_IRQ_ROUTES );if (s->num_timers <HPET_MIN_TIMERS ) { s->num_timers =HPET_MIN_TIMERS ;
hw/timer/renesas_cmt.c +1 -4
@@ -225,15 +225,12 @@ static void rcmt_init(Object *obj) {SysBusDevice *d =SYS_BUS_DEVICE (obj);RCMTState *cmt =RCMT (obj); -int i;memory_region_init_io (&cmt->memory,OBJECT (cmt), &cmt_ops, cmt,"renesas-cmt" ,0x10 );sysbus_init_mmio (d, &cmt->memory); -for (i =0 ; i <ARRAY_SIZE (cmt->cmi); i++) { -sysbus_init_irq (d, &cmt->cmi[i]); - } +sysbus_init_irqs (d, cmt->cmi,ARRAY_SIZE (cmt->cmi));timer_init_ns (&cmt->timer[0 ],QEMU_CLOCK_VIRTUAL , timer_event0, cmt);timer_init_ns (&cmt->timer[1 ],QEMU_CLOCK_VIRTUAL , timer_event1, cmt); }
hw/timer/sifive_pwm.c +1 -4
@@ -414,11 +414,8 @@ static Property sifive_pwm_properties[] = {static void sifive_pwm_init (Object *obj) {SiFivePwmState *s =SIFIVE_PWM (obj); -int i; -for (i =0 ; i <SIFIVE_PWM_IRQS ; i++) { -sysbus_init_irq (SYS_BUS_DEVICE (obj), &s->irqs[i]); - } +sysbus_init_irqs (SYS_BUS_DEVICE (obj), s->irqs,SIFIVE_PWM_IRQS );memory_region_init_io (&s->mmio, obj, &sifive_pwm_ops, s,TYPE_SIFIVE_PWM ,0x100 );
Signature · 1 line
2.38.1
PATCH v2 7/7 hw: Simplify using sysbus_init_irqs() [manual]
In reply to Philippe Mathieu-DaudéAudit the sysbus_init_irq() calls and manually convert to sysbus_init_irqs() when a loop is involved.
In omap2_intc_init(), the parent_intr[] array contains 2 elements: use ARRAY_SIZE() to iterate over.
--- hw/intc/omap_intc.c | 3 +-- hw/pci-host/gpex.c | 2 +- hw/timer/renesas_tmr.c | 9 +++------ 3 files changed, 5 insertions(+), 9 deletions(-)
hw/intc/omap_intc.c +1 -2
@@ -627,8 +627,7 @@ static void omap2_intc_init(Object *obj) s->level_only =1 ; s->nbanks =3 ; -sysbus_init_irq (sbd, &s->parent_intr[0 ]); -sysbus_init_irq (sbd, &s->parent_intr[1 ]); +sysbus_init_irqs (sbd, s->parent_intr,ARRAY_SIZE (s->parent_intr));qdev_init_gpio_in (dev, omap_set_intr_noedge, s->nbanks *32 );memory_region_init_io (&s->mmio, obj, &omap2_inth_mem_ops, s,"omap2-intc" ,0x1000 );
hw/pci-host/gpex.c +1 -1
@@ -128,8 +128,8 @@ static void gpex_host_realize(DeviceState *dev, Error **errp)sysbus_init_mmio (sbd, &s->io_ioport); } +sysbus_init_irqs (sbd, s->irq,GPEX_NUM_IRQS );for (i =0 ; i <GPEX_NUM_IRQS ; i++) { -sysbus_init_irq (sbd, &s->irq[i]); s->irq_num[i] =-1 ; }
hw/timer/renesas_tmr.c +3 -6
@@ -428,17 +428,14 @@ static void rtmr_init(Object *obj) {SysBusDevice *d =SYS_BUS_DEVICE (obj);RTMRState *tmr =RTMR (obj); -int i;memory_region_init_io (&tmr->memory,OBJECT (tmr), &tmr_ops, tmr,"renesas-tmr" ,0x10 );sysbus_init_mmio (d, &tmr->memory); -for (i =0 ; i <ARRAY_SIZE (tmr->ovi); i++) { -sysbus_init_irq (d, &tmr->cmia[i]); -sysbus_init_irq (d, &tmr->cmib[i]); -sysbus_init_irq (d, &tmr->ovi[i]); - } +sysbus_init_irqs (d, tmr->cmia,ARRAY_SIZE (tmr->cmia)); +sysbus_init_irqs (d, tmr->cmib,ARRAY_SIZE (tmr->cmib)); +sysbus_init_irqs (d, tmr->ovi,ARRAY_SIZE (tmr->ovi));timer_init_ns (&tmr->timer[0 ],QEMU_CLOCK_VIRTUAL , timer_event0, tmr);timer_init_ns (&tmr->timer[1 ],QEMU_CLOCK_VIRTUAL , timer_event1, tmr); }
Signature · 1 line
2.38.1
Re: [PATCH v2 7/7] hw: Simplify using sysbus_init_irqs() [manual]
Quoted 22 lines · Philippe Mathieu-Daudé
Audit the
sysbus_init_irq()calls and manually convert tosysbus_init_irqs()when a loop is involved.In
omap2_intc_init(), the parent_intr[] array contains 2 elements: useARRAY_SIZE()to iterate over.Reviewed-by Richard Henderson <[email protected]>Signed-off-by Philippe Mathieu-Daudé <[email protected]>hw/timer/renesas_tmr.c +0
-1@@ -428,17 +428,14 @@ static void rtmr_init(Object *obj) {SysBusDevice *d =SYS_BUS_DEVICE (obj);RTMRState *tmr =RTMR (obj); -int i;memory_region_init_io (&tmr->memory,OBJECT (tmr), &tmr_ops, tmr,"renesas-tmr" ,0x10 );
hw/timer/renesas_tmr.c static void rtmr_init(Object *obj) · line 438
Quoted 10 lines
hw/timer/renesas_tmr.c +3
-5sysbus_init_mmio (d, &tmr->memory); -for (i =0 ; i <ARRAY_SIZE (tmr->ovi); i++) { -sysbus_init_irq (d, &tmr->cmia[i]); -sysbus_init_irq (d, &tmr->cmib[i]); -sysbus_init_irq (d, &tmr->ovi[i]); - } +sysbus_init_irqs (d, tmr->cmia,ARRAY_SIZE (tmr->cmia)); +sysbus_init_irqs (d, tmr->cmib,ARRAY_SIZE (tmr->cmib)); +sysbus_init_irqs (d, tmr->ovi,ARRAY_SIZE (tmr->ovi));
Doesn't this change the order of the IRQs? Previously we had channel 0 CMIA, channel 0 CMIA, channel 0 OVI, channel 1 CMIA, channel 1 CMIB, channel 1 OVI. Now we have channel 0 CMIA, channel 1 CMIA, channel 0 CMIB, channel 1 CMIB, channel 0 OVI, channel 1 OVI. So they'll get miswired in the board code now...
thanks
-- PMM
Re: [PATCH v2 7/7] hw: Simplify using sysbus_init_irqs() [manual]
Quoted 25 lines · Peter Maydell
Quoted 24 lines · Philippe Mathieu-Daudé
Audit the
sysbus_init_irq()calls and manually convert tosysbus_init_irqs()when a loop is involved.In
omap2_intc_init(), the parent_intr[] array contains 2 elements: useARRAY_SIZE()to iterate over.Reviewed-by Richard Henderson <[email protected]>Signed-off-by Philippe Mathieu-Daudé <[email protected]>hw/timer/renesas_tmr.c +0
-1@@ -428,17 +428,14 @@ static void rtmr_init(Object *obj) {SysBusDevice *d =SYS_BUS_DEVICE (obj);RTMRState *tmr =RTMR (obj); -int i;memory_region_init_io (&tmr->memory,OBJECT (tmr), &tmr_ops, tmr,"renesas-tmr" ,0x10 );sysbus_init_mmio (d, &tmr->memory);
Quoted 15 lines
hw/timer/renesas_tmr.c static void rtmr_init(Object *obj) · line 438
Quoted 8 lines
hw/timer/renesas_tmr.c +3
-5-for (i =0 ; i <ARRAY_SIZE (tmr->ovi); i++) { -sysbus_init_irq (d, &tmr->cmia[i]); -sysbus_init_irq (d, &tmr->cmib[i]); -sysbus_init_irq (d, &tmr->ovi[i]); - } +sysbus_init_irqs (d, tmr->cmia,ARRAY_SIZE (tmr->cmia)); +sysbus_init_irqs (d, tmr->cmib,ARRAY_SIZE (tmr->cmib)); +sysbus_init_irqs (d, tmr->ovi,ARRAY_SIZE (tmr->ovi));Doesn't this change the order of the IRQs? Previously we had channel 0 CMIA, channel 0 CMIA, channel 0 OVI, channel 1 CMIA, channel 1 CMIB, channel 1 OVI. Now we have channel 0 CMIA, channel 1 CMIA, channel 0 CMIB, channel 1 CMIB, channel 0 OVI, channel 1 OVI. So they'll get miswired in the board code now...
Oops, good catch. Good case to show the sysbus_init_irq() is fragile. At least named_gpio are clearer.
I'm surprised because v1 series passed CI, but looking closer the RX tests isn't run. And now I see commit e5d402b28f ("tests/acceptance: disable machine_rx_gdbsim on GitLab").
"Hopefully we can re-enable both
once the serial timing patches have been added."
Alex, are these patches in the tree now?