Revert "Merge remote-tracking branch 'linux-2.6.32.y/master' into develop"

[firefly-linux-kernel-4.4.55.git] / drivers / message / fusion / mptscsih.c

diff --git a/drivers/message/fusion/mptscsih.c b/drivers/message/fusion/mptscsih.c
index c29578614504dd5273ee745aa43bbd93a3110c59..56d98eb20a255c673f4491d64bf89e65c27d382e 100644 (file)
--- a/drivers/message/fusion/mptscsih.c
+++ b/drivers/message/fusion/mptscsih.c
@@ -792,11 +792,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 +860,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
@@ -1720,7 +1796,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;
        }
 
@@ -2363,6 +2439,8 @@ mptscsih_slave_configure(struct scsi_device *sdev)
                ioc->name,sdev->tagged_supported, sdev->simple_tags,
                sdev->ordered_tags));
 
+       blk_queue_dma_alignment (sdev->request_queue, 512 - 1);
+
        return 0;
 }