[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC v1 24/25] timer: xilinx_timer: init MMIO ASAP
From: |
Peter Crosthwaite |
Subject: |
[Qemu-devel] [RFC v1 24/25] timer: xilinx_timer: init MMIO ASAP |
Date: |
Thu, 15 May 2014 19:03:40 -0700 |
So the memory regions exist pre-realize.
Signed-off-by: Peter Crosthwaite <address@hidden>
---
hw/timer/xilinx_timer.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/hw/timer/xilinx_timer.c b/hw/timer/xilinx_timer.c
index cdb3355..1b0e2a1 100644
--- a/hw/timer/xilinx_timer.c
+++ b/hw/timer/xilinx_timer.c
@@ -221,9 +221,8 @@ static void xilinx_timer_realize(DeviceState *dev, Error
**errp)
ptimer_set_freq(xt->ptimer, t->freq_hz);
}
- memory_region_init_io(&t->mmio, OBJECT(t), &timer_ops, t, "xlnx.xps-timer",
- R_MAX * 4 * num_timers(t));
- sysbus_init_mmio(SYS_BUS_DEVICE(dev), &t->mmio);
+ object_property_set_int(OBJECT(&t->mmio), R_MAX * 4 * num_timers(t),
+ "size", &error_abort);
}
static void xilinx_timer_init(Object *obj)
@@ -232,6 +231,9 @@ static void xilinx_timer_init(Object *obj)
/* All timers share a single irq line. */
sysbus_init_irq(SYS_BUS_DEVICE(obj), &t->irq);
+ memory_region_init_io(&t->mmio, OBJECT(t), &timer_ops, t,
+ "xlnx.xps-timer", 0);
+ sysbus_init_mmio(SYS_BUS_DEVICE(obj), &t->mmio);
}
static Property xilinx_timer_properties[] = {
--
1.9.3.1.ga73a6ad
- [Qemu-devel] [RFC v1 14/25] qdev: gpio: Register GPIO outputs as QOM links, (continued)
- [Qemu-devel] [RFC v1 14/25] qdev: gpio: Register GPIO outputs as QOM links, Peter Crosthwaite, 2014/05/15
- [Qemu-devel] [RFC v1 15/25] qdev: gpio: Re-impement qdev_connect_gpio QOM style, Peter Crosthwaite, 2014/05/15
- [Qemu-devel] [RFC v1 16/25] qom: object_property_set/get: Add child recursion, Peter Crosthwaite, 2014/05/15
- [Qemu-devel] [RFC v1 17/25] sysbus: Use TYPE_DEVICE GPIO functionality, Peter Crosthwaite, 2014/05/15
- [Qemu-devel] [RFC v1 18/25] sysbus: Rework sysbus_mmio_map to use mr QOMification, Peter Crosthwaite, 2014/05/15
- [Qemu-devel] [RFC v1 19/25] sysbus: Setup memory regions as dynamic props, Peter Crosthwaite, 2014/05/15
- [Qemu-devel] [RFC v1 20/25] sysbus: Enable hotplug., Peter Crosthwaite, 2014/05/15
- [Qemu-devel] [RFC v1 21/25] microblaze: s3adsp: Expand UART creator, Peter Crosthwaite, 2014/05/15
- [Qemu-devel] [RFC v1 22/25] microblaze: s3adsp: Parent devices with sane names, Peter Crosthwaite, 2014/05/15
- [Qemu-devel] [RFC v1 23/25] timer: xilinx_timer: Convert to realize(), Peter Crosthwaite, 2014/05/15
- [Qemu-devel] [RFC v1 24/25] timer: xilinx_timer: init MMIO ASAP,
Peter Crosthwaite <=
- [Qemu-devel] [RFC v1 25/25] TEST: microblaze: s3adsp: Remove timer, Peter Crosthwaite, 2014/05/15