x86: pci: Assign pci irqs to all functions

[karo-tx-uboot.git] / arch / x86 / cpu / pci.c

diff --git a/arch/x86/cpu/pci.c b/arch/x86/cpu/pci.c
index c209f15ec4a8787364080467fffed562eda65cc1..fdfd5f7b9cc85648227f0e1a1fdc50e3e49d1fde 100644 (file)
--- a/arch/x86/cpu/pci.c
+++ b/arch/x86/cpu/pci.c
@@ -152,23 +152,30 @@ int pci_x86_write_config(struct udevice *bus, pci_dev_t bdf, uint offset,
        return 0;
 }
 
-void pci_assign_irqs(int bus, int device, int func, u8 irq[4])
+void pci_assign_irqs(int bus, int device, u8 irq[4])
 {
        pci_dev_t bdf;
+       int func;
+       u16 vendor;
        u8 pin, line;
 
-       bdf = PCI_BDF(bus, device, func);
+       for (func = 0; func < 8; func++) {
+               bdf = PCI_BDF(bus, device, func);
+               vendor = x86_pci_read_config16(bdf, PCI_VENDOR_ID);
+               if (vendor == 0xffff || vendor == 0x0000)
+                       continue;
 
-       pin = x86_pci_read_config8(bdf, PCI_INTERRUPT_PIN);
+               pin = x86_pci_read_config8(bdf, PCI_INTERRUPT_PIN);
 
-       /* PCI spec says all values except 1..4 are reserved */
-       if ((pin < 1) || (pin > 4))
-               return;
+               /* PCI spec says all values except 1..4 are reserved */
+               if ((pin < 1) || (pin > 4))
+                       continue;
 
-       line = irq[pin - 1];
+               line = irq[pin - 1];
 
-       debug("Assigning IRQ %d to PCI device %d.%x.%d (INT%c)\n",
-             line, bus, device, func, 'A' + pin - 1);
+               debug("Assigning IRQ %d to PCI device %d.%x.%d (INT%c)\n",
+                     line, bus, device, func, 'A' + pin - 1);
 
-       x86_pci_write_config8(bdf, PCI_INTERRUPT_LINE, line);
+               x86_pci_write_config8(bdf, PCI_INTERRUPT_LINE, line);
+       }
 }