hw/ipack: Minor dust removal
v3 cover hw/ipack: Minor dust removal
Clarify what is what in Kconfig,
replace qemu_allocate_irqs() by qemu_init_irq().
Since v2:
- Introduce qemu_init_irqs (Bernhard)
Since v1:
- s/qemu_irq/IRQState/ in IPackDevice state
Philippe Mathieu-Daudé (3):
hw/irq: Introduce qemu_init_irqs() helper hw/ipack: Clarify KConfig symbols hw/ipack: Remove legacy qemu_allocate_irqs() use
include/hw/ipack/ipack.h | 7 ++----- include/hw/irq.h | 11 +++++++++++ hw/char/ipoctal232.c | 4 ++-- hw/core/irq.c | 8 ++++++++ hw/ipack/ipack.c | 5 +---- 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 +++- 12 files changed, 45 insertions(+), 18 deletions(-)
Signature · 1 line
2.47.1
PATCH v3 1/3 hw/irq: Introduce qemu_init_irqs() helper
While qemu_init_irq() initialize a single IRQ,qemu_init_irqs() initialize an array of them.
--- include/hw/irq.h | 11 +++++++++++ hw/core/irq.c | 8 ++++++++ 2 files changed, 19 insertions(+)
include/hw/irq.h +11 -0
@@ -41,6 +41,17 @@ static inline void qemu_irq_pulse(qemu_irq irq)void qemu_init_irq (IRQState *irq,qemu_irq_handler handler,void *opaque,int n); +/** +* qemu_init_irqs: Initialize an array of IRQs. +* +* @irq: Array of IRQs to initialize +* @count: number of IRQs to initialize +* @handler: handler to assign to each IRQ +* @opaque: opaque data to pass to @handler +*/ +void qemu_init_irqs (IRQState irq[],size_t count, +qemu_irq_handler handler,void *opaque); +/* Returns an array of N IRQs. Each IRQ is assigned the argument handler and * opaque data. */
hw/core/irq.c +8 -0
@@ -49,6 +49,14 @@ void qemu_init_irq(IRQState *irq, qemu_irq_handler handler, void *opaque,init_irq_fields (irq, handler, opaque, n); } +void qemu_init_irqs (IRQState irq[],size_t count, +qemu_irq_handler handler,void *opaque) +{ +for (size_t i =0 ; i < count; i++) { +qemu_init_irq (&irq[i], handler, opaque, i); + } +} +qemu_irq *qemu_extend_irqs (qemu_irq *old,int n_old,qemu_irq_handler handler,void *opaque,int n) {
Signature · 1 line
2.47.1
Re: [PATCH v3 1/3] hw/irq: Introduce qemu_init_irqs() helper
Quoted 9 lines · Philippe Mathieu-Daudé
While
qemu_init_irq()initialize a single IRQ,qemu_init_irqs()initialize an array of them.Suggested-by Bernhard Beschow <[email protected]>Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- include/hw/irq.h | 11 +++++++++++ hw/core/irq.c | 8 ++++++++ 2 files changed, 19 insertions(+)
r~
PATCH v3 2/3 hw/ipack: Clarify KConfig symbols
In reply to Philippe Mathieu-Daudé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
Re: [PATCH v3 2/3] hw/ipack: Clarify KConfig symbols
Quoted 7 lines · Philippe Mathieu-Daudé
Split IPACK
Kconfigkey 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 busSigned-off-by Philippe Mathieu-Daudé <[email protected]>
Quoted 8 lines
--- 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(-)
Missed from v1:
PATCH v3 3/3 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 | 5 +---- hw/ipack/tpci200.c | 6 +++--- 4 files changed, 8 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 +1 -4
@@ -55,22 +55,19 @@ 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 ); +qemu_init_irqs (idev->irq,ARRAY_SIZE (idev->irq), bus->set_irq, idev); 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 v3 3/3] hw/ipack: Remove legacy qemu_allocate_irqs() use
Quoted 11 lines · 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.
Signed-off-by Philippe Mathieu-Daudé<[email protected]>--- include/hw/ipack/ipack.h | 7 ++----- hw/char/ipoctal232.c | 4 ++-- hw/ipack/ipack.c | 5 +---- hw/ipack/tpci200.c | 6 +++--- 4 files changed, 8 insertions(+), 14 deletions(-)
r~
Quoted 4 lines · Philippe Mathieu-Daudé
Philippe Mathieu-Daudé (3):
hw/irq: Introduceqemu_init_irqs()helper hw/ipack: Clarify KConfig symbols hw/ipack: Remove legacyqemu_allocate_irqs()use
Series queued.