[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 03/24] a9mpcore: Embed GICState
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PATCH v4 03/24] a9mpcore: Embed GICState |
Date: |
Wed, 11 Sep 2013 16:37:19 +0200 |
From: Andreas Färber <address@hidden>
Prepares for conversion to QOM realize.
Signed-off-by: Andreas Färber <address@hidden>
---
hw/cpu/a9mpcore.c | 25 ++++++++++++++++---------
1 file changed, 16 insertions(+), 9 deletions(-)
diff --git a/hw/cpu/a9mpcore.c b/hw/cpu/a9mpcore.c
index acbdab5..c57b149 100644
--- a/hw/cpu/a9mpcore.c
+++ b/hw/cpu/a9mpcore.c
@@ -9,6 +9,7 @@
*/
#include "hw/sysbus.h"
+#include "hw/intc/arm_gic.h"
#define TYPE_A9MPCORE_PRIV "a9mpcore_priv"
#define A9MPCORE_PRIV(obj) \
@@ -23,15 +24,17 @@ typedef struct A9MPPrivState {
MemoryRegion container;
DeviceState *mptimer;
DeviceState *wdt;
- DeviceState *gic;
DeviceState *scu;
uint32_t num_irq;
+
+ GICState gic;
} A9MPPrivState;
static void a9mp_priv_set_irq(void *opaque, int irq, int level)
{
A9MPPrivState *s = (A9MPPrivState *)opaque;
- qemu_set_irq(qdev_get_gpio_in(s->gic, irq), level);
+
+ qemu_set_irq(qdev_get_gpio_in(DEVICE(&s->gic), irq), level);
}
static void a9mp_priv_initfn(Object *obj)
@@ -40,19 +43,23 @@ static void a9mp_priv_initfn(Object *obj)
memory_region_init(&s->container, obj, "a9mp-priv-container", 0x2000);
sysbus_init_mmio(SYS_BUS_DEVICE(obj), &s->container);
+
+ object_initialize(&s->gic, sizeof(s->gic), TYPE_ARM_GIC);
+ qdev_set_parent_bus(DEVICE(&s->gic), sysbus_get_default());
}
static int a9mp_priv_init(SysBusDevice *dev)
{
A9MPPrivState *s = A9MPCORE_PRIV(dev);
+ DeviceState *gicdev;
SysBusDevice *timerbusdev, *wdtbusdev, *gicbusdev, *scubusdev;
int i;
- s->gic = qdev_create(NULL, "arm_gic");
- qdev_prop_set_uint32(s->gic, "num-cpu", s->num_cpu);
- qdev_prop_set_uint32(s->gic, "num-irq", s->num_irq);
- qdev_init_nofail(s->gic);
- gicbusdev = SYS_BUS_DEVICE(s->gic);
+ gicdev = DEVICE(&s->gic);
+ qdev_prop_set_uint32(gicdev, "num-cpu", s->num_cpu);
+ qdev_prop_set_uint32(gicdev, "num-irq", s->num_irq);
+ qdev_init_nofail(gicdev);
+ gicbusdev = SYS_BUS_DEVICE(&s->gic);
/* Pass through outbound IRQ lines from the GIC */
sysbus_pass_irq(dev, gicbusdev);
@@ -107,9 +114,9 @@ static int a9mp_priv_init(SysBusDevice *dev)
for (i = 0; i < s->num_cpu; i++) {
int ppibase = (s->num_irq - 32) + i * 32;
sysbus_connect_irq(timerbusdev, i,
- qdev_get_gpio_in(s->gic, ppibase + 29));
+ qdev_get_gpio_in(gicdev, ppibase + 29));
sysbus_connect_irq(wdtbusdev, i,
- qdev_get_gpio_in(s->gic, ppibase + 30));
+ qdev_get_gpio_in(gicdev, ppibase + 30));
}
return 0;
}
--
1.8.1.4
- [Qemu-devel] [PATCH v4 00/24] arm: ARM11MPCore+A9MPCore+A15MPCore QOM'ification, Andreas Färber, 2013/09/11
- [Qemu-devel] [PATCH v4 04/24] a9scu: QOM cleanups, Andreas Färber, 2013/09/11
- [Qemu-devel] [PATCH v4 02/24] arm_gic: Extract headers hw/intc/arm_gic{, _common}.h, Andreas Färber, 2013/09/11
- [Qemu-devel] [PATCH v4 15/24] arm11mpcore: Fix typo in MemoryRegion name, Andreas Färber, 2013/09/11
- [Qemu-devel] [PATCH v4 17/24] arm11mpcore: Create container MemoryRegion in instance_init, Andreas Färber, 2013/09/11
- [Qemu-devel] [PATCH v4 14/24] a9scu: Build only once, Andreas Färber, 2013/09/11
- [Qemu-devel] [PATCH v4 18/24] arm11mpcore: Split off SCU device, Andreas Färber, 2013/09/11
- [Qemu-devel] [PATCH v4 13/24] a15mpcore: Prepare for QOM embedding, Andreas Färber, 2013/09/11
- [Qemu-devel] [PATCH v4 16/24] arm11mpcore: Drop unused fields, Andreas Färber, 2013/09/11
- [Qemu-devel] [PATCH v4 03/24] a9mpcore: Embed GICState,
Andreas Färber <=
- [Qemu-devel] [PATCH v4 06/24] arm_mptimer: Convert to QOM realize, Andreas Färber, 2013/09/11
- [Qemu-devel] [PATCH v4 09/24] a9mpcore: Prepare for QOM embedding, Andreas Färber, 2013/09/11
- [Qemu-devel] [PATCH v4 05/24] a9mpcore: Embed A9SCUState, Andreas Färber, 2013/09/11
- [Qemu-devel] [PATCH v4 12/24] a15mpcore: Convert to QOM realize, Andreas Färber, 2013/09/11
- [Qemu-devel] [PATCH v4 19/24] arm11mpcore: Convert ARM11MPCorePriveState to QOM realize, Andreas Färber, 2013/09/11
- [Qemu-devel] [PATCH v4 07/24] a9mpcore: Embed ARMMPTimerState, Andreas Färber, 2013/09/11
- [Qemu-devel] [PATCH v4 21/24] realview_gic: Prepare for QOM embedding, Andreas Färber, 2013/09/11
- [Qemu-devel] [PATCH v4 20/24] realview_gic: Convert to QOM realize, Andreas Färber, 2013/09/11
- [Qemu-devel] [PATCH v4 11/24] a15mpcore: Embed GICState, Andreas Färber, 2013/09/11
- [Qemu-devel] [PATCH v4 22/24] arm11mpcore: Convert mpcore_rirq_state to QOM realize, Andreas Färber, 2013/09/11