vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

2008-04-05 Pavel Roskin <proski@gnu.org>

Browse source 
* bus/pci.c (grub_pci_iterate): For multifunction devices, probe
	all 8 functions.  Otherwise, probe function 0 only.
This commit is contained in:
proski 2008-04-05 07:20:29 +00:00
parent 8b088a4c48
commit f6ce7629ad
2 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2008-04-05 Pavel Roskin <proski@gnu.org>
* bus/pci.c (grub_pci_iterate): For multifunction devices, probe
all 8 functions. Otherwise, probe function 0 only.
2008-04-04 Pavel Roskin <proski@gnu.org> 2008-04-04 Pavel Roskin <proski@gnu.org>
* commands/lspci.c (grub_lspci_iter): Print the bus number * commands/lspci.c (grub_lspci_iter): Print the bus number

12
bus/pci.c
View file

@ -34,12 +34,13 @@ grub_pci_iterate (grub_pci_iteratefunc_t hook)
int func; int func;
grub_pci_address_t addr; grub_pci_address_t addr;
grub_pci_id_t id; grub_pci_id_t id;
grub_uint32_t hdr;
for (bus = 0; bus < 256; bus++) for (bus = 0; bus < 256; bus++)
{ {
for (dev = 0; dev < 32; dev++) for (dev = 0; dev < 32; dev++)
{ {
for (func = 0; func < 3; func++) for (func = 0; func < 8; func++)
{ {
addr = grub_pci_make_address (bus, dev, func, 0); addr = grub_pci_make_address (bus, dev, func, 0);
id = grub_pci_read (addr); id = grub_pci_read (addr);
@ -50,6 +51,15 @@ grub_pci_iterate (grub_pci_iteratefunc_t hook)
if (hook (bus, dev, func, id)) if (hook (bus, dev, func, id))
return; return;
/* Probe only func = 0 if the device if not multifunction */
if (func == 0)
{
addr = grub_pci_make_address (bus, dev, func, 3);
hdr = grub_pci_read (addr);
if (!(hdr & 0x800000))
break;
}
} }
} }
} }