d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MFS: I was confused. This code wasn't in -current after all.

Browse Source 
Merge in the irq 0 detection.  Add comment about why.

If we have irq 0, ignore it like we do irq 255.  Some BIOS writers aren't
careful like they should be.
This commit is contained in:
Warner Losh 2001-11-26 21:25:03 +00:00
parent ef2b805fcf
commit 1cf5f5552b
3 changed files with 42 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
sys/amd64/pci/pci_cfgreg.c
View File

@ -383,11 +383,20 @@ pci_cfgintr_search(struct PIR_entry *pe, int bus, int device, int matchpin, int
for (j = 0, childp = pci_children; j < pci_childcount; j++, childp++) { for (j = 0, childp = pci_children; j < pci_childcount; j++, childp++) {
if ((pci_get_bus(*childp) == bus) && if ((pci_get_bus(*childp) == bus) &&
(pci_get_slot(*childp) == device) && (pci_get_slot(*childp) == device) &&
(pci_get_intpin(*childp) == matchpin) && (pci_get_intpin(*childp) == matchpin)) {
((irq = pci_get_irq(*childp)) != 255)) { irq = pci_get_irq(*childp);
PRVERB(("pci_cfgintr_search: linked (%x) to configured irq %d at %d:%d:%d\n", /*
pe->pe_intpin[pin - 1].link, irq, * Some BIOS writers seem to want to ignore the spec and put
pci_get_bus(*childp), pci_get_slot(*childp), pci_get_function(*childp))); * 0 in the intline rather than 255 to indicate none. Once
* we've found one that matches, we break because there can
* be no others (which is why test looks a little odd).
*/
if (irq == 0)
irq = 255;
if (irq != 255)
PRVERB(("pci_cfgintr_search: linked (%x) to configured irq %d at %d:%d:%d\n",
pe->pe_intpin[pin - 1].link, irq,
pci_get_bus(*childp), pci_get_slot(*childp), pci_get_function(*childp)));
break; break;
} }
} }

19
sys/i386/pci/pci_cfgreg.c
View File

@ -383,11 +383,20 @@ pci_cfgintr_search(struct PIR_entry *pe, int bus, int device, int matchpin, int
for (j = 0, childp = pci_children; j < pci_childcount; j++, childp++) { for (j = 0, childp = pci_children; j < pci_childcount; j++, childp++) {
if ((pci_get_bus(*childp) == bus) && if ((pci_get_bus(*childp) == bus) &&
(pci_get_slot(*childp) == device) && (pci_get_slot(*childp) == device) &&
(pci_get_intpin(*childp) == matchpin) && (pci_get_intpin(*childp) == matchpin)) {
((irq = pci_get_irq(*childp)) != 255)) { irq = pci_get_irq(*childp);
PRVERB(("pci_cfgintr_search: linked (%x) to configured irq %d at %d:%d:%d\n", /*
pe->pe_intpin[pin - 1].link, irq, * Some BIOS writers seem to want to ignore the spec and put
pci_get_bus(*childp), pci_get_slot(*childp), pci_get_function(*childp))); * 0 in the intline rather than 255 to indicate none. Once
* we've found one that matches, we break because there can
* be no others (which is why test looks a little odd).
*/
if (irq == 0)
irq = 255;
if (irq != 255)
PRVERB(("pci_cfgintr_search: linked (%x) to configured irq %d at %d:%d:%d\n",
pe->pe_intpin[pin - 1].link, irq,
pci_get_bus(*childp), pci_get_slot(*childp), pci_get_function(*childp)));
break; break;
} }
} }

19
sys/i386/pci/pci_pir.c
View File

@ -383,11 +383,20 @@ pci_cfgintr_search(struct PIR_entry *pe, int bus, int device, int matchpin, int
for (j = 0, childp = pci_children; j < pci_childcount; j++, childp++) { for (j = 0, childp = pci_children; j < pci_childcount; j++, childp++) {
if ((pci_get_bus(*childp) == bus) && if ((pci_get_bus(*childp) == bus) &&
(pci_get_slot(*childp) == device) && (pci_get_slot(*childp) == device) &&
(pci_get_intpin(*childp) == matchpin) && (pci_get_intpin(*childp) == matchpin)) {
((irq = pci_get_irq(*childp)) != 255)) { irq = pci_get_irq(*childp);
PRVERB(("pci_cfgintr_search: linked (%x) to configured irq %d at %d:%d:%d\n", /*
pe->pe_intpin[pin - 1].link, irq, * Some BIOS writers seem to want to ignore the spec and put
pci_get_bus(*childp), pci_get_slot(*childp), pci_get_function(*childp))); * 0 in the intline rather than 255 to indicate none. Once
* we've found one that matches, we break because there can
* be no others (which is why test looks a little odd).
*/
if (irq == 0)
irq = 255;
if (irq != 255)
PRVERB(("pci_cfgintr_search: linked (%x) to configured irq %d at %d:%d:%d\n",
pe->pe_intpin[pin - 1].link, irq,
pci_get_bus(*childp), pci_get_slot(*childp), pci_get_function(*childp)));
break; break;
} }
} }