commit 31a2dc69553136b01b51de23dd190c0f7b36de2a
author Bin Meng <bmeng.cn@gmail.com> Wed Jul 15 16:23:40 2015 +0800
committer Simon Glass <sjg@chromium.org> Tue Jul 28 10:36:22 2015 -0600
tree 26a8d8135614e91f2ddebeb776b3765fc0798418
parent 93f8a31186c9ff65aaf0dcf5410976df5d269c46

x86: pci: Assign pci irqs to all functions

We need walk through all functions within a PCI device and assign
their IRQs accordingly.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Acked-by: Simon Glass <sjg@chromium.org>

arch/x86/cpu/pci.c

diff --git a/arch/x86/cpu/pci.c b/arch/x86/cpu/pci.c
index c209f15..fdfd5f7 100644
--- a/arch/x86/cpu/pci.c
+++ b/arch/x86/cpu/pci.c
@@ -152,23 +152,30 @@
 	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);
+	}
 }

arch/x86/include/asm/pci.h

diff --git a/arch/x86/include/asm/pci.h b/arch/x86/include/asm/pci.h
index 56eaa25..f7e968e 100644
--- a/arch/x86/include/asm/pci.h
+++ b/arch/x86/include/asm/pci.h
@@ -72,11 +72,10 @@
  *
  * @bus:	PCI bus number
  * @device:	PCI device number
- * @func:	PCI function number
  * @irq:	An array of IRQ numbers that are assigned to INTA through
  *		INTD of this PCI device.
  */
-void pci_assign_irqs(int bus, int device, int func, u8 irq[4]);
+void pci_assign_irqs(int bus, int device, u8 irq[4]);
 
 #endif /* __ASSEMBLY__ */
 

arch/x86/lib/pirq_routing.c

diff --git a/arch/x86/lib/pirq_routing.c b/arch/x86/lib/pirq_routing.c
index 7a34dcf..ba41169 100644
--- a/arch/x86/lib/pirq_routing.c
+++ b/arch/x86/lib/pirq_routing.c
@@ -98,8 +98,7 @@
 		}
 
 		/* Bus, device, slots IRQs for {A,B,C,D} */
-		pci_assign_irqs(irq->bus, irq->devfn >> 3, irq->devfn & 7,
-				irq_slot);
+		pci_assign_irqs(irq->bus, irq->devfn >> 3, irq_slot);
 
 		irq++;
 	}