diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2009-11-22 14:14:12 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2009-11-22 14:14:12 +0000 |
| commit | 2c11f73dede318e822acc869f050872a3bce9c59 (patch) | |
| tree | bc79276a3887621718c2b035dc5adbf2daf52b93 /sys/dev/isa | |
| parent | ccc027bb2ba3e9fb45f59ef7ce17214694d0f665 (diff) | |
Bring last drivers fully into the NO_CCB world by replacing
TRY_AGAIN_LATER uses with equivalent NO_CCB. Eliminates confusion
between the two as was always intended. buf I/O's that can't be
started get pushed back onto the front of the queue and retried.
Others get sent back to originator as failures. No more epi-cycle
looping inside the SCSI midlayer hoping the problem goes away.
Various testers, no objection from miod@ as vs(4) was tested by
nick@.
Diffstat (limited to 'sys/dev/isa')
| -rw-r--r-- | sys/dev/isa/aha.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sys/dev/isa/aha.c b/sys/dev/isa/aha.c index 96638059bb6..4991f6e2112 100644 --- a/sys/dev/isa/aha.c +++ b/sys/dev/isa/aha.c @@ -1,4 +1,4 @@ -/* $OpenBSD: aha.c,v 1.64 2009/08/26 22:29:09 jasper Exp $ */ +/* $OpenBSD: aha.c,v 1.65 2009/11/22 14:14:11 krw Exp $ */ /* $NetBSD: aha.c,v 1.11 1996/05/12 23:51:23 mycroft Exp $ */ #undef AHADIAG @@ -1287,8 +1287,7 @@ aha_scsi_cmd(xs) if (bus_dmamap_load(sc->sc_dmat, ccb->dmam, xs->data, xs->datalen, NULL, BUS_DMA_NOWAIT) != 0) { aha_free_ccb(sc, ccb); - xs->error = XS_DRIVER_STUFFUP; - return (TRY_AGAIN_LATER); + return (NO_CCB); } for (seg = 0; seg < ccb->dmam->dm_nsegs; seg++) { ltophys(ccb->dmam->dm_segs[seg].ds_addr, |