Merge branch '6.2/scsi-queue' into 6.2/scsi-fixes

[linux-2.6-microblaze.git] / drivers / scsi / storvsc_drv.c

diff --git a/drivers/scsi/storvsc_drv.c b/drivers/scsi/storvsc_drv.c
index 0252ee2..22705eb 100644 (file)
--- a/drivers/scsi/storvsc_drv.c
+++ b/drivers/scsi/storvsc_drv.c
@@ -303,16 +303,21 @@ enum storvsc_request_type {
 };
 
 /*
- * SRB status codes and masks; a subset of the codes used here.
+ * SRB status codes and masks. In the 8-bit field, the two high order bits
+ * are flags, while the remaining 6 bits are an integer status code.  The
+ * definitions here include only the subset of the integer status codes that
+ * are tested for in this driver.
  */
-
 #define SRB_STATUS_AUTOSENSE_VALID     0x80
 #define SRB_STATUS_QUEUE_FROZEN                0x40
-#define SRB_STATUS_INVALID_LUN 0x20
-#define SRB_STATUS_SUCCESS     0x01
-#define SRB_STATUS_ABORTED     0x02
-#define SRB_STATUS_ERROR       0x04
-#define SRB_STATUS_DATA_OVERRUN        0x12
+
+/* SRB status integer codes */
+#define SRB_STATUS_SUCCESS             0x01
+#define SRB_STATUS_ABORTED             0x02
+#define SRB_STATUS_ERROR               0x04
+#define SRB_STATUS_INVALID_REQUEST     0x06
+#define SRB_STATUS_DATA_OVERRUN                0x12
+#define SRB_STATUS_INVALID_LUN         0x20
 
 #define SRB_STATUS(status) \
        (status & ~(SRB_STATUS_AUTOSENSE_VALID | SRB_STATUS_QUEUE_FROZEN))
@@ -969,38 +974,25 @@ static void storvsc_handle_error(struct vmscsi_request *vm_srb,
        void (*process_err_fn)(struct work_struct *work);
        struct hv_host_device *host_dev = shost_priv(host);
 
-       /*
-        * In some situations, Hyper-V sets multiple bits in the
-        * srb_status, such as ABORTED and ERROR. So process them
-        * individually, with the most specific bits first.
-        */
-
-       if (vm_srb->srb_status & SRB_STATUS_INVALID_LUN) {
-               set_host_byte(scmnd, DID_NO_CONNECT);
-               process_err_fn = storvsc_remove_lun;
-               goto do_work;
-       }
+       switch (SRB_STATUS(vm_srb->srb_status)) {
+       case SRB_STATUS_ERROR:
+       case SRB_STATUS_ABORTED:
+       case SRB_STATUS_INVALID_REQUEST:
+               if (vm_srb->srb_status & SRB_STATUS_AUTOSENSE_VALID) {
+                       /* Check for capacity change */
+                       if ((asc == 0x2a) && (ascq == 0x9)) {
+                               process_err_fn = storvsc_device_scan;
+                               /* Retry the I/O that triggered this. */
+                               set_host_byte(scmnd, DID_REQUEUE);
+                               goto do_work;
+                       }
 
-       if (vm_srb->srb_status & SRB_STATUS_ABORTED) {
-               if (vm_srb->srb_status & SRB_STATUS_AUTOSENSE_VALID &&
-                   /* Capacity data has changed */
-                   (asc == 0x2a) && (ascq == 0x9)) {
-                       process_err_fn = storvsc_device_scan;
                        /*
-                        * Retry the I/O that triggered this.
+                        * Otherwise, let upper layer deal with the
+                        * error when sense message is present
                         */
-                       set_host_byte(scmnd, DID_REQUEUE);
-                       goto do_work;
-               }
-       }
-
-       if (vm_srb->srb_status & SRB_STATUS_ERROR) {
-               /*
-                * Let upper layer deal with error when
-                * sense message is present.
-                */
-               if (vm_srb->srb_status & SRB_STATUS_AUTOSENSE_VALID)
                        return;
+               }
 
                /*
                 * If there is an error; offline the device since all
@@ -1023,6 +1015,13 @@ static void storvsc_handle_error(struct vmscsi_request *vm_srb,
                default:
                        set_host_byte(scmnd, DID_ERROR);
                }
+               return;
+
+       case SRB_STATUS_INVALID_LUN:
+               set_host_byte(scmnd, DID_NO_CONNECT);
+               process_err_fn = storvsc_remove_lun;
+               goto do_work;
+
        }
        return;