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

Avoid using tsleep() in the resume path as it may result in the

Browse Source 
system hanging if timer interrupts aren't running yet.

This allows my Thinkpad to resume successfully with APM.

Approved by:	 sos
MFC after:	 2 weeks
This commit is contained in:
Matthew N. Dodd 2005-02-07 17:14:42 +00:00
parent 76749b8672
commit 5b525a3230
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sys/dev/ata/ata-all.c
View File

@ -86,6 +86,7 @@ int ata_wc = 1;
static struct intr_config_hook *ata_delayed_attach = NULL;
static int ata_dma = 1;
static int atapi_dma = 1;
static int ata_resuming = 0;
/* sysctl vars */
SYSCTL_NODE(_hw, OID_AUTO, ata, CTLFLAG_RD, 0, "ATA driver parameters");
@ -364,8 +365,10 @@ ata_resume(device_t dev)
if (!dev || !(ch = device_get_softc(dev)))
return ENXIO;
ata_resuming = 1;
error = ata_reinit(ch);
ata_start(ch);
ata_resuming = 0;
return error;
}
@ -842,7 +845,7 @@ ata_boot_attach(void)
void
ata_udelay(int interval)
{
if (interval < (1000000/hz) || ata_delayed_attach)
if (interval < (1000000/hz) || ata_delayed_attach || ata_resuming)
DELAY(interval);
else
tsleep(&interval, PRIBIO, "ataslp", interval/(1000000/hz));