hw/char/serial: Convert to three-phase reset
v2 cover hw/char/serial: Convert to three-phase reset
v2:
- Addressed Paolo's comments from v1 (except &error_abort).
Note, this fixes a bug where serial_realize() was calling serial_reset() -> qemu_irq_lower() while the IRQ was not yet created.
Philippe Mathieu-Daudé (2):
hw/char/serial: Ensure SerialState::irq is set when realizing hw/char/serial: Convert to three-phase reset
hw/char/serial-pci-multi.c | 2 +- hw/char/serial-pci.c | 2 +- hw/char/serial.c | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-)
Signature · 1 line
2.47.1
PATCH v2 1/2 hw/char/serial: Ensure SerialState::irq is set when realizing
SerialState::irq must be set by parent when the object is realized.
--- hw/char/serial-pci-multi.c | 2 +- hw/char/serial-pci.c | 2 +- hw/char/serial.c | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-)
hw/char/serial-pci-multi.c +1 -1
@@ -106,11 +106,11 @@ static void multi_serial_pci_realize(PCIDevice *dev, Error **errp)for (i =0 ; i < nports; i++) { s = pci->state + i; + s->irq = pci->irqs[i];if (!qdev_realize (DEVICE (s),NULL , errp)) {multi_serial_pci_exit (dev);return ; } - s->irq = pci->irqs[i]; pci->name[i] =g_strdup_printf ("uart #%zu" , i +1 );memory_region_init_io (&s->io,OBJECT (pci), &serial_io_ops, s, pci->name[i],8 );
hw/char/serial-pci.c +1 -1
@@ -49,13 +49,13 @@ static void serial_pci_realize(PCIDevice *dev, Error **errp)PCISerialState *pci =DO_UPCAST (PCISerialState, dev, dev);SerialState *s = &pci->state; + s->irq =pci_allocate_irq (&pci->dev);if (!qdev_realize (DEVICE (s),NULL , errp)) {return ; } pci->dev.config[PCI_CLASS_PROG ] = pci->prog_if; pci->dev.config[PCI_INTERRUPT_PIN ] =0x01 ; - s->irq =pci_allocate_irq (&pci->dev);memory_region_init_io (&s->io,OBJECT (pci), &serial_io_ops, s,"serial" ,8 );pci_register_bar (&pci->dev,0 ,PCI_BASE_ADDRESS_SPACE_IO , &s->io);
hw/char/serial.c +2 -0
@@ -923,6 +923,8 @@ static void serial_realize(DeviceState *dev, Error **errp) {SerialState *s =SERIAL (dev); +assert (s->irq); + s->modem_status_poll =timer_new_ns (QEMU_CLOCK_VIRTUAL , (QEMUTimerCB *) serial_update_msl, s); s->fifo_timeout_timer =timer_new_ns (QEMU_CLOCK_VIRTUAL , (QEMUTimerCB *) fifo_timeout_int, s);
Signature · 1 line
2.47.1
Re: [PATCH v2 1/2] hw/char/serial: Ensure SerialState::irq is set when realizing
Quoted 51 lines · Philippe Mathieu-Daudé
SerialState::irqmust be set by parent when the object is realized.Suggested-by Paolo Bonzini <[email protected]>Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- hw/char/serial-pci-multi.c | 2 +- hw/char/serial-pci.c | 2 +- hw/char/serial.c | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-)hw/char/serial-pci-multi.c +1
-1@@ -106,11 +106,11 @@ static void multi_serial_pci_realize(PCIDevice *dev, Error **errp)for (i =0 ; i < nports; i++) { s = pci->state + i; + s->irq = pci->irqs[i];if (!qdev_realize (DEVICE (s),NULL , errp)) {multi_serial_pci_exit (dev);return ; } - s->irq = pci->irqs[i]; pci->name[i] =g_strdup_printf ("uart #%zu" , i +1 );memory_region_init_io (&s->io,OBJECT (pci), &serial_io_ops, s, pci->name[i],8 );hw/char/serial-pci.c +1
-1@@ -49,13 +49,13 @@ static void serial_pci_realize(PCIDevice *dev, Error **errp)PCISerialState *pci =DO_UPCAST (PCISerialState, dev, dev);SerialState *s = &pci->state; + s->irq =pci_allocate_irq (&pci->dev);if (!qdev_realize (DEVICE (s),NULL , errp)) {return ; } pci->dev.config[PCI_CLASS_PROG ] = pci->prog_if; pci->dev.config[PCI_INTERRUPT_PIN ] =0x01 ; - s->irq =pci_allocate_irq (&pci->dev);memory_region_init_io (&s->io,OBJECT (pci), &serial_io_ops, s,"serial" ,8 );pci_register_bar (&pci->dev,0 ,PCI_BASE_ADDRESS_SPACE_IO , &s->io);hw/char/serial.c +0
-0
hw/char/serial.c static void serial_realize(DeviceState *dev, Error **errp) · line 930
Quoted 8 lines
hw/char/serial.c +2
-0@@ -923,6 +923,8 @@ static void serial_realize(DeviceState *dev, Error **errp) {SerialState *s =SERIAL (dev); +assert (s->irq); + s->modem_status_poll =timer_new_ns (QEMU_CLOCK_VIRTUAL , (QEMUTimerCB *) serial_update_msl, s); s->fifo_timeout_timer =timer_new_ns (QEMU_CLOCK_VIRTUAL , (QEMUTimerCB *) fifo_timeout_int, s);
Re: [PATCH v2 1/2] hw/char/serial: Ensure SerialState::irq is set when realizing
In reply to Philippe Mathieu-DaudéQuoted 16 lines · Philippe Mathieu-Daudé
SerialState::irqmust be set by parent when the object is realized.Suggested-by Paolo Bonzini <[email protected]>Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- hw/char/serial-pci-multi.c | 2 +- hw/char/serial-pci.c | 2 +- hw/char/serial.c | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-)hw/char/serial.c +0
-0
hw/char/serial.c static void serial_realize(DeviceState *dev, Error **errp) · line 926
Quoted 4 lines
hw/char/serial.c +1
-0@@ -923,6 +923,8 @@ static void serial_realize(DeviceState *dev, Error **errp) {SerialState *s =SERIAL (dev); +assert (s->irq);
Patch incomplete, missing to update serial_mm_realize().
PATCH v2 2/2 hw/char/serial: Convert to three-phase reset
In reply to Philippe Mathieu-DaudéConvert the TYPE_SERIAL (16550A UART) to three-phase reset.
Only local states are reset so use the ResetHold handler, like other legacy devices.
--- hw/char/serial.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)
hw/char/serial.c +4 -6
@@ -851,9 +851,9 @@ const VMStateDescription vmstate_serial = { } }; -static void serial_reset (void *opaque) +static void serial_reset_hold (Object *obj,ResetType type) { -SerialState *s = opaque; +SerialState *s = (SerialState *)obj;if (s->watch_tag >0 ) {g_source_remove (s->watch_tag);
@@ -928,13 +928,11 @@ static void serial_realize(DeviceState *dev, Error **errp) s->modem_status_poll =timer_new_ns (QEMU_CLOCK_VIRTUAL , (QEMUTimerCB *) serial_update_msl, s); s->fifo_timeout_timer =timer_new_ns (QEMU_CLOCK_VIRTUAL , (QEMUTimerCB *) fifo_timeout_int, s); -qemu_register_reset (serial_reset, s);qemu_chr_fe_set_handlers (&s->chr, serial_can_receive1, serial_receive1, serial_event, serial_be_change, s,NULL , true);fifo8_create (&s->recv_fifo,UART_FIFO_LENGTH );fifo8_create (&s->xmit_fifo,UART_FIFO_LENGTH ); -serial_reset (s); }static void serial_unrealize (DeviceState *dev)
@@ -949,8 +947,6 @@ static void serial_unrealize(DeviceState *dev)fifo8_destroy (&s->recv_fifo);fifo8_destroy (&s->xmit_fifo); - -qemu_unregister_reset (serial_reset, s); }const MemoryRegionOps serial_io_ops = {
@@ -975,12 +971,14 @@ static const Property serial_properties[] = {static void serial_class_init (ObjectClass *klass,void * data) {DeviceClass *dc =DEVICE_CLASS (klass); +ResettableClass *rc =RESETTABLE_CLASS (klass);/* internal device for serialio/serialmm, not user-creatable */ dc->user_creatable = false; dc->realize = serial_realize; dc->unrealize = serial_unrealize;device_class_set_props (dc, serial_properties); + rc->phases.hold = serial_reset_hold; }static const TypeInfo serial_info = {
Signature · 1 line
2.47.1
Quoted 54 lines · Philippe Mathieu-Daudé
Convert the
TYPE_SERIAL(16550A UART) to three-phase reset.Only local states are reset so use the ResetHold handler, like other legacy devices.
Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- hw/char/serial.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)hw/char/serial.c +3
-6@@ -851,9 +851,9 @@ const VMStateDescription vmstate_serial = { } }; -static void serial_reset (void *opaque) +static void serial_reset_hold (Object *obj,ResetType type) { -SerialState *s = opaque; +SerialState *s = (SerialState *)obj;if (s->watch_tag >0 ) {g_source_remove (s->watch_tag);@@ -928,13 +928,11 @@ static void serial_realize(DeviceState *dev, Error **errp) s->modem_status_poll =timer_new_ns (QEMU_CLOCK_VIRTUAL , (QEMUTimerCB *) serial_update_msl, s); s->fifo_timeout_timer =timer_new_ns (QEMU_CLOCK_VIRTUAL , (QEMUTimerCB *) fifo_timeout_int, s); -qemu_register_reset (serial_reset, s);qemu_chr_fe_set_handlers (&s->chr, serial_can_receive1, serial_receive1, serial_event, serial_be_change, s,NULL , true);fifo8_create (&s->recv_fifo,UART_FIFO_LENGTH );fifo8_create (&s->xmit_fifo,UART_FIFO_LENGTH ); -serial_reset (s); }static void serial_unrealize (DeviceState *dev)@@ -949,8 +947,6 @@ static void serial_unrealize(DeviceState *dev)fifo8_destroy (&s->recv_fifo);fifo8_destroy (&s->xmit_fifo); - -qemu_unregister_reset (serial_reset, s); }const MemoryRegionOps serial_io_ops = {@@ -975,12 +971,14 @@ static const Property serial_properties[] = {static void serial_class_init (ObjectClass *klass,void * data) {DeviceClass *dc =DEVICE_CLASS (klass); +ResettableClass *rc =RESETTABLE_CLASS (klass);
hw/char/serial.c static const Property serial_properties[] = { · line 984
Quoted 10 lines
hw/char/serial.c +1
-0/* internal device for serialio/serialmm, not user-creatable */ dc->user_creatable = false; dc->realize = serial_realize; dc->unrealize = serial_unrealize;device_class_set_props (dc, serial_properties); + rc->phases.hold = serial_reset_hold; }static const TypeInfo serial_info = {
Quoted 9 lines · Philippe Mathieu-Daudé
Convert the
TYPE_SERIAL(16550A UART) to three-phase reset.Only local states are reset so use the ResetHold handler, like other legacy devices.
Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- hw/char/serial.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)
Since this object is not on a bus, this patch is crap, sorry.