[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-ppc] [PULL 06/11] ppc: Make uninorth interrupt swizzling identical

From: David Gibson
Subject: [Qemu-ppc] [PULL 06/11] ppc: Make uninorth interrupt swizzling identical to Grackle
Date: Wed, 23 Nov 2016 13:49:38 +1100

From: Benjamin Herrenschmidt <address@hidden>

It's currently broken as it uses an incorrect shift, it tries
to use the slot number but uses the top bits of the bus number

Note: Neither implementation matches what OpenBIOS ends up putting
in the device-tree either, which will have to be fixed separately.

This is not quite correct for modelling a real Mac since Apple
tend to tie all 4 interrupt lines of a slot together and have
separate interrupts for every slot and every motherboard devices
going straight to the PIC but we'll sort that out later.

Signed-off-by: Benjamin Herrenschmidt <address@hidden>
Reviewed-by: Thomas Huth <address@hidden>
Signed-off-by: David Gibson <address@hidden>
 hw/pci-host/uninorth.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/hw/pci-host/uninorth.c b/hw/pci-host/uninorth.c
index 7aac4d6..df342ac 100644
--- a/hw/pci-host/uninorth.c
+++ b/hw/pci-host/uninorth.c
@@ -62,9 +62,7 @@ typedef struct UNINState {
 static int pci_unin_map_irq(PCIDevice *pci_dev, int irq_num)
-    int devfn = pci_dev->devfn & 0x00FFFFFF;
-    return (((devfn >> 11) & 0x1F) + irq_num) & 3;
+    return (irq_num + (pci_dev->devfn >> 3)) & 3;
 static void pci_unin_set_irq(void *opaque, int irq_num, int level)

reply via email to

[Prev in Thread] Current Thread [Next in Thread]