[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-ppc] [PATCH 7/9] PPC: e500: factor out mpic init code
From: |
Scott Wood |
Subject: |
[Qemu-ppc] [PATCH 7/9] PPC: e500: factor out mpic init code |
Date: |
Tue, 30 Apr 2013 20:48:30 -0500 |
KVM in-kernel MPIC support is going to expand this even more,
so let's keep it contained.
Signed-off-by: Scott Wood <address@hidden>
Signed-off-by: Alexander Graf <address@hidden>
---
hw/ppc/e500.c | 56 ++++++++++++++++++++++++++++++++++----------------------
1 file changed, 34 insertions(+), 22 deletions(-)
diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c
index c1bdb6b..14e0547 100644
--- a/hw/ppc/e500.c
+++ b/hw/ppc/e500.c
@@ -448,6 +448,38 @@ static void ppce500_cpu_reset(void *opaque)
mmubooke_create_initial_mapping(env);
}
+static qemu_irq *ppce500_init_mpic(PPCE500Params *params, MemoryRegion *ccsr,
+ qemu_irq **irqs)
+{
+ qemu_irq *mpic;
+ DeviceState *dev;
+ SysBusDevice *s;
+ int i, j, k;
+
+ mpic = g_new(qemu_irq, 256);
+ dev = qdev_create(NULL, "openpic");
+ qdev_prop_set_uint32(dev, "nb_cpus", smp_cpus);
+ qdev_prop_set_uint32(dev, "model", params->mpic_version);
+ qdev_init_nofail(dev);
+ s = SYS_BUS_DEVICE(dev);
+
+ k = 0;
+ for (i = 0; i < smp_cpus; i++) {
+ for (j = 0; j < OPENPIC_OUTPUT_NB; j++) {
+ sysbus_connect_irq(s, k++, irqs[i][j]);
+ }
+ }
+
+ for (i = 0; i < 256; i++) {
+ mpic[i] = qdev_get_gpio_in(dev, i);
+ }
+
+ memory_region_add_subregion(ccsr, MPC8544_MPIC_REGS_OFFSET,
+ s->mmio[0].memory);
+
+ return mpic;
+}
+
void ppce500_init(PPCE500Params *params)
{
MemoryRegion *address_space_mem = get_system_memory();
@@ -463,7 +495,7 @@ void ppce500_init(PPCE500Params *params)
target_ulong initrd_base = 0;
target_long initrd_size = 0;
target_ulong cur_base = 0;
- int i = 0, j, k;
+ int i;
unsigned int pci_irq_nrs[4] = {1, 2, 3, 4};
qemu_irq **irqs, *mpic;
DeviceState *dev;
@@ -538,27 +570,7 @@ void ppce500_init(PPCE500Params *params)
memory_region_add_subregion(address_space_mem, MPC8544_CCSRBAR_BASE,
ccsr_addr_space);
- /* MPIC */
- mpic = g_new(qemu_irq, 256);
- dev = qdev_create(NULL, "openpic");
- qdev_prop_set_uint32(dev, "nb_cpus", smp_cpus);
- qdev_prop_set_uint32(dev, "model", params->mpic_version);
- qdev_init_nofail(dev);
- s = SYS_BUS_DEVICE(dev);
-
- k = 0;
- for (i = 0; i < smp_cpus; i++) {
- for (j = 0; j < OPENPIC_OUTPUT_NB; j++) {
- sysbus_connect_irq(s, k++, irqs[i][j]);
- }
- }
-
- for (i = 0; i < 256; i++) {
- mpic[i] = qdev_get_gpio_in(dev, i);
- }
-
- memory_region_add_subregion(ccsr_addr_space, MPC8544_MPIC_REGS_OFFSET,
- s->mmio[0].memory);
+ mpic = ppce500_init_mpic(params, ccsr_addr_space, irqs);
/* Serial */
if (serial_hds[0]) {
--
1.7.10.4
- [Qemu-ppc] [PATCH v3 1/9] KVM: Don't assume that mpstate exists with in-kernel PIC always, Scott Wood, 2013/04/30
- [Qemu-ppc] [PATCH 3/9] linux-headers: update to kvm next, Scott Wood, 2013/04/30
- [Qemu-ppc] [PATCH 4/9] KVM: Export kvm_init_irq_routing, Scott Wood, 2013/04/30
- [Qemu-ppc] [PATCH 2/9] KVM: PPC: Add dummy kvm_arch_init_irq_routing(), Scott Wood, 2013/04/30
- [Qemu-ppc] [PATCH 5/9] KVM: MSI: Swap payload to native endianness, Scott Wood, 2013/04/30
- [Qemu-ppc] [PATCH 6/9] openpic: factor out some common defines into openpic.h, Scott Wood, 2013/04/30
- [Qemu-ppc] [PATCH 7/9] PPC: e500: factor out mpic init code,
Scott Wood <=
- [Qemu-ppc] [PATCH 8/9] kvm/openpic: in-kernel mpic support, Scott Wood, 2013/04/30
- [Qemu-ppc] [PATCH 9/9] KVM: PIC: Only commit irq routing when necessary, Scott Wood, 2013/04/30