hw/ipack: Minor dust removal
v2 cover hw/ipack: Minor dust removal
Clarify what is what in Kconfig,
replace qemu_allocate_irqs() by qemu_init_irq().
Since v1:
- s/qemu_irq/IRQState/ in IPackDevice state
Philippe Mathieu-Daudé (2):
hw/ipack: Clarify KConfig symbols hw/ipack: Remove legacy qemu_allocate_irqs() use
include/hw/ipack/ipack.h | 7 ++----- hw/char/ipoctal232.c | 4 ++-- hw/ipack/ipack.c | 7 +++---- hw/ipack/tpci200.c | 6 +++--- hw/char/Kconfig | 5 +++++ hw/char/meson.build | 2 +- hw/ipack/Kconfig | 4 ++++ hw/ipack/meson.build | 3 ++- tests/qtest/libqos/meson.build | 4 +++- tests/qtest/meson.build | 4 +++- 10 files changed, 28 insertions(+), 18 deletions(-)
Signature · 1 line
2.47.1
PATCH v2 1/2 hw/ipack: Clarify KConfig symbols
Split IPACK Kconfig key as {IPACK, TPCI200, IP_OCTAL_232}
- IPack is a bus
- TPCI200 is a PCI device providing an IPack bus
- IP-Octal232 is an IPack device plugged on an IPack bus
--- hw/char/Kconfig | 5 +++++ hw/char/meson.build | 2 +- hw/ipack/Kconfig | 4 ++++ hw/ipack/meson.build | 3 ++- tests/qtest/libqos/meson.build | 4 +++- tests/qtest/meson.build | 4 +++- 6 files changed, 18 insertions(+), 4 deletions(-)
hw/char/Kconfig +5 -0
@@ -78,3 +78,8 @@ config GOLDFISH_TTY config SHAKTI_UART bool + +config IP_OCTAL_232 + bool + default y + depends on IPACK
hw/char/meson.build +1 -1
@@ -4,7 +4,7 @@ system_ss.add(when: 'CONFIG_ESCC', if_true: files('escc.c')) system_ss.add(when: 'CONFIG_GRLIB', if_true: files('grlib_apbuart.c')) system_ss.add(when: 'CONFIG_IBEX', if_true: files('ibex_uart.c')) system_ss.add(when: 'CONFIG_IMX', if_true: files('imx_serial.c')) -system_ss.add(when: 'CONFIG_IPACK', if_true: files('ipoctal232.c')) +system_ss.add(when: 'CONFIG_IP_OCTAL_232', if_true: files('ipoctal232.c')) system_ss.add(when: 'CONFIG_ISA_BUS', if_true: files('parallel-isa.c')) system_ss.add(when: 'CONFIG_ISA_DEBUG', if_true: files('debugcon.c')) system_ss.add(when: 'CONFIG_NRF51_SOC', if_true: files('nrf51_uart.c'))
hw/ipack/Kconfig +4 -0
@@ -1,4 +1,8 @@ config IPACK bool + +config TPCI200 + bool + select IPACK default y if PCI_DEVICES depends on PCI
hw/ipack/meson.build +2 -1
@@ -1 +1,2 @@ -system_ss.add(when: 'CONFIG_IPACK', if_true: files('ipack.c', 'tpci200.c')) +system_ss.add(when: 'CONFIG_IPACK', if_true: files('ipack.c')) +system_ss.add(when: 'CONFIG_TPCI200', if_true: files('tpci200.c'))
tests/qtest/libqos/meson.build +3 -1
@@ -32,7 +32,6 @@ libqos_srcs = files( 'i2c-omap.c', 'igb.c', 'sdhci.c', - 'tpci200.c', 'virtio.c', 'virtio-balloon.c', 'virtio-blk.c',
@@ -70,6 +69,9 @@ endif if config_all_devices.has_key('CONFIG_RISCV_IOMMU') libqos_srcs += files('riscv-iommu.c') endif +if config_all_devices.has_key('CONFIG_TPCI200') + libqos_srcs += files('tpci200.c') +endif libqos = static_library('qos', libqos_srcs + genh, build_by_default: false)
tests/qtest/meson.build +3 -1
@@ -286,7 +286,6 @@ qos_test_ss.add( 'e1000-test.c', 'eepro100-test.c', 'es1370-test.c', - 'ipoctal232-test.c', 'lsm303dlhc-mag-test.c', 'isl_pmbus_vr-test.c', 'max34451-test.c',
@@ -317,6 +316,9 @@ qos_test_ss.add( if config_all_devices.has_key('CONFIG_VIRTIO_SERIAL') qos_test_ss.add(files('virtio-serial-test.c')) endif +if config_all_devices.has_key('CONFIG_IP_OCTAL_232') + qos_test_ss.add(files('ipoctal232-test.c')) +endif if host_os != 'windows' qos_test_ss.add(files('e1000e-test.c'))
Signature · 1 line
2.47.1
PATCH v2 2/2 hw/ipack: Remove legacy qemu_allocate_irqs() use
In reply to Philippe Mathieu-DaudéNo need to dynamically allocate IRQ when we know before hands how many we'll use. Declare the 2 of them in IPackDevice state and initialize them in the DeviceRealize handler.
--- include/hw/ipack/ipack.h | 7 ++----- hw/char/ipoctal232.c | 4 ++-- hw/ipack/ipack.c | 7 +++---- hw/ipack/tpci200.c | 6 +++--- 4 files changed, 10 insertions(+), 14 deletions(-)
include/hw/ipack/ipack.h +2 -5
@@ -12,6 +12,7 @@#define QEMU_IPACK_H #include "hw/qdev-core.h" +#include "hw/irq.h" #include "qom/object.h"
@@ -19,10 +20,8 @@ OBJECT_DECLARE_SIMPLE_TYPE(IPackBus, IPACK_BUS)struct IPackBus { -/*< private >*/ BusState parent_obj; -/* All fields are private */ uint8_t n_slots;uint8_t free_slot;qemu_irq_handler set_irq;
@@ -58,13 +57,11 @@ struct IPackDeviceClass { };struct IPackDevice { -/*< private >*/ DeviceState parent_obj; -/*< public >*/ int32_t slot;/* IRQ objects for the IndustryPack INT0# and INT1# */ -qemu_irq *irq; +IRQState irq[2 ]; };extern const VMStateDescription vmstate_ipack_device;
hw/char/ipoctal232.c +2 -2
@@ -184,9 +184,9 @@ static void update_irq(IPOctalState *dev, unsigned block)unsigned intno = block /2 ;if ((blk0->isr & blk0->imr) || (blk1->isr & blk1->imr)) { -qemu_irq_raise (idev->irq[intno]); +qemu_irq_raise (&idev->irq[intno]); }else { -qemu_irq_lower (idev->irq[intno]); +qemu_irq_lower (&idev->irq[intno]); } }
hw/ipack/ipack.c +3 -4
@@ -55,22 +55,21 @@ static void ipack_device_realize(DeviceState *dev, Error **errp) } bus->free_slot = idev->slot +1 ; - idev->irq =qemu_allocate_irqs (bus->set_irq, idev,2 ); +for (int i =0 ; i <ARRAY_SIZE (idev->irq); i++) { +qemu_init_irq (&idev->irq[i], bus->set_irq, idev, i); + } k->realize (dev, errp); }static void ipack_device_unrealize (DeviceState *dev) { -IPackDevice *idev =IPACK_DEVICE (dev);IPackDeviceClass *k =IPACK_DEVICE_GET_CLASS (dev);if (k->unrealize) { k->unrealize (dev);return ; } - -qemu_free_irqs (idev->irq,2 ); }static const Property ipack_device_props[] = {
hw/ipack/tpci200.c +3 -3
@@ -275,11 +275,11 @@ static void tpci200_write_las0(void *opaque, hwaddr addr, uint64_t val,if (ip !=NULL ) {if (val &STATUS_INT (i,0 )) {DPRINTF ("Clear IP %c INT0# status\n" ,'A' + i); -qemu_irq_lower (ip->irq[0 ]); +qemu_irq_lower (&ip->irq[0 ]); }if (val &STATUS_INT (i,1 )) {DPRINTF ("Clear IP %c INT1# status\n" ,'A' + i); -qemu_irq_lower (ip->irq[1 ]); +qemu_irq_lower (&ip->irq[1 ]); } }
@@ -344,7 +344,7 @@ static uint64_t tpci200_read_las1(void *opaque, hwaddr addr, unsigned size)bool int_set = s->status &STATUS_INT (ip_n, intno);bool int_edge_sensitive = s->ctrl[ip_n] &CTRL_INT_EDGE (intno);if (int_set && !int_edge_sensitive) { -qemu_irq_lower (ip->irq[intno]); +qemu_irq_lower (&ip->irq[intno]); } }
Signature · 1 line
2.47.1
Re: [PATCH v2 2/2] hw/ipack: Remove legacy qemu_allocate_irqs() use
Am 21. Januar 2025 08:44:52 UTC schrieb "Philippe Mathieu-Daudé" <[email protected]>:
Quoted 71 lines
No need to dynamically allocate IRQ when we know before hands how many we'll use. Declare the 2 of them in IPackDevice state and initialize them in the DeviceRealize handler.
Signed-off-by Philippe Mathieu-Daudé <[email protected]>---
include/hw/ipack/ipack.h | 7 ++----- hw/char/ipoctal232.c | 4 ++-- hw/ipack/ipack.c | 7 +++---- hw/ipack/tpci200.c | 6 +++--- 4 files changed, 10 insertions(+), 14 deletions(-)include/hw/ipack/ipack.h +2
-5@@ -12,6 +12,7 @@#define QEMU_IPACK_H #include "hw/qdev-core.h" +#include "hw/irq.h" #include "qom/object.h" @@ -19,10 +20,8 @@ OBJECT_DECLARE_SIMPLE_TYPE(IPackBus, IPACK_BUS)struct IPackBus { -/*< private >*/ BusState parent_obj; -/* All fields are private */ uint8_t n_slots;uint8_t free_slot;qemu_irq_handler set_irq;@@ -58,13 +57,11 @@ struct IPackDeviceClass { };struct IPackDevice { -/*< private >*/ DeviceState parent_obj; -/*< public >*/ int32_t slot;/* IRQ objects for the IndustryPack INT0# and INT1# */ -qemu_irq *irq; +IRQState irq[2 ]; };extern const VMStateDescription vmstate_ipack_device;hw/char/ipoctal232.c +2
-2@@ -184,9 +184,9 @@ static void update_irq(IPOctalState *dev, unsigned block)unsigned intno = block /2 ;if ((blk0->isr & blk0->imr) || (blk1->isr & blk1->imr)) { -qemu_irq_raise (idev->irq[intno]); +qemu_irq_raise (&idev->irq[intno]); }else { -qemu_irq_lower (idev->irq[intno]); +qemu_irq_lower (&idev->irq[intno]); } }hw/ipack/ipack.c +0
-0
hw/ipack/ipack.c static void ipack_device_realize(DeviceState *dev, Error **errp) · line 59
Quoted 6 lines
hw/ipack/ipack.c +2
-1@@ -55,22 +55,21 @@ static void ipack_device_realize(DeviceState *dev, Error **errp) } bus->free_slot = idev->slot +1 ; - idev->irq =qemu_allocate_irqs (bus->set_irq, idev,2 ); +for (int i =0 ; i <ARRAY_SIZE (idev->irq); i++) { +qemu_init_irq (&idev->irq[i], bus->set_irq, idev, i);
I wonder if we eventually need a qemu_init_irqs() (note the plural) as we remove further uses of qemu_allocate_irqs().
Quoted 38 lines
hw/ipack/ipack.c +1
-3+ } k->realize (dev, errp); }static void ipack_device_unrealize (DeviceState *dev) { -IPackDevice *idev =IPACK_DEVICE (dev);IPackDeviceClass *k =IPACK_DEVICE_GET_CLASS (dev);if (k->unrealize) { k->unrealize (dev);return ; } - -qemu_free_irqs (idev->irq,2 ); }static const Property ipack_device_props[] = {hw/ipack/tpci200.c +2
-2@@ -275,11 +275,11 @@ static void tpci200_write_las0(void *opaque, hwaddr addr, uint64_t val,if (ip !=NULL ) {if (val &STATUS_INT (i,0 )) {DPRINTF ("Clear IP %c INT0# status\n" ,'A' + i); -qemu_irq_lower (ip->irq[0 ]); +qemu_irq_lower (&ip->irq[0 ]); }if (val &STATUS_INT (i,1 )) {DPRINTF ("Clear IP %c INT1# status\n" ,'A' + i); -qemu_irq_lower (ip->irq[1 ]); +qemu_irq_lower (&ip->irq[1 ]); } }
hw/ipack/tpci200.c static uint64_t tpci200_read_las1(void *opaque, hwaddr addr, unsigned size) · line 350
Quoted 8 lines
hw/ipack/tpci200.c +1
-1@@ -344,7 +344,7 @@ static uint64_t tpci200_read_las1(void *opaque, hwaddr addr, unsigned size)bool int_set = s->status &STATUS_INT (ip_n, intno);bool int_edge_sensitive = s->ctrl[ip_n] &CTRL_INT_EDGE (intno);if (int_set && !int_edge_sensitive) { -qemu_irq_lower (ip->irq[intno]); +qemu_irq_lower (&ip->irq[intno]); } }
With the above addressed:
Re: [PATCH v2 2/2] hw/ipack: Remove legacy qemu_allocate_irqs() use
Quoted 77 lines · Bernhard Beschow
Am 21. Januar 2025 08:44:52 UTC schrieb "Philippe Mathieu-Daudé" <[email protected]>:
Quoted 74 lines
No need to dynamically allocate IRQ when we know before hands how many we'll use. Declare the 2 of them in IPackDevice state and initialize them in the DeviceRealize handler.
Signed-off-by Philippe Mathieu-Daudé <[email protected]>---
include/hw/ipack/ipack.h | 7 ++----- hw/char/ipoctal232.c | 4 ++-- hw/ipack/ipack.c | 7 +++---- hw/ipack/tpci200.c | 6 +++--- 4 files changed, 10 insertions(+), 14 deletions(-)include/hw/ipack/ipack.h +2
-5@@ -12,6 +12,7 @@#define QEMU_IPACK_H #include "hw/qdev-core.h" +#include "hw/irq.h" #include "qom/object.h" @@ -19,10 +20,8 @@ OBJECT_DECLARE_SIMPLE_TYPE(IPackBus, IPACK_BUS)struct IPackBus { -/*< private >*/ BusState parent_obj; -/* All fields are private */ uint8_t n_slots;uint8_t free_slot;qemu_irq_handler set_irq;@@ -58,13 +57,11 @@ struct IPackDeviceClass { };struct IPackDevice { -/*< private >*/ DeviceState parent_obj; -/*< public >*/ int32_t slot;/* IRQ objects for the IndustryPack INT0# and INT1# */ -qemu_irq *irq; +IRQState irq[2 ]; };extern const VMStateDescription vmstate_ipack_device;hw/char/ipoctal232.c +2
-2@@ -184,9 +184,9 @@ static void update_irq(IPOctalState *dev, unsigned block)unsigned intno = block /2 ;if ((blk0->isr & blk0->imr) || (blk1->isr & blk1->imr)) { -qemu_irq_raise (idev->irq[intno]); +qemu_irq_raise (&idev->irq[intno]); }else { -qemu_irq_lower (idev->irq[intno]); +qemu_irq_lower (&idev->irq[intno]); } }hw/ipack/ipack.c +0
-0@@ -55,22 +55,21 @@ static void ipack_device_realize(DeviceState *dev, Error **errp) } bus->free_slot = idev->slot +1 ;
Quoted 5 lines
hw/ipack/ipack.c static void ipack_device_realize(DeviceState *dev, Error **errp) · line 59
Quoted 3 lines
hw/ipack/ipack.c +2
-1- idev->irq =qemu_allocate_irqs (bus->set_irq, idev,2 ); +for (int i =0 ; i <ARRAY_SIZE (idev->irq); i++) { +qemu_init_irq (&idev->irq[i], bus->set_irq, idev, i);I wonder if we eventually need a
qemu_init_irqs()(note the plural) as we remove further uses ofqemu_allocate_irqs().
Yeah I thought about it, but looking at other "Initialize pre-allocated QOM object in place", we don't have helpers for arrays. Usually because we can set properties, and array initializer doesn't scale then.
For now IRQ doesn't have properties, so can do.
Quoted 2 lines
With the above addressed:
Reviewed-by Bernhard Beschow <[email protected]>
Thanks!
Re: [PATCH v2 2/2] hw/ipack: Remove legacy qemu_allocate_irqs() use
Am 21. Januar 2025 10:04:43 UTC schrieb "Philippe Mathieu-Daudé" <[email protected]>:
Quoted 84 lines · Bernhard Beschow
Quoted 77 lines
Am 21. Januar 2025 08:44:52 UTC schrieb "Philippe Mathieu-Daudé" <[email protected]>:
Quoted 74 lines
No need to dynamically allocate IRQ when we know before hands how many we'll use. Declare the 2 of them in IPackDevice state and initialize them in the DeviceRealize handler.
Signed-off-by Philippe Mathieu-Daudé <[email protected]>---
include/hw/ipack/ipack.h | 7 ++----- hw/char/ipoctal232.c | 4 ++-- hw/ipack/ipack.c | 7 +++---- hw/ipack/tpci200.c | 6 +++--- 4 files changed, 10 insertions(+), 14 deletions(-)include/hw/ipack/ipack.h +2
-5@@ -12,6 +12,7 @@#define QEMU_IPACK_H #include "hw/qdev-core.h" +#include "hw/irq.h" #include "qom/object.h" @@ -19,10 +20,8 @@ OBJECT_DECLARE_SIMPLE_TYPE(IPackBus, IPACK_BUS)struct IPackBus { -/*< private >*/ BusState parent_obj; -/* All fields are private */ uint8_t n_slots;uint8_t free_slot;qemu_irq_handler set_irq;@@ -58,13 +57,11 @@ struct IPackDeviceClass { };struct IPackDevice { -/*< private >*/ DeviceState parent_obj; -/*< public >*/ int32_t slot;/* IRQ objects for the IndustryPack INT0# and INT1# */ -qemu_irq *irq; +IRQState irq[2 ]; };extern const VMStateDescription vmstate_ipack_device;hw/char/ipoctal232.c +2
-2@@ -184,9 +184,9 @@ static void update_irq(IPOctalState *dev, unsigned block)unsigned intno = block /2 ;if ((blk0->isr & blk0->imr) || (blk1->isr & blk1->imr)) { -qemu_irq_raise (idev->irq[intno]); +qemu_irq_raise (&idev->irq[intno]); }else { -qemu_irq_lower (idev->irq[intno]); +qemu_irq_lower (&idev->irq[intno]); } }hw/ipack/ipack.c +0
-0@@ -55,22 +55,21 @@ static void ipack_device_realize(DeviceState *dev, Error **errp) } bus->free_slot = idev->slot +1 ;Quoted 5 lines
hw/ipack/ipack.c static void ipack_device_realize(DeviceState *dev, Error **errp) · line 59
Quoted 3 lines
hw/ipack/ipack.c +2
-1- idev->irq =qemu_allocate_irqs (bus->set_irq, idev,2 ); +for (int i =0 ; i <ARRAY_SIZE (idev->irq); i++) { +qemu_init_irq (&idev->irq[i], bus->set_irq, idev, i);I wonder if we eventually need a
qemu_init_irqs()(note the plural) as we remove further uses ofqemu_allocate_irqs().
Quoted 3 lines
Yeah I thought about it, but looking at other "Initialize pre-allocated QOM object in place", we don't have helpers for arrays. Usually because we can set properties, and array initializer doesn't scale then.
Fair enough. I'd call this "addressed".
Quoted 7 lines
For now IRQ doesn't have properties, so can do.
Quoted 2 lines
With the above addressed:
Reviewed-by Bernhard Beschow <[email protected]>Thanks!