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

Only use the current value if there's one IRQ. Some systems return

Browse Source 
multiple IRQs (which is nonsense for _CRS) when the link hasn't been
programmed.  Before, this was a KASSERT.  A ServerWorks system was
seen returning IRQs of 0, 2 in response to _CRS before link setup.
Thanks to sam@ for quick testing and turnaround on this.

Tested by:	sam
This commit is contained in:
njl 2004-12-20 10:46:56 +00:00
parent 835198efc5
commit ccf722108f
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sys/dev/acpica/acpi_pci_link.c
View File

@ -236,17 +236,17 @@ link_add_crs(ACPI_RESOURCE *res, void *context)
link->l_res_index = req->res_index;
req->link_index++;
req->res_index++;
/*
* Only use the current value if there's one IRQ. Some
* systems return multiple IRQs (which is nonsense for _CRS)
* when the link hasn't been programmed.
*/
if (res->Id == ACPI_RSTYPE_IRQ) {
if (res->Data.Irq.NumberOfInterrupts > 0) {
KASSERT(res->Data.Irq.NumberOfInterrupts == 1,
("%s: too many interrupts", __func__));
if (res->Data.Irq.NumberOfInterrupts == 1)
link->l_irq = res->Data.Irq.Interrupts[0];
}
} else if (res->Data.ExtendedIrq.NumberOfInterrupts > 0) {
KASSERT(res->Data.ExtendedIrq.NumberOfInterrupts == 1,
("%s: too many interrupts", __func__));
} else if (res->Data.ExtendedIrq.NumberOfInterrupts == 1)
link->l_irq = res->Data.ExtendedIrq.Interrupts[0];
}
/*
* An IRQ of zero means that the link isn't routed.