Module Name: src
Committed By: mlelstv
Date: Sun Oct 30 23:56:06 UTC 2016
Modified Files:
src/sys/dev/ic: aic7xxx_osm.c
Log Message:
Error recovery stops normal queue processing but didn't resume it
when the recovery succeeded. Add the missing calls to scsipi_channel_thaw
similar to kern/41867.
To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/sys/dev/ic/aic7xxx_osm.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ic/aic7xxx_osm.c
diff -u src/sys/dev/ic/aic7xxx_osm.c:1.37 src/sys/dev/ic/aic7xxx_osm.c:1.38
--- src/sys/dev/ic/aic7xxx_osm.c:1.37 Wed Feb 24 22:37:57 2010
+++ src/sys/dev/ic/aic7xxx_osm.c Sun Oct 30 23:56:05 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: aic7xxx_osm.c,v 1.37 2010/02/24 22:37:57 dyoung Exp $ */
+/* $NetBSD: aic7xxx_osm.c,v 1.38 2016/10/30 23:56:05 mlelstv Exp $ */
/*
* Bus independent FreeBSD shim for the aic7xxx based adaptec SCSI controllers
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aic7xxx_osm.c,v 1.37 2010/02/24 22:37:57 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aic7xxx_osm.c,v 1.38 2016/10/30 23:56:05 mlelstv Exp $");
#include <dev/ic/aic7xxx_osm.h>
#include <dev/ic/aic7xxx_inline.h>
@@ -258,6 +258,10 @@ ahc_done(struct ahc_softc *ahc, struct s
scsipi_printaddr(xs->xs_periph);
printf("%s: no longer in timeout, status = %x\n",
ahc_name(ahc), xs->status);
+
+ scsipi_channel_thaw(&ahc->sc_channel, 1);
+ if (ahc->features & AHC_TWIN)
+ scsipi_channel_thaw(&ahc->sc_channel_b, 1);
}
/* Don't clobber any existing error state */
