[coreboot] r3674 - trunk/payloads/libpayload/drivers
svn at coreboot.org
svn at coreboot.org
Mon Oct 20 18:52:06 CEST 2008
Author: jcrouse
Date: 2008-10-20 18:52:06 +0200 (Mon, 20 Oct 2008)
New Revision: 3674
Modified:
trunk/payloads/libpayload/drivers/pci.c
Log:
[PATCH] libpayload: Fix the PCI search function
Remove a possiblity for evil recusion and fix the function and slot
definition in the PCI search loop
Signed-off-by: Jordan Crouse <jordan.crouse at amd.com>
Acked-by: Patrick Georgi <patrick.georgi at coresystems.de>
Modified: trunk/payloads/libpayload/drivers/pci.c
===================================================================
--- trunk/payloads/libpayload/drivers/pci.c 2008-10-20 16:51:43 UTC (rev 3673)
+++ trunk/payloads/libpayload/drivers/pci.c 2008-10-20 16:52:06 UTC (rev 3674)
@@ -75,27 +75,36 @@
unsigned char hdr;
for (devfn = 0; devfn < 0x100; devfn++) {
- val = pci_read_config32(PCI_DEV(bus, PCI_SLOT(devfn),
- PCI_FUNC(devfn)), REG_VENDOR_ID);
+ int func = devfn & 0x7;
+ int slot = (devfn >> 3) & 0x1f;
+ val = pci_read_config32(PCI_DEV(bus, slot, func),
+ REG_VENDOR_ID);
+
if (val == 0xffffffff || val == 0x00000000 ||
val == 0x0000ffff || val == 0xffff0000)
continue;
if (val == ((did << 16) | vid)) {
- *dev = PCI_DEV(bus, PCI_SLOT(devfn), PCI_FUNC(devfn));
+ *dev = PCI_DEV(bus, slot, func);
return 1;
}
- hdr = pci_read_config8(PCI_DEV(bus, PCI_SLOT(devfn),
- PCI_FUNC(devfn)), REG_HEADER_TYPE);
+ hdr = pci_read_config8(PCI_DEV(bus, slot, func),
+ REG_HEADER_TYPE);
hdr &= 0x7F;
if (hdr == HEADER_TYPE_BRIDGE || hdr == HEADER_TYPE_CARDBUS) {
unsigned int busses;
- busses = pci_read_config32(PCI_DEV(bus, PCI_SLOT(devfn),
- PCI_FUNC(devfn)), REG_PRIMARY_BUS);
- if (find_on_bus((busses >> 8) & 0xFF, vid, did, dev))
+ busses = pci_read_config32(PCI_DEV(bus, slot, func),
+ REG_PRIMARY_BUS);
+ busses = (busses >> 8) & 0xFF;
+
+ /* Avoid recursion if the new bus is the same as
+ * the old bus (insert lame The Who joke here) */
+
+ if ((busses != bus) &&
+ find_on_bus(busses, vid, did, dev))
return 1;
}
}
More information about the coreboot
mailing list