1 files changed, 11 insertions, 6 deletions

diff --git a/sys/dev/isp/isp_freebsd.h b/sys/dev/isp/isp_freebsd.h
index dabf5bcc9375..a985addfc6f2 100644
--- a/sys/dev/isp/isp_freebsd.h
+++ b/sys/dev/isp/isp_freebsd.h
@@ -28,7 +28,7 @@
 #define	_ISP_FREEBSD_H
 
 #define	ISP_PLATFORM_VERSION_MAJOR	4
-#define	ISP_PLATFORM_VERSION_MINOR	7
+#define	ISP_PLATFORM_VERSION_MINOR	8
 
 
 #include <sys/param.h>
@@ -239,6 +239,7 @@ struct isposinfo {
 	XS_SETERR(ccb, CAM_REQ_INPROG), (ccb)->ccb_h.spriv_field0 = 0
 
 #define	XS_SAVE_SENSE(xs, sp)				\
+	(xs)->ccb_h.status |= CAM_AUTOSNS_VALID,	\
 	bcopy(sp->req_sense_data, &(xs)->sense_data,	\
 	    imin(XS_SNSLEN(xs), sp->req_sense_len))
 
@@ -345,19 +346,21 @@ isp_mbox_wait_complete(struct ispsoftc *isp)
 		isp->isp_osinfo.mboxwaiting = 1;
 #ifdef	ISP_SMPLOCK
 		(void) msleep(&isp->isp_osinfo.mboxwaiting,
-		    &isp->isp_osinfo.lock, PRIBIO, "isp_mboxwaiting", 5 * hz);
+		    &isp->isp_osinfo.lock, PRIBIO, "isp_mboxwaiting", 10 * hz);
 #else
 		(void) tsleep(&isp->isp_osinfo.mboxwaiting, PRIBIO,
-		    "isp_mboxwaiting", 5 * hz);
+		    "isp_mboxwaiting", 10 * hz);
 #endif
 		if (isp->isp_mboxbsy != 0) {
-			isp_prt(isp, ISP_LOGWARN, "interrupting mbox timeout");
+			isp_prt(isp, ISP_LOGWARN,
+			    "Interrupting Mailbox Command (0x%x) Timeout",
+			    isp->isp_lastmbxcmd);
 			isp->isp_mboxbsy = 0;
 		}
 		isp->isp_osinfo.mboxwaiting = 0;
 	} else {
 		int j;
-		for (j = 0; j < 60 * 2000; j++) {
+		for (j = 0; j < 60 * 10000; j++) {
 			if (isp_intr(isp) == 0) {
 				USEC_DELAY(500);
 			}
@@ -366,7 +369,9 @@ isp_mbox_wait_complete(struct ispsoftc *isp)
 			}
 		}
 		if (isp->isp_mboxbsy != 0) {
-			isp_prt(isp, ISP_LOGWARN, "polled mbox timeout");
+			isp_prt(isp, ISP_LOGWARN,
+			    "Polled Mailbox Command (0x%x) Timeout",
+			    isp->isp_lastmbxcmd);
 		}
 	}
 }