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

Use polling spin loops for timeouts during early boot.

Browse Source 
Some ACPI operations such as mutex acquires and event waits accept a
timeout.  The ACPI OSD layer implements these timeouts by using regular
sleep timeouts.  However, this doesn't work during early boot before
event timers are setup.  Instead, use polling combined with DELAY()
to spin.

This fixes booting on upcoming Intel systems with Kaby Lake processors.

Tested by:	"Jeffrey E Pieper" <jeffrey.e.pieper@intel.com>
Reviewed by:	jimharris
MFC after:	1 week
This commit is contained in:
John Baldwin 2016-05-16 21:33:31 +00:00
parent f52cfd7fdf
commit ce83de10cb
1 changed files with 34 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
sys/dev/acpica/Osd/OsdSynch.c
View File

@ -188,6 +188,23 @@ AcpiOsWaitSemaphore(ACPI_SEMAPHORE Handle, UINT32 Units, UINT16 Timeout)
}
break;
default:
if (cold) {
/*
* Just spin polling the semaphore once a
* millisecond.
*/
while (!ACPISEM_AVAIL(as, Units)) {
if (Timeout == 0) {
status = AE_TIME;
break;
}
Timeout--;
mtx_unlock(&as->as_lock);
DELAY(1000);
mtx_lock(&as->as_lock);
}
break;
}
tmo = timeout2hz(Timeout);
while (!ACPISEM_AVAIL(as, Units)) {
prevtick = ticks;
@ -381,6 +398,23 @@ AcpiOsAcquireMutex(ACPI_MUTEX Handle, UINT16 Timeout)
}
break;
default:
if (cold) {
/*
* Just spin polling the mutex once a
* millisecond.
*/
while (!ACPIMTX_AVAIL(am)) {
if (Timeout == 0) {
status = AE_TIME;
break;
}
Timeout--;
mtx_unlock(&am->am_lock);
DELAY(1000);
mtx_lock(&am->am_lock);
}
break;
}
tmo = timeout2hz(Timeout);
while (!ACPIMTX_AVAIL(am)) {
prevtick = ticks;