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

While booting, use DELAY() for waiting for the EC to respond instead of

Browse Source 
msleep().  Until we're finally up, msleep is a no-op.

Explained by:	peter
This commit is contained in:
Nate Lawson 2004-06-28 20:41:30 +00:00
parent 9174ca7ba3
commit 636af3826f
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
sys/dev/acpica/acpi_ec.c
View File

@ -822,11 +822,18 @@ EcWaitEvent(struct acpi_ec_softc *sc, EC_EVENT Event)
AcpiOsStall(1);
/*
* Poll the EC status register to detect completion of the last
* command. First, wait up to 1 ms in chunks of sc->ec_polldelay
* microseconds.
* If we're up and running, wait up to 1 ms. Otherwise, burn the entire
* timeout value with delays since msleep() is a no-op.
*/
for (i = 0; i < 1000 / sc->ec_polldelay; i++) {
period = 1000 / sc->ec_polldelay;
if (cold)
period *= ec_poll_timeout;
/*
* Poll the EC status register to detect completion of the last
* command in chunks of ec_polldelay.
*/
for (i = 0; i < period; i++) {
EcStatus = EC_GET_CSR(sc);
if (EVENT_READY(Event, EcStatus)) {
Status = AE_OK;
@ -847,10 +854,10 @@ EcWaitEvent(struct acpi_ec_softc *sc, EC_EVENT Event)
sc->ec_polldelay = 100;
/*
* If we still don't have a response, wait up to ec_poll_timeout ms
* for completion, sleeping for chunks of 10 ms.
* If we still don't have a response and we're up and running, wait up
* to ec_poll_timeout ms for completion, sleeping for chunks of 10 ms.
*/
if (Status != AE_OK) {
if (!cold && Status != AE_OK) {
retval = -1;
for (i = 0; i < ec_poll_timeout / 10; i++) {
if (retval != 0)