[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 16/33] serial-mm: use sysbus facilities
From: |
Marc-André Lureau |
Subject: |
[PATCH v3 16/33] serial-mm: use sysbus facilities |
Date: |
Wed, 23 Oct 2019 19:31:37 +0200 |
Make SerialMM a regular sysbus device, by registering the irq, and the
mmio region. Reexport the internal serial properties.
Signed-off-by: Marc-André Lureau <address@hidden>
---
hw/char/serial.c | 35 ++++++++++++++++++++++++-----------
1 file changed, 24 insertions(+), 11 deletions(-)
diff --git a/hw/char/serial.c b/hw/char/serial.c
index 2f7667c30c..a40bc3ab81 100644
--- a/hw/char/serial.c
+++ b/hw/char/serial.c
@@ -1074,21 +1074,18 @@ SerialMM *serial_mm_init(MemoryRegion *address_space,
Chardev *chr, enum device_endian end)
{
SerialMM *self = SERIAL_MM(qdev_create(NULL, TYPE_SERIAL_MM));
- SerialState *s = &self->serial;
+ MemoryRegion *mr;
qdev_prop_set_uint8(DEVICE(self), "regshift", regshift);
- s->irq = irq;
- qdev_prop_set_uint32(DEVICE(s), "baudbase", baudbase);
- qdev_prop_set_chr(DEVICE(s), "chardev", chr);
- qdev_prop_set_int32(DEVICE(s), "instance-id", base);
- qdev_prop_set_uint8(DEVICE(s), "endianness", end);
-
- qdev_init_nofail(DEVICE(s));
+ qdev_prop_set_uint32(DEVICE(self), "baudbase", baudbase);
+ qdev_prop_set_chr(DEVICE(self), "chardev", chr);
+ qdev_prop_set_int32(DEVICE(self), "instance-id", base);
+ qdev_prop_set_uint8(DEVICE(self), "endianness", end);
qdev_init_nofail(DEVICE(self));
- memory_region_init_io(&s->io, NULL, &serial_mm_ops[end], self,
- "serial", 8 << regshift);
- memory_region_add_subregion(address_space, base, &s->io);
+ sysbus_connect_irq(SYS_BUS_DEVICE(self), 0, irq);
+ mr = sysbus_mmio_get_region(SYS_BUS_DEVICE(self), 0);
+ memory_region_add_subregion(address_space, base, mr);
return self;
}
@@ -1099,6 +1096,8 @@ static void serial_mm_instance_init(Object *o)
object_initialize_child(o, "serial", &self->serial, sizeof(self->serial),
TYPE_SERIAL, &error_abort, NULL);
+
+ qdev_alias_all_properties(DEVICE(&self->serial), o);
}
static Property serial_mm_properties[] = {
@@ -1107,11 +1106,25 @@ static Property serial_mm_properties[] = {
DEFINE_PROP_END_OF_LIST(),
};
+static void serial_mm_realize(DeviceState *dev, Error **errp)
+{
+ SerialMM *self = SERIAL_MM(dev);
+ SerialState *s = &self->serial;
+
+ qdev_init_nofail(DEVICE(s));
+
+ memory_region_init_io(&s->io, NULL, &serial_mm_ops[self->endianness], self,
+ "serial", 8 << self->regshift);
+ sysbus_init_mmio(SYS_BUS_DEVICE(self), &s->io);
+ sysbus_init_irq(SYS_BUS_DEVICE(self), &self->serial.irq);
+}
+
static void serial_mm_class_init(ObjectClass *klass, void* data)
{
DeviceClass *dc = DEVICE_CLASS(klass);
dc->props = serial_mm_properties;
+ dc->realize = serial_mm_realize;
}
static const TypeInfo serial_mm_info = {
--
2.23.0.606.g08da6496b6
- [PATCH v3 08/33] serial: add "chardev" property, (continued)
- [PATCH v3 08/33] serial: add "chardev" property, Marc-André Lureau, 2019/10/23
- [PATCH v3 09/33] serial: add "baudbase" property, Marc-André Lureau, 2019/10/23
- [PATCH v3 10/33] serial: add "instance-id" property, Marc-André Lureau, 2019/10/23
- [PATCH v3 11/33] serial: realize the serial device, Marc-André Lureau, 2019/10/23
- [PATCH v3 12/33] serial: replace serial_exit_core() with unrealize, Marc-André Lureau, 2019/10/23
- [PATCH v3 13/33] serial: start making SerialMM a sysbus device, Marc-André Lureau, 2019/10/23
- [PATCH v3 15/33] serial-mm: add endianness property, Marc-André Lureau, 2019/10/23
- [PATCH v3 14/33] serial-mm: add "regshift" property, Marc-André Lureau, 2019/10/23
- [PATCH v3 16/33] serial-mm: use sysbus facilities,
Marc-André Lureau <=
- [PATCH v3 17/33] serial: make SerialIO a sysbus device, Marc-André Lureau, 2019/10/23
- [PATCH v3 18/33] mips: inline serial_init, Marc-André Lureau, 2019/10/23
- [PATCH v3 19/33] sm501: make SerialMM a child, export chardev property, Marc-André Lureau, 2019/10/23
- [PATCH v3 20/33] vmmouse: replace PROP_PTR with PROP_LINK, Marc-André Lureau, 2019/10/23
- [PATCH v3 21/33] lance: replace PROP_PTR with PROP_LINK, Marc-André Lureau, 2019/10/23