[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 11/24] a15mpcore: Embed GICState
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PATCH v4 11/24] a15mpcore: Embed GICState |
Date: |
Wed, 11 Sep 2013 16:37:27 +0200 |
From: Andreas Färber <address@hidden>
This covers both emulated and KVM GIC.
Prepares for QOM realize.
Signed-off-by: Andreas Färber <address@hidden>
---
hw/cpu/a15mpcore.c | 39 ++++++++++++++++++++++++---------------
1 file changed, 24 insertions(+), 15 deletions(-)
diff --git a/hw/cpu/a15mpcore.c b/hw/cpu/a15mpcore.c
index af29c35..b2614e7 100644
--- a/hw/cpu/a15mpcore.c
+++ b/hw/cpu/a15mpcore.c
@@ -20,6 +20,7 @@
#include "hw/sysbus.h"
#include "sysemu/kvm.h"
+#include "hw/intc/arm_gic.h"
/* A15MP private memory region. */
@@ -35,41 +36,49 @@ typedef struct A15MPPrivState {
uint32_t num_cpu;
uint32_t num_irq;
MemoryRegion container;
- DeviceState *gic;
+
+ GICState gic;
} A15MPPrivState;
static void a15mp_priv_set_irq(void *opaque, int irq, int level)
{
A15MPPrivState *s = (A15MPPrivState *)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 a15mp_priv_initfn(Object *obj)
{
SysBusDevice *sbd = SYS_BUS_DEVICE(obj);
A15MPPrivState *s = A15MPCORE_PRIV(obj);
+ DeviceState *gicdev;
+ const char *gictype = "arm_gic";
+
+ if (kvm_irqchip_in_kernel()) {
+ gictype = "kvm-arm-gic";
+ }
memory_region_init(&s->container, obj, "a15mp-priv-container", 0x8000);
sysbus_init_mmio(sbd, &s->container);
+
+ object_initialize(&s->gic, sizeof(s->gic), gictype);
+ gicdev = DEVICE(&s->gic);
+ qdev_set_parent_bus(gicdev, sysbus_get_default());
+ qdev_prop_set_uint32(gicdev, "revision", 2);
}
static int a15mp_priv_init(SysBusDevice *dev)
{
A15MPPrivState *s = A15MPCORE_PRIV(dev);
+ DeviceState *gicdev;
SysBusDevice *busdev;
- const char *gictype = "arm_gic";
int i;
- if (kvm_irqchip_in_kernel()) {
- gictype = "kvm-arm-gic";
- }
-
- s->gic = qdev_create(NULL, gictype);
- qdev_prop_set_uint32(s->gic, "num-cpu", s->num_cpu);
- qdev_prop_set_uint32(s->gic, "num-irq", s->num_irq);
- qdev_prop_set_uint32(s->gic, "revision", 2);
- qdev_init_nofail(s->gic);
- busdev = 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);
+ busdev = SYS_BUS_DEVICE(&s->gic);
/* Pass through outbound IRQ lines from the GIC */
sysbus_pass_irq(dev, busdev);
@@ -87,10 +96,10 @@ static int a15mp_priv_init(SysBusDevice *dev)
* since a real A15 always has TrustZone but QEMU doesn't.
*/
qdev_connect_gpio_out(cpudev, 0,
- qdev_get_gpio_in(s->gic, ppibase + 30));
+ qdev_get_gpio_in(gicdev, ppibase + 30));
/* virtual timer */
qdev_connect_gpio_out(cpudev, 1,
- qdev_get_gpio_in(s->gic, ppibase + 27));
+ qdev_get_gpio_in(gicdev, ppibase + 27));
}
/* Memory map (addresses are offsets from PERIPHBASE):
--
1.8.1.4
- [Qemu-devel] [PATCH v4 16/24] arm11mpcore: Drop unused fields, (continued)
- [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, 2013/09/11
- [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 <=
- [Qemu-devel] [PATCH v4 22/24] arm11mpcore: Convert mpcore_rirq_state to QOM realize, Andreas Färber, 2013/09/11
- [Qemu-devel] [PATCH v4 08/24] a9mpcore: Convert to QOM realize, Andreas Färber, 2013/09/11
- [Qemu-devel] [PATCH v4 10/24] a15mpcore: Split off instance_init, Andreas Färber, 2013/09/11
- [Qemu-devel] [PATCH v4 23/24] arm11mpcore: Prepare for QOM embedding, Andreas Färber, 2013/09/11
- [Qemu-devel] [PATCH v4 24/24] arm11mpcore: Split off RealView MPCore, Andreas Färber, 2013/09/11
- [Qemu-devel] [PATCH v4 01/24] a9mpcore: Split off instance_init, Andreas Färber, 2013/09/11
- Re: [Qemu-devel] [PATCH v4 00/24] arm: ARM11MPCore+A9MPCore+A15MPCore QOM'ification, Peter Maydell, 2013/09/13