OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

hw/realview_gic: switch to sysbus GIC

Browse Source 
Switch the realview_gic device to the standalone sysbus GIC.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2012-04-13 11:39:08 +00:00
parent ddd761653b
commit fbbd05dc2a
1 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
hw/realview_gic.c
View File

@ -9,31 +9,45 @@
#include "sysbus.h" #include "sysbus.h"
#define LEGACY_INCLUDED_GIC
#include "arm_gic.c"
typedef struct { typedef struct {
gic_state gic; SysBusDevice busdev;
DeviceState *gic;
MemoryRegion container; MemoryRegion container;
} RealViewGICState; } RealViewGICState;
static void realview_gic_map_setup(RealViewGICState *s) static void realview_gic_set_irq(void *opaque, int irq, int level)
{ {
memory_region_init(&s->container, "realview-gic-container", 0x2000); RealViewGICState *s = (RealViewGICState *)opaque;
memory_region_add_subregion(&s->container, 0, &s->gic.cpuiomem[0]); qemu_set_irq(qdev_get_gpio_in(s->gic, irq), level);
memory_region_add_subregion(&s->container, 0x1000, &s->gic.iomem);
} }
static int realview_gic_init(SysBusDevice *dev) static int realview_gic_init(SysBusDevice *dev)
{ {
RealViewGICState *s = FROM_SYSBUSGIC(RealViewGICState, dev); RealViewGICState *s = FROM_SYSBUS(RealViewGICState, dev);
SysBusDevice *busdev;
/* The GICs on the RealView boards have a fixed nonconfigurable /* The GICs on the RealView boards have a fixed nonconfigurable
* number of interrupt lines, so we don't need to expose this as * number of interrupt lines, so we don't need to expose this as
* a qdev property. * a qdev property.
*/ */
gic_init(&s->gic, 1, 96); int numirq = 96;
realview_gic_map_setup(s);
s->gic = qdev_create(NULL, "arm_gic");
qdev_prop_set_uint32(s->gic, "num-cpu", 1);
qdev_prop_set_uint32(s->gic, "num-irq", numirq);
qdev_init_nofail(s->gic);
busdev = sysbus_from_qdev(s->gic);
/* Pass through outbound IRQ lines from the GIC */
sysbus_pass_irq(dev, busdev);
/* Pass through inbound GPIO lines to the GIC */
qdev_init_gpio_in(&s->busdev.qdev, realview_gic_set_irq, numirq - 32);
memory_region_init(&s->container, "realview-gic-container", 0x2000);
memory_region_add_subregion(&s->container, 0,
sysbus_mmio_get_region(busdev, 1));
memory_region_add_subregion(&s->container, 0x1000,
sysbus_mmio_get_region(busdev, 0));
sysbus_init_mmio(dev, &s->container); sysbus_init_mmio(dev, &s->container);
return 0; return 0;
} }