motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-19 08:02:15 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

e500: ppce500_init_mpic() return device instead of IRQ array

Browse source 
Actual number of interrupt pins isn't known
in ppce500_init_mpic() so a hardcoded number
was used, which causes a crash with older openpic.

Instead, return the DeviceState* and change ppce500_init()
to call qdev_get_gpio_in() to get only the irq pins
which are needed.

Signed-off-by: Michael Davidsaver <mdavidsaver@gmail.com>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
Michael Davidsaver 2017-10-20 09:38:52 -05:00 • committed by David Gibson
parent 79b217dedb
commit c91c187f71
1 changed files with 13 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

32
hw/ppc/e500.c
View file

@ -729,15 +729,13 @@ static DeviceState *ppce500_init_mpic_kvm(PPCE500Params *params,
return dev; return dev;
} }
static qemu_irq *ppce500_init_mpic(MachineState *machine, PPCE500Params *params, static DeviceState *ppce500_init_mpic(MachineState *machine,
MemoryRegion *ccsr, qemu_irq **irqs) PPCE500Params *params,
MemoryRegion *ccsr,
qemu_irq **irqs)
{ {
qemu_irq *mpic;
DeviceState *dev = NULL; DeviceState *dev = NULL;
SysBusDevice *s; SysBusDevice *s;
int i;
mpic = g_new0(qemu_irq, 256);
if (kvm_enabled()) { if (kvm_enabled()) {
Error *err = NULL; Error *err = NULL;
@ -756,15 +754,11 @@ static qemu_irq *ppce500_init_mpic(MachineState *machine, PPCE500Params *params,
dev = ppce500_init_mpic_qemu(params, irqs); dev = ppce500_init_mpic_qemu(params, irqs);
} }
for (i = 0; i < 256; i++) {
mpic[i] = qdev_get_gpio_in(dev, i);
}
s = SYS_BUS_DEVICE(dev); s = SYS_BUS_DEVICE(dev);
memory_region_add_subregion(ccsr, MPC8544_MPIC_REGS_OFFSET, memory_region_add_subregion(ccsr, MPC8544_MPIC_REGS_OFFSET,
s->mmio[0].memory); s->mmio[0].memory);
return mpic; return dev;
} }
static void ppce500_power_off(void *opaque, int line, int on) static void ppce500_power_off(void *opaque, int line, int on)
@ -796,8 +790,8 @@ void ppce500_init(MachineState *machine, PPCE500Params *params)
/* irq num for pin INTA, INTB, INTC and INTD is 1, 2, 3 and /* irq num for pin INTA, INTB, INTC and INTD is 1, 2, 3 and
* 4 respectively */ * 4 respectively */
unsigned int pci_irq_nrs[PCI_NUM_PINS] = {1, 2, 3, 4}; unsigned int pci_irq_nrs[PCI_NUM_PINS] = {1, 2, 3, 4};
qemu_irq **irqs, *mpic; qemu_irq **irqs;
DeviceState *dev; DeviceState *dev, *mpicdev;
CPUPPCState *firstenv = NULL; CPUPPCState *firstenv = NULL;
MemoryRegion *ccsr_addr_space; MemoryRegion *ccsr_addr_space;
SysBusDevice *s; SysBusDevice *s;
@ -866,18 +860,18 @@ void ppce500_init(MachineState *machine, PPCE500Params *params)
memory_region_add_subregion(address_space_mem, params->ccsrbar_base, memory_region_add_subregion(address_space_mem, params->ccsrbar_base,
ccsr_addr_space); ccsr_addr_space);
mpic = ppce500_init_mpic(machine, params, ccsr_addr_space, irqs); mpicdev = ppce500_init_mpic(machine, params, ccsr_addr_space, irqs);
/* Serial */ /* Serial */
if (serial_hds[0]) { if (serial_hds[0]) {
serial_mm_init(ccsr_addr_space, MPC8544_SERIAL0_REGS_OFFSET, serial_mm_init(ccsr_addr_space, MPC8544_SERIAL0_REGS_OFFSET,
0, mpic[42], 399193, 0, qdev_get_gpio_in(mpicdev, 42), 399193,
serial_hds[0], DEVICE_BIG_ENDIAN); serial_hds[0], DEVICE_BIG_ENDIAN);
} }
if (serial_hds[1]) { if (serial_hds[1]) {
serial_mm_init(ccsr_addr_space, MPC8544_SERIAL1_REGS_OFFSET, serial_mm_init(ccsr_addr_space, MPC8544_SERIAL1_REGS_OFFSET,
0, mpic[42], 399193, 0, qdev_get_gpio_in(mpicdev, 42), 399193,
serial_hds[1], DEVICE_BIG_ENDIAN); serial_hds[1], DEVICE_BIG_ENDIAN);
} }
@ -895,7 +889,7 @@ void ppce500_init(MachineState *machine, PPCE500Params *params)
qdev_init_nofail(dev); qdev_init_nofail(dev);
s = SYS_BUS_DEVICE(dev); s = SYS_BUS_DEVICE(dev);
for (i = 0; i < PCI_NUM_PINS; i++) { for (i = 0; i < PCI_NUM_PINS; i++) {
sysbus_connect_irq(s, i, mpic[pci_irq_nrs[i]]); sysbus_connect_irq(s, i, qdev_get_gpio_in(mpicdev, pci_irq_nrs[i]));
} }
memory_region_add_subregion(ccsr_addr_space, MPC8544_PCI_REGS_OFFSET, memory_region_add_subregion(ccsr_addr_space, MPC8544_PCI_REGS_OFFSET,
@ -926,7 +920,7 @@ void ppce500_init(MachineState *machine, PPCE500Params *params)
dev = qdev_create(NULL, "mpc8xxx_gpio"); dev = qdev_create(NULL, "mpc8xxx_gpio");
s = SYS_BUS_DEVICE(dev); s = SYS_BUS_DEVICE(dev);
qdev_init_nofail(dev); qdev_init_nofail(dev);
sysbus_connect_irq(s, 0, mpic[MPC8XXX_GPIO_IRQ]); sysbus_connect_irq(s, 0, qdev_get_gpio_in(mpicdev, MPC8XXX_GPIO_IRQ));
memory_region_add_subregion(ccsr_addr_space, MPC8XXX_GPIO_OFFSET, memory_region_add_subregion(ccsr_addr_space, MPC8XXX_GPIO_OFFSET,
sysbus_mmio_get_region(s, 0)); sysbus_mmio_get_region(s, 0));
@ -946,7 +940,7 @@ void ppce500_init(MachineState *machine, PPCE500Params *params)
for (i = 0; i < params->platform_bus_num_irqs; i++) { for (i = 0; i < params->platform_bus_num_irqs; i++) {
int irqn = params->platform_bus_first_irq + i; int irqn = params->platform_bus_first_irq + i;
sysbus_connect_irq(s, i, mpic[irqn]); sysbus_connect_irq(s, i, qdev_get_gpio_in(mpicdev, irqn));
} }
memory_region_add_subregion(address_space_mem, memory_region_add_subregion(address_space_mem,