summaryrefslogtreecommitdiffstats
path: root/sys/amd64/pci/pci_cfgreg.c
diff options
context:
space:
mode:
authorimp <imp@FreeBSD.org>2001-11-26 21:25:03 +0000
committerimp <imp@FreeBSD.org>2001-11-26 21:25:03 +0000
commitd60fa5f434d39572b6ea9de4953a228e3b87d41d (patch)
tree4daafeae568d86931e19b3f5c218b5957d49ab37 /sys/amd64/pci/pci_cfgreg.c
parent39356fa2d6f04d71d240b0b99a1201920917f34d (diff)
downloadFreeBSD-src-d60fa5f434d39572b6ea9de4953a228e3b87d41d.zip
FreeBSD-src-d60fa5f434d39572b6ea9de4953a228e3b87d41d.tar.gz
MFS: I was confused. This code wasn't in -current after all.
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.
Diffstat (limited to 'sys/amd64/pci/pci_cfgreg.c')
-rw-r--r--sys/amd64/pci/pci_cfgreg.c19
1 files changed, 14 insertions, 5 deletions
diff --git a/sys/amd64/pci/pci_cfgreg.c b/sys/amd64/pci/pci_cfgreg.c
index 3d5afb7..da1d208 100644
--- a/sys/amd64/pci/pci_cfgreg.c
+++ b/sys/amd64/pci/pci_cfgreg.c
@@ -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++) {
if ((pci_get_bus(*childp) == bus) &&
(pci_get_slot(*childp) == device) &&
- (pci_get_intpin(*childp) == matchpin) &&
- ((irq = pci_get_irq(*childp)) != 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)));
+ (pci_get_intpin(*childp) == matchpin)) {
+ irq = pci_get_irq(*childp);
+ /*
+ * Some BIOS writers seem to want to ignore the spec and put
+ * 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;
}
}
OpenPOWER on IntegriCloud