diff mbox series

[v3,19/33] sm501: make SerialMM a child, export chardev property

Message ID 20191023173154.30051-20-marcandre.lureau@redhat.com
State New
Headers show
Series Clean-ups: qom-ify serial and remove QDEV_PROP_PTR | expand

Commit Message

Marc-André Lureau Oct. 23, 2019, 5:31 p.m. UTC 
Embed the SerialMM sybus device, and re-export its "chardev" property.
That way, we can get rid of PROP_PTR "chr-state" and better track
devices relationship.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
 hw/display/sm501.c | 31 ++++++++++++++++++++++---------
 hw/sh4/r2d.c       |  2 +-
 2 files changed, 23 insertions(+), 10 deletions(-)

Comments

Philippe Mathieu-Daudé Oct. 23, 2019, 10:57 p.m. UTC | #1 
On 10/23/19 7:31 PM, Marc-André Lureau wrote:
> Embed the SerialMM sybus device, and re-export its "chardev" property.
> That way, we can get rid of PROP_PTR "chr-state" and better track
> devices relationship.
> 
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> ---
>   hw/display/sm501.c | 31 ++++++++++++++++++++++---------
>   hw/sh4/r2d.c       |  2 +-
>   2 files changed, 23 insertions(+), 10 deletions(-)
> 
> diff --git a/hw/display/sm501.c b/hw/display/sm501.c
> index 1f33c87e65..6efdf764c1 100644
> --- a/hw/display/sm501.c
> +++ b/hw/display/sm501.c
> @@ -1930,13 +1930,14 @@ typedef struct {
>       SM501State state;
>       uint32_t vram_size;
>       uint32_t base;
> -    void *chr_state;
> +    SerialMM serial;
>   } SM501SysBusState;
>   
>   static void sm501_realize_sysbus(DeviceState *dev, Error **errp)
>   {
>       SM501SysBusState *s = SYSBUS_SM501(dev);
>       SysBusDevice *sbd = SYS_BUS_DEVICE(dev);
> +    SerialState *ss = &s->serial.serial;
>       DeviceState *usb_dev;
>   
>       sm501_init(&s->state, dev, s->vram_size);
> @@ -1958,17 +1959,18 @@ static void sm501_realize_sysbus(DeviceState *dev, Error **errp)
>       sysbus_pass_irq(sbd, SYS_BUS_DEVICE(usb_dev));
>   
>       /* bridge to serial emulation module */
> -    if (s->chr_state) {
> -        serial_mm_init(&s->state.mmio_region, SM501_UART0, 2,
> -                       NULL, /* TODO : chain irq to IRL */
> -                       115200, s->chr_state, DEVICE_LITTLE_ENDIAN);
> +    if (qemu_chr_fe_backend_connected(&ss->chr)) {

Oh, this is a Companion Chip (Northbridge + Southbridge), mostly 
implementing the display part, that's why it is in hw/display/.

The SM501_UART0 is always mapped here, no need to check for the backend.
(Not related to your series goal, but cleaning this might simplify this 
patch).

> +        MemoryRegion *mr;
> +        qdev_init_nofail(DEVICE(&s->serial));
> +        mr = sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->serial), 0);
> +        memory_region_add_subregion(&s->state.mmio_region, SM501_UART0, mr);
> +        /* TODO : chain irq to IRL */
>       }
>   }
>   
>   static Property sm501_sysbus_properties[] = {
>       DEFINE_PROP_UINT32("vram-size", SM501SysBusState, vram_size, 0),
>       DEFINE_PROP_UINT32("base", SM501SysBusState, base, 0),
> -    DEFINE_PROP_PTR("chr-state", SM501SysBusState, chr_state),
>       DEFINE_PROP_END_OF_LIST(),
>   };
>   
> @@ -1999,9 +2001,19 @@ static void sm501_sysbus_class_init(ObjectClass *klass, void *data)
>       dc->props = sm501_sysbus_properties;
>       dc->reset = sm501_reset_sysbus;
>       dc->vmsd = &vmstate_sm501_sysbus;
> -    /* Note: pointer property "chr-state" may remain null, thus
> -     * no need for dc->user_creatable = false;
> -     */
> +}
> +
> +static void sm501_sysbus_init(Object *o)
> +{
> +    SM501SysBusState *self = SYSBUS_SM501(o);
> +    SerialMM *s = &self->serial;
> +
> +    sysbus_init_child_obj(o, "serial", s, sizeof(SerialMM), TYPE_SERIAL_MM);
> +    qdev_prop_set_int32(DEVICE(s), "instance-id", SM501_UART0);
> +    qdev_prop_set_uint8(DEVICE(s), "regshift", 2);
> +    qdev_prop_set_uint8(DEVICE(s), "endianness", DEVICE_LITTLE_ENDIAN);
> +
> +    object_property_add_alias(o, "chardev", OBJECT(s), "chardev", &error_abort);
>   }
>   
>   static const TypeInfo sm501_sysbus_info = {
> @@ -2009,6 +2021,7 @@ static const TypeInfo sm501_sysbus_info = {
>       .parent        = TYPE_SYS_BUS_DEVICE,
>       .instance_size = sizeof(SM501SysBusState),
>       .class_init    = sm501_sysbus_class_init,
> +    .instance_init = sm501_sysbus_init,
>   };
>   
>   #define TYPE_PCI_SM501 "sm501"
> diff --git a/hw/sh4/r2d.c b/hw/sh4/r2d.c
> index ee0840f380..72bb5285cc 100644
> --- a/hw/sh4/r2d.c
> +++ b/hw/sh4/r2d.c
> @@ -272,7 +272,7 @@ static void r2d_init(MachineState *machine)
>       busdev = SYS_BUS_DEVICE(dev);
>       qdev_prop_set_uint32(dev, "vram-size", SM501_VRAM_SIZE);
>       qdev_prop_set_uint32(dev, "base", 0x10000000);
> -    qdev_prop_set_ptr(dev, "chr-state", serial_hd(2));
> +    qdev_prop_set_chr(dev, "chardev", serial_hd(2));
>       qdev_init_nofail(dev);
>       sysbus_mmio_map(busdev, 0, 0x10000000);
>       sysbus_mmio_map(busdev, 1, 0x13e00000);
>
Marc-André Lureau Oct. 24, 2019, 10:28 a.m. UTC | #2 
Hi

On Thu, Oct 24, 2019 at 12:58 AM Philippe Mathieu-Daudé
<philmd@redhat.com> wrote:
>
> On 10/23/19 7:31 PM, Marc-André Lureau wrote:
> > Embed the SerialMM sybus device, and re-export its "chardev" property.
> > That way, we can get rid of PROP_PTR "chr-state" and better track
> > devices relationship.
> >
> > Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> > ---
> >   hw/display/sm501.c | 31 ++++++++++++++++++++++---------
> >   hw/sh4/r2d.c       |  2 +-
> >   2 files changed, 23 insertions(+), 10 deletions(-)
> >
> > diff --git a/hw/display/sm501.c b/hw/display/sm501.c
> > index 1f33c87e65..6efdf764c1 100644
> > --- a/hw/display/sm501.c
> > +++ b/hw/display/sm501.c
> > @@ -1930,13 +1930,14 @@ typedef struct {
> >       SM501State state;
> >       uint32_t vram_size;
> >       uint32_t base;
> > -    void *chr_state;
> > +    SerialMM serial;
> >   } SM501SysBusState;
> >
> >   static void sm501_realize_sysbus(DeviceState *dev, Error **errp)
> >   {
> >       SM501SysBusState *s = SYSBUS_SM501(dev);
> >       SysBusDevice *sbd = SYS_BUS_DEVICE(dev);
> > +    SerialState *ss = &s->serial.serial;
> >       DeviceState *usb_dev;
> >
> >       sm501_init(&s->state, dev, s->vram_size);
> > @@ -1958,17 +1959,18 @@ static void sm501_realize_sysbus(DeviceState *dev, Error **errp)
> >       sysbus_pass_irq(sbd, SYS_BUS_DEVICE(usb_dev));
> >
> >       /* bridge to serial emulation module */
> > -    if (s->chr_state) {
> > -        serial_mm_init(&s->state.mmio_region, SM501_UART0, 2,
> > -                       NULL, /* TODO : chain irq to IRL */
> > -                       115200, s->chr_state, DEVICE_LITTLE_ENDIAN);
> > +    if (qemu_chr_fe_backend_connected(&ss->chr)) {
>
> Oh, this is a Companion Chip (Northbridge + Southbridge), mostly
> implementing the display part, that's why it is in hw/display/.
>
> The SM501_UART0 is always mapped here, no need to check for the backend.
> (Not related to your series goal, but cleaning this might simplify this
> patch).

I see, I will drop a FIXME. Otherwise, it looks ok?


>
> > +        MemoryRegion *mr;
> > +        qdev_init_nofail(DEVICE(&s->serial));
> > +        mr = sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->serial), 0);
> > +        memory_region_add_subregion(&s->state.mmio_region, SM501_UART0, mr);
> > +        /* TODO : chain irq to IRL */
> >       }
> >   }
> >
> >   static Property sm501_sysbus_properties[] = {
> >       DEFINE_PROP_UINT32("vram-size", SM501SysBusState, vram_size, 0),
> >       DEFINE_PROP_UINT32("base", SM501SysBusState, base, 0),
> > -    DEFINE_PROP_PTR("chr-state", SM501SysBusState, chr_state),
> >       DEFINE_PROP_END_OF_LIST(),
> >   };
> >
> > @@ -1999,9 +2001,19 @@ static void sm501_sysbus_class_init(ObjectClass *klass, void *data)
> >       dc->props = sm501_sysbus_properties;
> >       dc->reset = sm501_reset_sysbus;
> >       dc->vmsd = &vmstate_sm501_sysbus;
> > -    /* Note: pointer property "chr-state" may remain null, thus
> > -     * no need for dc->user_creatable = false;
> > -     */
> > +}
> > +
> > +static void sm501_sysbus_init(Object *o)
> > +{
> > +    SM501SysBusState *self = SYSBUS_SM501(o);
> > +    SerialMM *s = &self->serial;
> > +
> > +    sysbus_init_child_obj(o, "serial", s, sizeof(SerialMM), TYPE_SERIAL_MM);
> > +    qdev_prop_set_int32(DEVICE(s), "instance-id", SM501_UART0);
> > +    qdev_prop_set_uint8(DEVICE(s), "regshift", 2);
> > +    qdev_prop_set_uint8(DEVICE(s), "endianness", DEVICE_LITTLE_ENDIAN);
> > +
> > +    object_property_add_alias(o, "chardev", OBJECT(s), "chardev", &error_abort);
> >   }
> >
> >   static const TypeInfo sm501_sysbus_info = {
> > @@ -2009,6 +2021,7 @@ static const TypeInfo sm501_sysbus_info = {
> >       .parent        = TYPE_SYS_BUS_DEVICE,
> >       .instance_size = sizeof(SM501SysBusState),
> >       .class_init    = sm501_sysbus_class_init,
> > +    .instance_init = sm501_sysbus_init,
> >   };
> >
> >   #define TYPE_PCI_SM501 "sm501"
> > diff --git a/hw/sh4/r2d.c b/hw/sh4/r2d.c
> > index ee0840f380..72bb5285cc 100644
> > --- a/hw/sh4/r2d.c
> > +++ b/hw/sh4/r2d.c
> > @@ -272,7 +272,7 @@ static void r2d_init(MachineState *machine)
> >       busdev = SYS_BUS_DEVICE(dev);
> >       qdev_prop_set_uint32(dev, "vram-size", SM501_VRAM_SIZE);
> >       qdev_prop_set_uint32(dev, "base", 0x10000000);
> > -    qdev_prop_set_ptr(dev, "chr-state", serial_hd(2));
> > +    qdev_prop_set_chr(dev, "chardev", serial_hd(2));
> >       qdev_init_nofail(dev);
> >       sysbus_mmio_map(busdev, 0, 0x10000000);
> >       sysbus_mmio_map(busdev, 1, 0x13e00000);
> >
diff mbox series

Patch

diff --git a/hw/display/sm501.c b/hw/display/sm501.c
index 1f33c87e65..6efdf764c1 100644
--- a/hw/display/sm501.c
+++ b/hw/display/sm501.c
@@ -1930,13 +1930,14 @@  typedef struct {
     SM501State state;
     uint32_t vram_size;
     uint32_t base;
-    void *chr_state;
+    SerialMM serial;
 } SM501SysBusState;
 
 static void sm501_realize_sysbus(DeviceState *dev, Error **errp)
 {
     SM501SysBusState *s = SYSBUS_SM501(dev);
     SysBusDevice *sbd = SYS_BUS_DEVICE(dev);
+    SerialState *ss = &s->serial.serial;
     DeviceState *usb_dev;
 
     sm501_init(&s->state, dev, s->vram_size);
@@ -1958,17 +1959,18 @@  static void sm501_realize_sysbus(DeviceState *dev, Error **errp)
     sysbus_pass_irq(sbd, SYS_BUS_DEVICE(usb_dev));
 
     /* bridge to serial emulation module */
-    if (s->chr_state) {
-        serial_mm_init(&s->state.mmio_region, SM501_UART0, 2,
-                       NULL, /* TODO : chain irq to IRL */
-                       115200, s->chr_state, DEVICE_LITTLE_ENDIAN);
+    if (qemu_chr_fe_backend_connected(&ss->chr)) {
+        MemoryRegion *mr;
+        qdev_init_nofail(DEVICE(&s->serial));
+        mr = sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->serial), 0);
+        memory_region_add_subregion(&s->state.mmio_region, SM501_UART0, mr);
+        /* TODO : chain irq to IRL */
     }
 }
 
 static Property sm501_sysbus_properties[] = {
     DEFINE_PROP_UINT32("vram-size", SM501SysBusState, vram_size, 0),
     DEFINE_PROP_UINT32("base", SM501SysBusState, base, 0),
-    DEFINE_PROP_PTR("chr-state", SM501SysBusState, chr_state),
     DEFINE_PROP_END_OF_LIST(),
 };
 
@@ -1999,9 +2001,19 @@  static void sm501_sysbus_class_init(ObjectClass *klass, void *data)
     dc->props = sm501_sysbus_properties;
     dc->reset = sm501_reset_sysbus;
     dc->vmsd = &vmstate_sm501_sysbus;
-    /* Note: pointer property "chr-state" may remain null, thus
-     * no need for dc->user_creatable = false;
-     */
+}
+
+static void sm501_sysbus_init(Object *o)
+{
+    SM501SysBusState *self = SYSBUS_SM501(o);
+    SerialMM *s = &self->serial;
+
+    sysbus_init_child_obj(o, "serial", s, sizeof(SerialMM), TYPE_SERIAL_MM);
+    qdev_prop_set_int32(DEVICE(s), "instance-id", SM501_UART0);
+    qdev_prop_set_uint8(DEVICE(s), "regshift", 2);
+    qdev_prop_set_uint8(DEVICE(s), "endianness", DEVICE_LITTLE_ENDIAN);
+
+    object_property_add_alias(o, "chardev", OBJECT(s), "chardev", &error_abort);
 }
 
 static const TypeInfo sm501_sysbus_info = {
@@ -2009,6 +2021,7 @@  static const TypeInfo sm501_sysbus_info = {
     .parent        = TYPE_SYS_BUS_DEVICE,
     .instance_size = sizeof(SM501SysBusState),
     .class_init    = sm501_sysbus_class_init,
+    .instance_init = sm501_sysbus_init,
 };
 
 #define TYPE_PCI_SM501 "sm501"
diff --git a/hw/sh4/r2d.c b/hw/sh4/r2d.c
index ee0840f380..72bb5285cc 100644
--- a/hw/sh4/r2d.c
+++ b/hw/sh4/r2d.c
@@ -272,7 +272,7 @@  static void r2d_init(MachineState *machine)
     busdev = SYS_BUS_DEVICE(dev);
     qdev_prop_set_uint32(dev, "vram-size", SM501_VRAM_SIZE);
     qdev_prop_set_uint32(dev, "base", 0x10000000);
-    qdev_prop_set_ptr(dev, "chr-state", serial_hd(2));
+    qdev_prop_set_chr(dev, "chardev", serial_hd(2));
     qdev_init_nofail(dev);
     sysbus_mmio_map(busdev, 0, 0x10000000);
     sysbus_mmio_map(busdev, 1, 0x13e00000);