Skip to contentSkip to conversation

hw/char/serial: Convert to three-phase reset

PATCH Superseded Philippe Mathieu-Daudé 2 participants 7 messages Jan 10, 2025

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

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
#1 lore raw

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
index 7578e863cfe..5ad2c0e8443 100644
@@ -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
index 6659cef5d4b..d31a3ccf03b 100644
@@ -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
index 70044e14a0f..562931685e7 100644
@@ -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
Reviewed-by on v2 1/2
#2 lore raw

Re: [PATCH v2 1/2] hw/char/serial: Ensure SerialState::irq is set when realizing

Quoted 51 lines · Philippe Mathieu-Daudé

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
index 7578e863cfe..5ad2c0e8443 100644
@@ -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
index 6659cef5d4b..d31a3ccf03b 100644
@@ -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
index 70044e14a0f..562931685e7 100644

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);
#3 lore raw

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::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.c +0 -0
index 70044e14a0f..562931685e7 100644

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().

#4 lore raw

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
index 562931685e7..9cb6e30c9ce 100644
@@ -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
Reviewed-by on v2 2/2
#5 lore raw
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.

---
  hw/char/serial.c | 10 ++++------
  1 file changed, 4 insertions(+), 6 deletions(-)
hw/char/serial.c +3 -6
index 562931685e7..9cb6e30c9ce 100644
@@ -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 = {