summaryrefslogtreecommitdiff
path: root/arch/x86/cpu/pci.c
diff options
context:
space:
mode:
authorBin Meng <bmeng.cn@gmail.com>2015-07-15 08:23:40 (GMT)
committerSimon Glass <sjg@chromium.org>2015-07-28 16:36:22 (GMT)
commit31a2dc69553136b01b51de23dd190c0f7b36de2a (patch)
tree26a8d8135614e91f2ddebeb776b3765fc0798418 /arch/x86/cpu/pci.c
parent93f8a31186c9ff65aaf0dcf5410976df5d269c46 (diff)
downloadu-boot-fsl-qoriq-31a2dc69553136b01b51de23dd190c0f7b36de2a.tar.xz
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>
Diffstat (limited to 'arch/x86/cpu/pci.c')
-rw-r--r--arch/x86/cpu/pci.c27
1 files changed, 17 insertions, 10 deletions
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 @@ 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);
+ }
}