Re: [PATCH 3/5] hw/ppc/prep: Fix wiring of PIC -> CPU interrupt

[Daniel Henrique Barboza]

On 3/4/23 08:40, Bernhard Beschow wrote:

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 <shen...@gmail.com>
---

Reviewed-by: Daniel Henrique Barboza <danielhb...@gmail.com>

And queued in ppc-next. Thanks,


Daniel

  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"));