[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 07/13] hw/realview_gic: switch to sysbus GIC
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PATCH 07/13] hw/realview_gic: switch to sysbus GIC |
Date: |
Wed, 4 Apr 2012 16:30:56 +0100 |
Switch the realview_gic device to the standalone sysbus GIC.
Signed-off-by: Peter Maydell <address@hidden>
---
hw/realview_gic.c | 38 ++++++++++++++++++++++++++------------
1 files changed, 26 insertions(+), 12 deletions(-)
diff --git a/hw/realview_gic.c b/hw/realview_gic.c
index a3b5a04..5bc37a7 100644
--- a/hw/realview_gic.c
+++ b/hw/realview_gic.c
@@ -9,31 +9,45 @@
#include "sysbus.h"
-#define LEGACY_INCLUDED_GIC
-#include "arm_gic.c"
-
typedef struct {
- gic_state gic;
+ SysBusDevice busdev;
+ DeviceState *gic;
MemoryRegion container;
} 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);
- memory_region_add_subregion(&s->container, 0, &s->gic.cpuiomem[0]);
- memory_region_add_subregion(&s->container, 0x1000, &s->gic.iomem);
+ RealViewGICState *s = (RealViewGICState *)opaque;
+ qemu_set_irq(qdev_get_gpio_in(s->gic, irq), level);
}
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
* number of interrupt lines, so we don't need to expose this as
* a qdev property.
*/
- gic_init(&s->gic, 1, 96);
- realview_gic_map_setup(s);
+ int numirq = 96;
+
+ 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);
return 0;
}
--
1.7.1
- [Qemu-devel] [PATCH 00/13] Convert ARM GIC to sysbus device, Peter Maydell, 2012/04/04
- [Qemu-devel] [PATCH 02/13] hw/arm_gic: Move gic_get_current_cpu into arm_gic.c, Peter Maydell, 2012/04/04
- [Qemu-devel] [PATCH 12/13] hw/arm_gic.c: gic_set_pending_private() is NVIC only, Peter Maydell, 2012/04/04
- [Qemu-devel] [PATCH 10/13] hw/arm_gic: Make gic_reset a sysbus reset function, Peter Maydell, 2012/04/04
- [Qemu-devel] [PATCH 07/13] hw/realview_gic: switch to sysbus GIC,
Peter Maydell <=
- [Qemu-devel] [PATCH 06/13] hw/a9mpcore.c: Switch to using sysbus GIC, Peter Maydell, 2012/04/04
- [Qemu-devel] [PATCH 08/13] hw/exynos4210_gic.c: Convert to using sysbus GIC, Peter Maydell, 2012/04/04
- [Qemu-devel] [PATCH 05/13] hw/a15mpcore: switch to using sysbus GIC, Peter Maydell, 2012/04/04
- [Qemu-devel] [PATCH 13/13] hw/arm_gic.c: Remove stray hardcoded tab, Peter Maydell, 2012/04/04
- [Qemu-devel] [PATCH 11/13] hw/arm_gic.c: Use NVIC instead of LEGACY_INCLUDED_GIC define, Peter Maydell, 2012/04/04
- [Qemu-devel] [PATCH 04/13] arm_gic: Make the GIC its own sysbus device, Peter Maydell, 2012/04/04
- [Qemu-devel] [PATCH 03/13] hw/arm_gic.c: Expose PPI inputs as gpio inputs, Peter Maydell, 2012/04/04