Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

1 files changed, 97 insertions, 10 deletions

diff --git a/drivers/message/fusion/mptscsih.c b/drivers/message/fusion/mptscsih.c
index c29578614504..6796597dcee0 100644
--- a/drivers/message/fusion/mptscsih.c
+++ b/drivers/message/fusion/mptscsih.c
@@ -46,6 +46,7 @@
 
 #include <linux/module.h>
 #include <linux/kernel.h>
+#include <linux/slab.h>
 #include <linux/init.h>
 #include <linux/errno.h>
 #include <linux/kdev_t.h>
@@ -792,11 +793,36 @@ mptscsih_io_done(MPT_ADAPTER *ioc, MPT_FRAME_HDR *mf, MPT_FRAME_HDR *mr)
                          *  precedence!
                          */
                         sc->result = (DID_OK << 16) | scsi_status;
-                        if (scsi_state & MPI_SCSI_STATE_AUTOSENSE_VALID) {
-                                /* Have already saved the status and sense data
+                        if (!(scsi_state & MPI_SCSI_STATE_AUTOSENSE_VALID)) {
+
+                                /*
+                                 * For an Errata on LSI53C1030
+                                 * When the length of request data
+                                 * and transfer data are different
+                                 * with result of command (READ or VERIFY),
+                                 * DID_SOFT_ERROR is set.
                                  */
-                                ;
-                        } else {
+                                if (ioc->bus_type == SPI) {
+                                        if (pScsiReq->CDB[0] == READ_6  ||
+                                            pScsiReq->CDB[0] == READ_10 ||
+                                            pScsiReq->CDB[0] == READ_12 ||
+                                            pScsiReq->CDB[0] == READ_16 ||
+                                            pScsiReq->CDB[0] == VERIFY  ||
+                                            pScsiReq->CDB[0] == VERIFY_16) {
+                                                if (scsi_bufflen(sc) !=
+                                                        xfer_cnt) {
+                                                        sc->result =
+                                                        DID_SOFT_ERROR << 16;
+                                                    printk(KERN_WARNING "Errata"
+                                                    "on LSI53C1030 occurred."
+                                                    "sc->req_bufflen=0x%02x,"
+                                                    "xfer_cnt=0x%02x\n",
+                                                    scsi_bufflen(sc),
+                                                    xfer_cnt);
+                                                }
+                                        }
+                                }
+
                                 if (xfer_cnt < sc->underflow) {
                                         if (scsi_status == SAM_STAT_BUSY)
                                                 sc->result = SAM_STAT_BUSY;
@@ -835,7 +861,58 @@ mptscsih_io_done(MPT_ADAPTER *ioc, MPT_FRAME_HDR *mf, MPT_FRAME_HDR *mr)
                         sc->result = (DID_OK << 16) | scsi_status;
                         if (scsi_state == 0) {
                                 ;
-                        } else if (scsi_state & MPI_SCSI_STATE_AUTOSENSE_VALID) {
+                        } else if (scsi_state &
+                            MPI_SCSI_STATE_AUTOSENSE_VALID) {
+
+                                /*
+                                 * For potential trouble on LSI53C1030.
+                                 * (date:2007.xx.)
+                                 * It is checked whether the length of
+                                 * request data is equal to
+                                 * the length of transfer and residual.
+                                 * MEDIUM_ERROR is set by incorrect data.
+                                 */
+                                if ((ioc->bus_type == SPI) &&
+                                        (sc->sense_buffer[2] & 0x20)) {
+                                        u32      difftransfer;
+                                        difftransfer =
+                                        sc->sense_buffer[3] << 24 |
+                                        sc->sense_buffer[4] << 16 |
+                                        sc->sense_buffer[5] << 8 |
+                                        sc->sense_buffer[6];
+                                        if (((sc->sense_buffer[3] & 0x80) ==
+                                                0x80) && (scsi_bufflen(sc)
+                                                != xfer_cnt)) {
+                                                sc->sense_buffer[2] =
+                                                    MEDIUM_ERROR;
+                                                sc->sense_buffer[12] = 0xff;
+                                                sc->sense_buffer[13] = 0xff;
+                                                printk(KERN_WARNING"Errata"
+                                                "on LSI53C1030 occurred."
+                                                "sc->req_bufflen=0x%02x,"
+                                                "xfer_cnt=0x%02x\n" ,
+                                                scsi_bufflen(sc),
+                                                xfer_cnt);
+                                        }
+                                        if (((sc->sense_buffer[3] & 0x80)
+                                                != 0x80) &&
+                                                (scsi_bufflen(sc) !=
+                                                xfer_cnt + difftransfer)) {
+                                                sc->sense_buffer[2] =
+                                                        MEDIUM_ERROR;
+                                                sc->sense_buffer[12] = 0xff;
+                                                sc->sense_buffer[13] = 0xff;
+                                                printk(KERN_WARNING
+                                                "Errata on LSI53C1030 occurred"
+                                                "sc->req_bufflen=0x%02x,"
+                                                " xfer_cnt=0x%02x,"
+                                                "difftransfer=0x%02x\n",
+                                                scsi_bufflen(sc),
+                                                xfer_cnt,
+                                                difftransfer);
+                                        }
+                                }
+
                                 /*
                                  * If running against circa 200003dd 909 MPT f/w,
                                  * may get this (AUTOSENSE_VALID) for actual TASK_SET_FULL
@@ -1362,9 +1439,14 @@ mptscsih_qcmd(struct scsi_cmnd *SCpnt, void (*done)(struct scsi_cmnd *))
             && (vdevice->vtarget->tflags & MPT_TARGET_FLAGS_Q_YES)
             && (SCpnt->device->tagged_supported)) {
                 scsictl = scsidir | MPI_SCSIIO_CONTROL_SIMPLEQ;
-        } else {
+                if (SCpnt->request && SCpnt->request->ioprio) {
+                        if (((SCpnt->request->ioprio & 0x7) == 1) ||
+                                !(SCpnt->request->ioprio & 0x7))
+                                scsictl |= MPI_SCSIIO_CONTROL_HEADOFQ;
+                }
+        } else
                 scsictl = scsidir | MPI_SCSIIO_CONTROL_UNTAGGED;
-        }
+
 
         /* Use the above information to set up the message frame
          */
@@ -1720,7 +1802,7 @@ mptscsih_abort(struct scsi_cmnd * SCpnt)
                 dtmprintk(ioc, printk(MYIOC_s_DEBUG_FMT "task abort: "
                    "Command not in the active list! (sc=%p)\n", ioc->name,
                    SCpnt));
-                retval = 0;
+                retval = SUCCESS;
                 goto out;
         }
 
@@ -2275,11 +2357,12 @@ mptscsih_slave_destroy(struct scsi_device *sdev)
  *      mptscsih_change_queue_depth - This function will set a devices queue depth
  *      @sdev: per scsi_device pointer
  *      @qdepth: requested queue depth
+ *      @reason: calling context
  *
  *      Adding support for new 'change_queue_depth' api.
 */
 int
-mptscsih_change_queue_depth(struct scsi_device *sdev, int qdepth)
+mptscsih_change_queue_depth(struct scsi_device *sdev, int qdepth, int reason)
 {
         MPT_SCSI_HOST           *hd = shost_priv(sdev->host);
         VirtTarget              *vtarget;
@@ -2291,6 +2374,9 @@ mptscsih_change_queue_depth(struct scsi_device *sdev, int qdepth)
         starget = scsi_target(sdev);
         vtarget = starget->hostdata;
 
+        if (reason != SCSI_QDEPTH_DEFAULT)
+                return -EOPNOTSUPP;
+
         if (ioc->bus_type == SPI) {
                 if (!(vtarget->tflags & MPT_TARGET_FLAGS_Q_YES))
                         max_depth = 1;
@@ -2357,7 +2443,8 @@ mptscsih_slave_configure(struct scsi_device *sdev)
                     ioc->name, vtarget->negoFlags, vtarget->maxOffset,
                     vtarget->minSyncFactor));
 
-        mptscsih_change_queue_depth(sdev, MPT_SCSI_CMD_PER_DEV_HIGH);
+        mptscsih_change_queue_depth(sdev, MPT_SCSI_CMD_PER_DEV_HIGH,
+                                    SCSI_QDEPTH_DEFAULT);
         dsprintk(ioc, printk(MYIOC_s_DEBUG_FMT
                 "tagged %d, simple %d, ordered %d\n",
                 ioc->name,sdev->tagged_supported, sdev->simple_tags,