diff options
| author | cinap_lenrek <cinap_lenrek@gmx.de> | 2012-12-25 00:22:32 +0100 |
|---|---|---|
| committer | cinap_lenrek <cinap_lenrek@gmx.de> | 2012-12-25 00:22:32 +0100 |
| commit | e7348f8ed26c8cc66cebfc3e59ff237b95db2a7b (patch) | |
| tree | 27d29fb8b2a1c04de0632b8b2ffd750e5c7922da /sys/src/9/pc/sdiahci.c | |
| parent | f379992fcd7c34779faf278720906505d081e5c8 (diff) | |
sdiahci: prevent x301 dvd-ram from hanging machine
matushita dvd-ram on thinkpad x301 hangs on the inquiry command
done from scsiverify(). not sure whats wrong with it, but at least
this makes the machine boot.
Diffstat (limited to 'sys/src/9/pc/sdiahci.c')
| -rw-r--r-- | sys/src/9/pc/sdiahci.c | 30 |
1 files changed, 25 insertions, 5 deletions
diff --git a/sys/src/9/pc/sdiahci.c b/sys/src/9/pc/sdiahci.c index 292c29fb9..b7ae35777 100644 --- a/sys/src/9/pc/sdiahci.c +++ b/sys/src/9/pc/sdiahci.c @@ -16,7 +16,7 @@ #include "../port/led.h" #pragma varargck type "T" int -#define dprint(...) if(debug) iprint(__VA_ARGS__); else USED(debug) +#define dprint(...) if(debug) print(__VA_ARGS__); else USED(debug) #define idprint(...) if(prid) print(__VA_ARGS__); else USED(prid) #define aprint(...) if(datapi) print(__VA_ARGS__); else USED(datapi) #define ledprint(...) if(dled) print(__VA_ARGS__); else USED(dled) @@ -887,6 +887,9 @@ updatedrive(Drive *d) static void dstatus(Drive *d, int s) { + dprint("%s: dstatus: %s → %s from pc=%p\n", dnam(d), + diskstates[d->state], diskstates[s], getcallerpc(&d)); + ilock(d); d->state = s; iunlock(d); @@ -918,6 +921,8 @@ configdrive(Drive *d) break; } iunlock(d); + + dprint("%s: configdrive: %s\n", dnam(d), diskstates[d->state]); } static void @@ -1008,8 +1013,7 @@ enum { static void hangck(Drive *d) { - if((d->portm.feat & Datapi) == 0 && d->active && - d->totick != 0 && (long)(Ticks - d->totick) > 0){ + if(d->active && d->totick != 0 && (long)(Ticks - d->totick) > 0){ dprint("%s: drive hung [task %lux; ci %lux; serr %lux]\n", dnam(d), d->port->task, d->port->ci, d->port->serror); d->state = Dreset; @@ -1469,6 +1473,7 @@ iaverify(SDunit *u) while(waitready(d) == 1) esleep(1); + dprint("%s: iaveirfy: %s\n", dnam(d), diskstates[d->state]); if(d->portm.feat & Datapi) scsiverify(u); @@ -1488,6 +1493,7 @@ iaonline(SDunit *u) while(waitready(d) == 1) esleep(1); + dprint("%s: iaonline: %s\n", dnam(d), diskstates[d->state]); ilock(d); if(d->portm.feat & Datapi){ d->drivechange = 0; @@ -1710,7 +1716,7 @@ io(Drive *d, uint proto, int to, int interrupt) static int iariopkt(SDreq *r, Drive *d) { - int n, count, try, max; + int n, count, try, max, to; uchar *cmd; cmd = r->cmd; @@ -1720,13 +1726,27 @@ iariopkt(SDreq *r, Drive *d) count = r->dlen; max = 65536; + /* + * prevent iaonline() and iaverify() to hang forever by timing + * out inquiry and capacity commands after 5 seconds. problem + * occurs with MASUSHITA DVD-RAM UJ-844 on thinkpad x301 + */ + to = 0; + switch(cmd[0]){ + case 0x9e: if(cmd[1] != 0x10) break; + case 0x25: + case 0x12: + to = 5*1000; + break; + } + for(try = 0; try < 10; try++){ n = count; if(n > max) n = max; qlock(&d->portm); ahcibuildpkt(&d->portm, r, r->data, n); - r->status = io(d, Ppkt, 5000, 0); + r->status = io(d, Ppkt, to, 0); qunlock(&d->portm); switch(r->status){ case SDeio: |