mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hw/display/sm501: Alias 'dma-offset' QOM property in chipset object

Browse Source 
No need to use an intermediate 'dma-offset' property in the
chipset object. Alias the property, so when the machine (here
r2d-plus) sets the value on the chipset, it is propagated to
the OHCI object.

Note we can rename the chipset 'base' property as 'dma-offset'
since the object is a non-user-creatable sysbus type.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: BALATON Zoltan <balaton@eik.bme.hu>
Message-Id: <20230203145536.17585-12-philmd@linaro.org>
This commit is contained in:
Philippe Mathieu-Daudé 2023-02-03 15:31:52 +01:00
parent 01c400ae43
commit 6a01504660
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hw/display/sm501.c
View File

@ -1944,7 +1944,6 @@ struct SM501SysBusState {
/*< public >*/ /*< public >*/
SM501State state; SM501State state;
uint32_t vram_size; uint32_t vram_size;
uint32_t base;
SerialMM serial; SerialMM serial;
OHCISysBusState ohci; OHCISysBusState ohci;
}; };
@ -1965,7 +1964,6 @@ static void sm501_realize_sysbus(DeviceState *dev, Error **errp)
sysbus_init_mmio(sbd, &s->state.mmio_region); sysbus_init_mmio(sbd, &s->state.mmio_region);
/* bridge to usb host emulation module */ /* bridge to usb host emulation module */
qdev_prop_set_uint64(DEVICE(&s->ohci), "dma-offset", s->base);
sysbus_realize_and_unref(SYS_BUS_DEVICE(&s->ohci), &error_fatal); sysbus_realize_and_unref(SYS_BUS_DEVICE(&s->ohci), &error_fatal);
memory_region_add_subregion(&s->state.mmio_region, SM501_USB_HOST, memory_region_add_subregion(&s->state.mmio_region, SM501_USB_HOST,
sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->ohci), 0)); sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->ohci), 0));
@ -1980,7 +1978,6 @@ static void sm501_realize_sysbus(DeviceState *dev, Error **errp)
static Property sm501_sysbus_properties[] = { static Property sm501_sysbus_properties[] = {
DEFINE_PROP_UINT32("vram-size", SM501SysBusState, vram_size, 0), DEFINE_PROP_UINT32("vram-size", SM501SysBusState, vram_size, 0),
DEFINE_PROP_UINT32("base", SM501SysBusState, base, 0),
DEFINE_PROP_END_OF_LIST(), DEFINE_PROP_END_OF_LIST(),
}; };
@ -2020,6 +2017,7 @@ static void sm501_sysbus_init(Object *o)
SerialMM *smm = &sm501->serial; SerialMM *smm = &sm501->serial;
object_initialize_child(o, "ohci", ohci, TYPE_SYSBUS_OHCI); object_initialize_child(o, "ohci", ohci, TYPE_SYSBUS_OHCI);
object_property_add_alias(o, "dma-offset", OBJECT(ohci), "dma-offset");
qdev_prop_set_uint32(DEVICE(ohci), "num-ports", 2); qdev_prop_set_uint32(DEVICE(ohci), "num-ports", 2);
object_initialize_child(o, "serial", smm, TYPE_SERIAL_MM); object_initialize_child(o, "serial", smm, TYPE_SERIAL_MM);
@ -2027,8 +2025,7 @@ static void sm501_sysbus_init(Object *o)
qdev_prop_set_uint8(DEVICE(smm), "regshift", 2); qdev_prop_set_uint8(DEVICE(smm), "regshift", 2);
qdev_prop_set_uint8(DEVICE(smm), "endianness", DEVICE_LITTLE_ENDIAN); qdev_prop_set_uint8(DEVICE(smm), "endianness", DEVICE_LITTLE_ENDIAN);
object_property_add_alias(o, "chardev", object_property_add_alias(o, "chardev", OBJECT(smm), "chardev");
OBJECT(smm), "chardev");
} }
static const TypeInfo sm501_sysbus_info = { static const TypeInfo sm501_sysbus_info = {

2
hw/sh4/r2d.c
View File

@ -274,7 +274,7 @@ static void r2d_init(MachineState *machine)
dev = qdev_new("sysbus-sm501"); dev = qdev_new("sysbus-sm501");
busdev = SYS_BUS_DEVICE(dev); busdev = SYS_BUS_DEVICE(dev);
qdev_prop_set_uint32(dev, "vram-size", SM501_VRAM_SIZE); qdev_prop_set_uint32(dev, "vram-size", SM501_VRAM_SIZE);
qdev_prop_set_uint32(dev, "base", 0x10000000); qdev_prop_set_uint64(dev, "dma-offset", 0x10000000);
qdev_prop_set_chr(dev, "chardev", serial_hd(2)); qdev_prop_set_chr(dev, "chardev", serial_hd(2));
sysbus_realize_and_unref(busdev, &error_fatal); sysbus_realize_and_unref(busdev, &error_fatal);
sysbus_mmio_map(busdev, 0, 0x10000000); sysbus_mmio_map(busdev, 0, 0x10000000);