Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 34 insertions, 5 deletions

diff --git a/drivers/usb/storage/transport.c b/drivers/usb/storage/transport.c
index 64ec073e89de..e8ae21b2d387 100644
--- a/drivers/usb/storage/transport.c
+++ b/drivers/usb/storage/transport.c
@@ -642,7 +642,7 @@ void usb_stor_invoke_transport(struct scsi_cmnd *srb, struct us_data *us)
          * unless the operation involved a data-in transfer.  Devices
          * can signal most data-in errors by stalling the bulk-in pipe.
          */
-        if ((us->protocol == US_PR_CB || us->protocol == US_PR_DPCM_USB) &&
+        if ((us->protocol == USB_PR_CB || us->protocol == USB_PR_DPCM_USB) &&
                         srb->sc_data_direction != DMA_FROM_DEVICE) {
                 US_DEBUGP("-- CB transport device requiring auto-sense\n");
                 need_auto_sense = 1;
@@ -701,8 +701,8 @@ Retry_Sense:
                 scsi_eh_prep_cmnd(srb, &ses, NULL, 0, sense_size);
 
                 /* FIXME: we must do the protocol translation here */
-                if (us->subclass == US_SC_RBC || us->subclass == US_SC_SCSI ||
-                                us->subclass == US_SC_CYP_ATACB)
+                if (us->subclass == USB_SC_RBC || us->subclass == USB_SC_SCSI ||
+                                us->subclass == USB_SC_CYP_ATACB)
                         srb->cmd_len = 6;
                 else
                         srb->cmd_len = 12;
@@ -819,6 +819,35 @@ Retry_Sense:
                 }
         }
 
+        /*
+         * Some devices don't work or return incorrect data the first
+         * time they get a READ(10) command, or for the first READ(10)
+         * after a media change.  If the INITIAL_READ10 flag is set,
+         * keep track of whether READ(10) commands succeed.  If the
+         * previous one succeeded and this one failed, set the REDO_READ10
+         * flag to force a retry.
+         */
+        if (unlikely((us->fflags & US_FL_INITIAL_READ10) &&
+                        srb->cmnd[0] == READ_10)) {
+                if (srb->result == SAM_STAT_GOOD) {
+                        set_bit(US_FLIDX_READ10_WORKED, &us->dflags);
+                } else if (test_bit(US_FLIDX_READ10_WORKED, &us->dflags)) {
+                        clear_bit(US_FLIDX_READ10_WORKED, &us->dflags);
+                        set_bit(US_FLIDX_REDO_READ10, &us->dflags);
+                }
+
+                /*
+                 * Next, if the REDO_READ10 flag is set, return a result
+                 * code that will cause the SCSI core to retry the READ(10)
+                 * command immediately.
+                 */
+                if (test_bit(US_FLIDX_REDO_READ10, &us->dflags)) {
+                        clear_bit(US_FLIDX_REDO_READ10, &us->dflags);
+                        srb->result = DID_IMM_RETRY << 16;
+                        srb->sense_buffer[0] = 0;
+                }
+        }
+
         /* Did we transfer less than the minimum amount required? */
         if ((srb->result == SAM_STAT_GOOD || srb->sense_buffer[2] == 0) &&
                         scsi_bufflen(srb) - scsi_get_resid(srb) < srb->underflow)
@@ -926,7 +955,7 @@ int usb_stor_CB_transport(struct scsi_cmnd *srb, struct us_data *us)
         /* NOTE: CB does not have a status stage.  Silly, I know.  So
          * we have to catch this at a higher level.
          */
-        if (us->protocol != US_PR_CBI)
+        if (us->protocol != USB_PR_CBI)
                 return USB_STOR_TRANSPORT_GOOD;
 
         result = usb_stor_intr_transfer(us, us->iobuf, 2);
@@ -942,7 +971,7 @@ int usb_stor_CB_transport(struct scsi_cmnd *srb, struct us_data *us)
          * that this means we could be ignoring a real error on these
          * commands, but that can't be helped.
          */
-        if (us->subclass == US_SC_UFI) {
+        if (us->subclass == USB_SC_UFI) {
                 if (srb->cmnd[0] == REQUEST_SENSE ||
                     srb->cmnd[0] == INQUIRY)
                         return USB_STOR_TRANSPORT_GOOD;