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

Don't examine ACPI_STA_ENABLE bit of device's_STA object on initial

Browse Source 
state.  Instead, use ACPI_STA_PRESENT and ACPI_STA_FUNCTIONAL for it.
In some ACPI BIOS implementations, boot disabled devices don't have
ACPI_STA_ENABLE bit in _STA object.
Also it is not fatal if getting current IRQ of boot disabled devices
is failed in initial state.

And minor fixes.
This commit is contained in:
Mitsuru IWASAKI 2002-10-31 20:43:02 +00:00
parent 498d464fe9
commit 21ac81ad19
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -53,9 +53,9 @@ struct acpi_pci_link_entry {
UINT8 initial_irq; UINT8 initial_irq;
ACPI_RESOURCE possible_resources; ACPI_RESOURCE possible_resources;
UINT8 number_of_interrupts; UINT8 number_of_interrupts;
UINT8 interrupts[MAX_POSSIBLE_INTERRUPTS];; UINT8 interrupts[MAX_POSSIBLE_INTERRUPTS];
UINT8 sorted_irq[MAX_POSSIBLE_INTERRUPTS];; UINT8 sorted_irq[MAX_POSSIBLE_INTERRUPTS];
int references; int references;
int priority; int priority;
}; };
@ -370,7 +370,6 @@ acpi_pci_link_add_link(ACPI_HANDLE handle, struct acpi_prt_entry *entry)
ACPI_DEBUG_PRINT((ACPI_DB_WARN, ACPI_DEBUG_PRINT((ACPI_DB_WARN,
"couldn't get current IRQ from PCI interrupt link %s - %s\n", "couldn't get current IRQ from PCI interrupt link %s - %s\n",
acpi_name(handle), AcpiFormatException(error))); acpi_name(handle), AcpiFormatException(error)));
goto out;
} }
link->initial_irq = link->current_irq; link->initial_irq = link->current_irq;
@ -461,9 +460,9 @@ acpi_pci_link_add_prt(device_t pcidev, ACPI_PCI_ROUTING_TABLE *prt, int busno)
return_ACPI_STATUS (error); return_ACPI_STATUS (error);
} }
if (!(sta & ACPI_STA_ENABLE)) { if (!(sta & (ACPI_STA_PRESENT | ACPI_STA_FUNCTIONAL))) {
ACPI_DEBUG_PRINT((ACPI_DB_ERROR, ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
"PCI interrupt link is disabled - %s\n", "PCI interrupt link is not functional - %s\n",
acpi_name(handle))); acpi_name(handle)));
return_ACPI_STATUS (AE_ERROR); return_ACPI_STATUS (AE_ERROR);
} }