xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

sdide: never timeout or retry scsi commands from the controller driver

Browse source 
this was a big mistake. we should never attempt to
timeout or retry a scsi command from the controller
driver because theres no way to tell how long a
command would take or if a command has side effects
when being retried.
This commit is contained in:
cinap_lenrek 2014-05-02 04:23:21 +02:00
parent 8fea0399b0
commit beb665051b
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
sys/src/9/pc/sdide.c
View file

@ -1115,11 +1115,14 @@ atapktio0(Drive *drive, SDreq *r)
atadmastart(ctlr, drive->write);
iunlock(ctlr);
if(iowait(drive, 30*1000, 0) <= 0){
ilock(ctlr);
while(iowait(drive, 30*1000, 1) == 0)
;
ilock(ctlr);
if(!ctlr->done){
rv = SDcheck;
ataabort(drive, 0);
} else
ilock(ctlr);
}
if(drive->error){
if(drive->pktdma)
atadmastop(ctlr);
@ -1128,12 +1131,11 @@ atapktio0(Drive *drive, SDreq *r)
}
iunlock(ctlr);
if(drive->status & Chk){
if(rv != SDcheck && drive->status & Chk){
rv = SDcheck;
if(drive->pktdma){
print("atapktio: disabling dma\n");
drive->dmactl = 0;
rv = SDretry;
}
}
return rv;