Author: mav
Date: Tue Sep 29 05:23:26 2015
New Revision: 288354
URL: https://svnweb.freebsd.org/changeset/base/288354

Log:
  MFC r287819: Make CAM log errors that make it wait.
  
  Waiting can take minutes, and it would be good for user to know what is
  going on.

Modified:
  stable/10/sys/cam/scsi/scsi_all.c
  stable/10/sys/cam/scsi/scsi_all.h
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/cam/scsi/scsi_all.c
==============================================================================
--- stable/10/sys/cam/scsi/scsi_all.c   Tue Sep 29 05:03:24 2015        
(r288353)
+++ stable/10/sys/cam/scsi/scsi_all.c   Tue Sep 29 05:23:26 2015        
(r288354)
@@ -1079,7 +1079,7 @@ static struct asc_table_entry asc_table[
        { SST(0x04, 0x00, SS_RDEF,
            "Logical unit not ready, cause not reportable") },
        /* DTLPWROMAEBKVF */
-       { SST(0x04, 0x01, SS_TUR | SSQ_MANY | SSQ_DECREMENT_COUNT | EBUSY,
+       { SST(0x04, 0x01, SS_WAIT | EBUSY,
            "Logical unit is in process of becoming ready") },
        /* DTLPWROMAEBKVF */
        { SST(0x04, 0x02, SS_START | SSQ_DECREMENT_COUNT | ENXIO,
@@ -1106,7 +1106,7 @@ static struct asc_table_entry asc_table[
        { SST(0x04, 0x09, SS_RDEF,      /* XXX TBD */
            "Logical unit not ready, self-test in progress") },
        /* DTLPWROMAEBKVF */
-       { SST(0x04, 0x0A, SS_TUR | SSQ_MANY | SSQ_DECREMENT_COUNT | ENXIO,
+       { SST(0x04, 0x0A, SS_WAIT | ENXIO,
            "Logical unit not accessible, asymmetric access state transition")},
        /* DTLPWROMAEBKVF */
        { SST(0x04, 0x0B, SS_FATAL | ENXIO,
@@ -1121,7 +1121,7 @@ static struct asc_table_entry asc_table[
        { SST(0x04, 0x10, SS_RDEF,      /* XXX TBD */
            "Logical unit not ready, auxiliary memory not accessible") },
        /* DT  WRO AEB VF */
-       { SST(0x04, 0x11, SS_TUR | SSQ_MANY | SSQ_DECREMENT_COUNT | EBUSY,
+       { SST(0x04, 0x11, SS_WAIT | EBUSY,
            "Logical unit not ready, notify (enable spinup) required") },
        /*        M    V  */
        { SST(0x04, 0x12, SS_RDEF,      /* XXX TBD */

Modified: stable/10/sys/cam/scsi/scsi_all.h
==============================================================================
--- stable/10/sys/cam/scsi/scsi_all.h   Tue Sep 29 05:03:24 2015        
(r288353)
+++ stable/10/sys/cam/scsi/scsi_all.h   Tue Sep 29 05:23:26 2015        
(r288354)
@@ -103,6 +103,9 @@ typedef enum {
 /* The retyable, error action, with table specified error code */
 #define        SS_RET          SS_RETRY|SSQ_DECREMENT_COUNT|SSQ_PRINT_SENSE
 
+/* Wait for transient error status to change */
+#define        SS_WAIT         
SS_TUR|SSQ_MANY|SSQ_DECREMENT_COUNT|SSQ_PRINT_SENSE
+
 /* Fatal error action, with table specified error code */
 #define        SS_FATAL        SS_FAIL|SSQ_PRINT_SENSE
 
_______________________________________________
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"

Reply via email to