Skip to contentSkip to conversation

hw/char: Remove TYPE_SERIAL_IO

PATCH Applied Philippe Mathieu-Daudé 3 participants 5 messages Sep 7, 2020 – Sep 12, 2020

lore
Share & tools
lore
#0 lore raw

v2 cover hw/char: Remove TYPE_SERIAL_IO

Remove the TYPE_SERIAL_IO which is simply a superset of TYPE_SERIAL_MM, as suggested by Paolo and Peter here:
https://www.mail-archive.com/[email protected]/msg721806.html

Since v1:
- Reword migration comment (Marc-André)

Philippe Mathieu-Daudé (2):
hw/mips/mipssim: Use MMIO serial device on fake ISA I/O hw/char/serial: Remove TYPE_SERIAL_IO (superset of TYPE_SERIAL_MM)

 include/hw/char/serial.h |  9 ---------
 hw/char/serial.c         | 41 ----------------------------------------
 hw/mips/mipssim.c        |  5 +++--
 3 files changed, 3 insertions(+), 52 deletions(-)
Signature · 1 line
2.26.2
#1 lore raw

PATCH v2 1/2 hw/mips/mipssim: Use MMIO serial device on fake ISA I/O

The 'mipssim' is not a real hardware, it is a simulator.

There is an ISA MMIO space mapped at 0x1fd00000, however this is not a real ISA bus (no ISA IRQ). So can not use the TYPE_ISA_SERIAL device...
Instead we have been using a plain MMIO device, but named it IO.

TYPE_SERIAL_IO is a superset of TYPE_SERIAL_MM, using regshift=0 and endianness=DEVICE_LITTLE_ENDIAN.

Directly use the TYPE_SERIAL_MM device, enforcing the regshift/endianness values. 'regshift' default is already '0'. 'endianness' is meaningless for 8-bit accesses.

This change breaks migration back compatibility, but this is not an issue for the mipssim machine.

---
 hw/mips/mipssim.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
hw/mips/mipssim.c +3 -2
index 1b3b7622035..5d4ad74828d 100644
@@ -216,10 +216,11 @@ mips_mipssim_init(MachineState *machine)
      * MIPS CPU INT2, which is interrupt 4.
      */
     if (serial_hd(0)) {
-        DeviceState *dev = qdev_new(TYPE_SERIAL_IO);
+        DeviceState *dev = qdev_new(TYPE_SERIAL_MM);
 
         qdev_prop_set_chr(dev, "chardev", serial_hd(0));
-        qdev_set_legacy_instance_id(dev, 0x3f8, 2);
+        qdev_prop_set_uint8(dev, "regshift", 0);
+        qdev_prop_set_uint8(dev, "endianness", DEVICE_LITTLE_ENDIAN);
         sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal);
         sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, env->irq[4]);
         sysbus_add_io(SYS_BUS_DEVICE(dev), 0x3f8,
Signature · 1 line
2.26.2
#2 lore raw

Re: [PATCH v2 1/2] hw/mips/mipssim: Use MMIO serial device on fake ISA I/O

Quoted 2 lines · Philippe Mathieu-Daudé

TYPE_SERIAL_IO is a superset of TYPE_SERIAL_MM, using regshift=0 and endianness=DEVICE_LITTLE_ENDIAN.

*subset*. :)

Queued the patch, thanks.

Paolo

Quoted 3 lines

Directly use the TYPE_SERIAL_MM device, enforcing the regshift/endianness values. 'regshift' default is already '0'. 'endianness' is meaningless for 8-bit accesses.

#3 lore raw

PATCH v2 2/2 hw/char/serial: Remove TYPE_SERIAL_IO (superset of TYPE_SERIAL_MM)

In reply to Philippe Mathieu-Daudé

TYPE_SERIAL_IO is a superset of TYPE_SERIAL_MM, and it is not used anymore. Remove it.

---
 include/hw/char/serial.h |  9 ---------
 hw/char/serial.c         | 41 ----------------------------------------
 2 files changed, 50 deletions(-)
include/hw/char/serial.h +0 -9
index 535fa23a2b8..81d7ba1917f 100644
@@ -88,12 +88,6 @@ typedef struct SerialMM {
     uint8_t endianness;
 } SerialMM;
 
-typedef struct SerialIO {
-    SysBusDevice parent;
-
-    SerialState serial;
-} SerialIO;
-
 extern const VMStateDescription vmstate_serial;
 extern const MemoryRegionOps serial_io_ops;
 
@@ -105,9 +99,6 @@ void serial_set_frequency(SerialState *s, uint32_t frequency);
 #define TYPE_SERIAL_MM "serial-mm"
 #define SERIAL_MM(s) OBJECT_CHECK(SerialMM, (s), TYPE_SERIAL_MM)
 
-#define TYPE_SERIAL_IO "serial-io"
-#define SERIAL_IO(s) OBJECT_CHECK(SerialIO, (s), TYPE_SERIAL_IO)
-
 SerialMM *serial_mm_init(MemoryRegion *address_space,
                          hwaddr base, int regshift,
                          qemu_irq irq, int baudbase,
hw/char/serial.c +0 -41

53 lines not on this page · raw message

Signature · 1 line
2.26.2
Reviewed-by on the v2 series
#4 lore raw
In reply to Philippe Mathieu-Daudé
Quoted 7 lines · Philippe Mathieu-Daudé

Remove the TYPE_SERIAL_IO which is simply a superset of TYPE_SERIAL_MM, as suggested by Paolo and Peter here:
https://www.mail-archive.com/[email protected]/msg721806.html

Since v1:
- Reword migration comment (Marc-André)

Quoted 9 lines

Philippe Mathieu-Daudé (2):
hw/mips/mipssim: Use MMIO serial device on fake ISA I/O hw/char/serial: Remove TYPE_SERIAL_IO (superset of TYPE_SERIAL_MM)

 include/hw/char/serial.h |  9 ---------
 hw/char/serial.c         | 41 ----------------------------------------
 hw/mips/mipssim.c        |  5 +++--
 3 files changed, 3 insertions(+), 52 deletions(-)

r~