From: Alexander Graf <agraf@suse.de>
Date: Wed, 12 Dec 2012 11:58:12 +0000 (+0100)
Subject: PPC: E500: PCI: Make IRQ calculation more generic
X-Git-Tag: v1.4.0-rc0~289^2~6
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=05f57d9de8e99bf5f7ca762c6dc2f1e054c2074c;p=qemu.git

PPC: E500: PCI: Make IRQ calculation more generic

The IRQ line calculation is more or less hardcoded today. Instead, let's
write it as an algorithmic function that theoretically allows an arbitrary
number of PCI slots.

Signed-off-by: Alexander Graf <agraf@suse.de>
---

diff --git a/hw/ppce500_pci.c b/hw/ppce500_pci.c
index 4cd4edc85..561a77661 100644
--- a/hw/ppce500_pci.c
+++ b/hw/ppce500_pci.c
@@ -253,17 +253,10 @@ static const MemoryRegionOps e500_pci_reg_ops = {
 
 static int mpc85xx_pci_map_irq(PCIDevice *pci_dev, int irq_num)
 {
-    int devno = pci_dev->devfn >> 3, ret = 0;
+    int devno = pci_dev->devfn >> 3;
+    int ret;
 
-    switch (devno) {
-        /* Two PCI slot */
-        case 0x11:
-        case 0x12:
-            ret = (irq_num + devno - 0x10) % 4;
-            break;
-        default:
-            printf("Error:%s:unknown dev number\n", __func__);
-    }
+    ret = (irq_num + devno) % 4;
 
     pci_debug("%s: devfn %x irq %d -> %d  devno:%x\n", __func__,
            pci_dev->devfn, irq_num, ret, devno);