[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 3/5] hw/ppc/prep: Fix wiring of PIC -> CPU interrupt
From: |
Bernhard Beschow |
Subject: |
[PATCH 3/5] hw/ppc/prep: Fix wiring of PIC -> CPU interrupt |
Date: |
Sat, 4 Mar 2023 12:40:41 +0100 |
Commit cef2e7148e32 ("hw/isa/i82378: Remove intermediate IRQ forwarder")
passes s->cpu_intr to i8259_init() in i82378_realize() directly. However, s-
>cpu_intr isn't initialized yet since that happens after the south bridge's
pci_realize_and_unref() in board code. Fix this by initializing s->cpu_intr
before realizing the south bridge.
Fixes: cef2e7148e32 ("hw/isa/i82378: Remove intermediate IRQ forwarder")
Signed-off-by: Bernhard Beschow <shentey@gmail.com>
---
hw/ppc/prep.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c
index d00280c0f8..cfa47c1e44 100644
--- a/hw/ppc/prep.c
+++ b/hw/ppc/prep.c
@@ -270,9 +270,11 @@ static void ibm_40p_init(MachineState *machine)
}
/* PCI -> ISA bridge */
- i82378_dev = DEVICE(pci_create_simple(pci_bus, PCI_DEVFN(11, 0),
"i82378"));
+ i82378_dev = DEVICE(pci_new(PCI_DEVFN(11, 0), "i82378"));
qdev_connect_gpio_out(i82378_dev, 0,
qdev_get_gpio_in(DEVICE(cpu), PPC6xx_INPUT_INT));
+ qdev_realize_and_unref(i82378_dev, BUS(pci_bus), &error_fatal);
+
sysbus_connect_irq(pcihost, 0, qdev_get_gpio_in(i82378_dev, 15));
isa_bus = ISA_BUS(qdev_get_child_bus(i82378_dev, "isa.0"));
--
2.39.2
- [PATCH 0/5] Fix recent PIC -> CPU interrupt wiring regressions, Bernhard Beschow, 2023/03/04
- [PATCH 1/5] hw/isa/vt82c686: Fix wiring of PIC -> CPU interrupt, Bernhard Beschow, 2023/03/04
- [PATCH 2/5] hw/alpha/dp264: Fix wiring of PIC -> CPU interrupt, Bernhard Beschow, 2023/03/04
- [PATCH 3/5] hw/ppc/prep: Fix wiring of PIC -> CPU interrupt,
Bernhard Beschow <=
- [PATCH 4/5] hw/pci/pci: Remove multifunction parameter from pci_create_simple_multifunction(), Bernhard Beschow, 2023/03/04
- [PATCH 5/5] hw/pci/pci: Remove multifunction parameter from pci_new_multifunction(), Bernhard Beschow, 2023/03/04
- Re: [PATCH 0/5] Fix recent PIC -> CPU interrupt wiring regressions, Bernhard Beschow, 2023/03/04
- Re: [PATCH 0/5] Fix recent PIC -> CPU interrupt wiring regressions, BALATON Zoltan, 2023/03/04
- Re: [PATCH 0/5] Fix recent PIC -> CPU interrupt wiring regressions, Michael S. Tsirkin, 2023/03/05
- Re: [PATCH 0/5] Fix recent PIC -> CPU interrupt wiring regressions, Mark Cave-Ayland, 2023/03/06
- Re: [PATCH 0/5] Fix recent PIC -> CPU interrupt wiring regressions, Michael S. Tsirkin, 2023/03/07