Commit 0358687b authored by Mark Cave-Ayland's avatar Mark Cave-Ayland Committed by David Gibson
Browse files

40p: add fixed IRQ routing for LSI SCSI device 



Whilst the PReP specification describes how all PCI IRQs are routed via IRQ
15 on the interrupt controller, the real 40p machine has a routing quirk in
that the LSI SCSI device is routed directly to IRQ 13.

Enable the external IRQ for the LSI SCSI device by wiring up the IRQ with
qdev to the relevant interrupt controller gpio.

Signed-off-by: default avatarMark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Acked-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: default avatarHervé Poussineau <hpoussin@reactos.org>
Tested-by: default avatarHervé Poussineau <hpoussin@reactos.org>
Signed-off-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
parent 3cc1b9cb

hw/ppc/prep.c

+6 −5
Original line number Diff line number Diff line
@@ -621,7 +621,7 @@ static void ibm_40p_init(MachineState *machine) 
    CPUPPCState *env = NULL;

    uint16_t cmos_checksum;

    PowerPCCPU *cpu;

    DeviceState *dev;

    DeviceState *dev, *i82378_dev;

    SysBusDevice *pcihost, *s;

    Nvram *m48t59 = NULL;

    PCIBus *pci_bus;
@@ -666,11 +666,11 @@ static void ibm_40p_init(MachineState *machine) 
    }



    /* PCI -> ISA bridge */

    dev = DEVICE(pci_create_simple(pci_bus, PCI_DEVFN(11, 0), "i82378"));

    qdev_connect_gpio_out(dev, 0,

    i82378_dev = DEVICE(pci_create_simple(pci_bus, PCI_DEVFN(11, 0), "i82378"));

    qdev_connect_gpio_out(i82378_dev, 0,

                          cpu->env.irq_inputs[PPC6xx_INPUT_INT]);

    sysbus_connect_irq(pcihost, 0, qdev_get_gpio_in(dev, 15));

    isa_bus = ISA_BUS(qdev_get_child_bus(dev, "isa.0"));

    sysbus_connect_irq(pcihost, 0, qdev_get_gpio_in(i82378_dev, 15));

    isa_bus = ISA_BUS(qdev_get_child_bus(i82378_dev, "isa.0"));



    /* Memory controller */

    dev = DEVICE(isa_create(isa_bus, "rs6000-mc"));
@@ -703,6 +703,7 @@ static void ibm_40p_init(MachineState *machine) 
        dev = DEVICE(pci_create_simple(pci_bus, PCI_DEVFN(1, 0),

                                       "lsi53c810"));

        lsi53c8xx_handle_legacy_cmdline(dev);

        qdev_connect_gpio_out(dev, 0, qdev_get_gpio_in(i82378_dev, 13));



        /* XXX: s3-trio at PCI_DEVFN(2, 0) */

        pci_vga_init(pci_bus);