On 13/09/18 01:24, David Gibson wrote: > On Mon, Sep 10, 2018 at 09:46:31PM +0100, Mark Cave-Ayland wrote: >> 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: Mark Cave-Ayland <mark.cave-ayl...@ilande.co.uk> > > This doesn't apply clean to ppc-for-3.1 for me.
Indeed, see the Based-on header attached to the cover letter: it is dependent upon the lsi53c8xx_create() removal patchset at https://lists.gnu.org/archive/html/qemu-devel/2018-09/msg00797.html which Paolo has queued here: https://lists.gnu.org/archive/html/qemu-devel/2018-09/msg01209.html. Rather than having to juggle the order of pull requests, would it make sense for you to take the the lsi53c8xx_create() removal patchset via ppc-for-3.1 aswell? ATB, Mark. >> --- >> hw/ppc/prep.c | 11 ++++++----- >> 1 file changed, 6 insertions(+), 5 deletions(-) >> >> diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c >> index 615865e46c..94fc36b7ef 100644 >> --- a/hw/ppc/prep.c >> +++ b/hw/ppc/prep.c >> @@ -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); >
