diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2005-12-28 03:00:08 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2005-12-28 03:00:08 +0000 |
| commit | d3a64e3696b60044154040e36d3e5eba67509ea2 (patch) | |
| tree | 2cb93297085df3fb214a0dd4ec5e547e49d0e816 /sys/dev/ic/aic7xxx.c | |
| parent | 8d453ee5a037af528b2f4b5b1268af76ad5950ed (diff) | |
Strip out fancy timeout code that attempts to mimic FreeBSD's thread
based timeout handling. Use the simple timeout == bus reset model
instead. Also move verbose debug output inside #ifdef/#endif.
Fixes pulling out a raidctl disk causing a crash noted by kurt@.
Rebuilding the raid still problematic.
Reduces but does not eliminate crashes with 'smartctl -d scsi -a
/dev/rcd0c' seen by Sigfried H?versen.
Should only impact timeout handling. No change to normal processing.
Thanks to kurt@ and Sigfied for testing.
ok marco@
Diffstat (limited to 'sys/dev/ic/aic7xxx.c')
| -rw-r--r-- | sys/dev/ic/aic7xxx.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sys/dev/ic/aic7xxx.c b/sys/dev/ic/aic7xxx.c index e2dbc949fe4..4037f07a738 100644 --- a/sys/dev/ic/aic7xxx.c +++ b/sys/dev/ic/aic7xxx.c @@ -1,4 +1,4 @@ -/* $OpenBSD: aic7xxx.c,v 1.70 2005/12/04 03:56:17 krw Exp $ */ +/* $OpenBSD: aic7xxx.c,v 1.71 2005/12/28 03:00:07 krw Exp $ */ /* $NetBSD: aic7xxx.c,v 1.108 2003/11/02 11:07:44 wiz Exp $ */ /* @@ -40,7 +40,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGES. * - * $Id: aic7xxx.c,v 1.70 2005/12/04 03:56:17 krw Exp $ + * $Id: aic7xxx.c,v 1.71 2005/12/28 03:00:07 krw Exp $ */ /* * Ported from FreeBSD by Pascal Renauld, Network Storage Solutions, Inc. - April 2003 @@ -953,8 +953,7 @@ ahc_handle_seqint(struct ahc_softc *ahc, u_int intstat) devinfo.lun); scbindex = ahc_inb(ahc, SCB_TAG); scb = ahc_lookup_scb(ahc, scbindex); - if (scb != NULL - && (scb->flags & SCB_RECOVERY_SCB) != 0) + if (scb != NULL) /* * Ensure that we didn't put a second instance of this * SCB into the QINFIFO. |