9 files changed, 72 insertions, 64 deletions

diff --git a/drivers/message/fusion/lsi/mpi_log_sas.h b/drivers/message/fusion/lsi/mpi_log_sas.h
index 6be1f6b65777..af9da03e95e5 100644
--- a/drivers/message/fusion/lsi/mpi_log_sas.h
+++ b/drivers/message/fusion/lsi/mpi_log_sas.h
@@ -162,7 +162,7 @@
 #define PL_LOGINFO_SUB_CODE_FRAME_XFER_ERROR                 (0x00000400) /* Bits 0-3 encode Transport Status Register (offset 0x08) */
                                                                           /* Bit 0 is Status Bit 0: FrameXferErr */
                                                                           /* Bit 1 & 2 are Status Bits 16 and 17: FrameXmitErrStatus */
-                                                                          /* Bit 3 is Status Bit 18 WriteDataLenghtGTDataLengthErr */
+                                                                          /* Bit 3 is Status Bit 18 WriteDataLengthGTDataLengthErr */
 
 #define PL_LOGINFO_SUB_CODE_TX_FM_CONNECTED_LOW              (0x00000500)
 #define PL_LOGINFO_SUB_CODE_SATA_NON_NCQ_RW_ERR_BIT_SET      (0x00000600)
diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c
index 52fb216dfe74..425f60c21fdd 100644
--- a/drivers/message/fusion/mptbase.c
+++ b/drivers/message/fusion/mptbase.c
@@ -2056,7 +2056,7 @@ mpt_do_ioc_recovery(MPT_ADAPTER *ioc, u32 reason, int sleepFlag)
                                                 ddlprintk(ioc, printk(MYIOC_s_DEBUG_FMT
                                                     "mpt_upload:  alt_%s has cached_fw=%p \n",
                                                     ioc->name, ioc->alt_ioc->name, ioc->alt_ioc->cached_fw));
-                                                ioc->alt_ioc->cached_fw = NULL;
+                                                ioc->cached_fw = NULL;
                                         }
                                 } else {
                                         printk(MYIOC_s_WARN_FMT
@@ -2262,10 +2262,12 @@ mpt_adapter_disable(MPT_ADAPTER *ioc)
         int ret;
 
         if (ioc->cached_fw != NULL) {
-                ddlprintk(ioc, printk(MYIOC_s_INFO_FMT
-                    "mpt_adapter_disable: Pushing FW onto adapter\n", ioc->name));
-                if ((ret = mpt_downloadboot(ioc, (MpiFwHeader_t *)ioc->cached_fw, NO_SLEEP)) < 0) {
-                        printk(MYIOC_s_WARN_FMT "firmware downloadboot failure (%d)!\n",
+                ddlprintk(ioc, printk(MYIOC_s_DEBUG_FMT "%s: Pushing FW onto "
+                    "adapter\n", __FUNCTION__, ioc->name));
+                if ((ret = mpt_downloadboot(ioc, (MpiFwHeader_t *)
+                    ioc->cached_fw, CAN_SLEEP)) < 0) {
+                        printk(MYIOC_s_WARN_FMT
+                            ": firmware downloadboot failure (%d)!\n",
                             ioc->name, ret);
                 }
         }
@@ -2303,13 +2305,7 @@ mpt_adapter_disable(MPT_ADAPTER *ioc)
                 ioc->alloc_total -= sz;
         }
 
-        if (ioc->cached_fw != NULL) {
-                sz = ioc->facts.FWImageSize;
-                pci_free_consistent(ioc->pcidev, sz,
-                        ioc->cached_fw, ioc->cached_fw_dma);
-                ioc->cached_fw = NULL;
-                ioc->alloc_total -= sz;
-        }
+        mpt_free_fw_memory(ioc);
 
         kfree(ioc->spi_data.nvram);
         mpt_inactive_raid_list_free(ioc);
@@ -3047,44 +3043,62 @@ SendPortEnable(MPT_ADAPTER *ioc, int portnum, int sleepFlag)
  *
  *      If memory has already been allocated, the same (cached) value
  *      is returned.
- */
-void
+ *
+ *      Return 0 if successfull, or non-zero for failure
+ **/
+int
 mpt_alloc_fw_memory(MPT_ADAPTER *ioc, int size)
 {
-        if (ioc->cached_fw)
-                return;  /* use already allocated memory */
-        if (ioc->alt_ioc && ioc->alt_ioc->cached_fw) {
+        int rc;
+
+        if (ioc->cached_fw) {
+                rc = 0;  /* use already allocated memory */
+                goto out;
+        }
+        else if (ioc->alt_ioc && ioc->alt_ioc->cached_fw) {
                 ioc->cached_fw = ioc->alt_ioc->cached_fw;  /* use alt_ioc's memory */
                 ioc->cached_fw_dma = ioc->alt_ioc->cached_fw_dma;
-                ioc->alloc_total += size;
-                ioc->alt_ioc->alloc_total -= size;
+                rc = 0;
+                goto out;
+        }
+        ioc->cached_fw = pci_alloc_consistent(ioc->pcidev, size, &ioc->cached_fw_dma);
+        if (!ioc->cached_fw) {
+                printk(MYIOC_s_ERR_FMT "Unable to allocate memory for the cached firmware image!\n",
+                    ioc->name);
+                rc = -1;
         } else {
-                if ( (ioc->cached_fw = pci_alloc_consistent(ioc->pcidev, size, &ioc->cached_fw_dma) ) )
-                        ioc->alloc_total += size;
+                dinitprintk(ioc, printk(MYIOC_s_DEBUG_FMT "FW Image  @ %p[%p], sz=%d[%x] bytes\n",
+                    ioc->name, ioc->cached_fw, (void *)(ulong)ioc->cached_fw_dma, size, size));
+                ioc->alloc_total += size;
+                rc = 0;
         }
+ out:
+        return rc;
 }
+
 /**
  *      mpt_free_fw_memory - free firmware memory
  *      @ioc: Pointer to MPT_ADAPTER structure
  *
  *      If alt_img is NULL, delete from ioc structure.
  *      Else, delete a secondary image in same format.
- */
+ **/
 void
 mpt_free_fw_memory(MPT_ADAPTER *ioc)
 {
         int sz;
 
+        if (!ioc->cached_fw)
+                return;
+
         sz = ioc->facts.FWImageSize;
-        dinitprintk(ioc, printk(MYIOC_s_INFO_FMT "free_fw_memory: FW Image  @ %p[%p], sz=%d[%x] bytes\n",
-            ioc->name, ioc->cached_fw, (void *)(ulong)ioc->cached_fw_dma, sz, sz));
+        dinitprintk(ioc, printk(MYIOC_s_DEBUG_FMT "free_fw_memory: FW Image  @ %p[%p], sz=%d[%x] bytes\n",
+                 ioc->name, ioc->cached_fw, (void *)(ulong)ioc->cached_fw_dma, sz, sz));
         pci_free_consistent(ioc->pcidev, sz, ioc->cached_fw, ioc->cached_fw_dma);
+        ioc->alloc_total -= sz;
         ioc->cached_fw = NULL;
-
-        return;
 }
 
-
 /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
 /**
  *      mpt_do_upload - Construct and Send FWUpload request to MPT adapter port.
@@ -3116,17 +3130,12 @@ mpt_do_upload(MPT_ADAPTER *ioc, int sleepFlag)
         if ((sz = ioc->facts.FWImageSize) == 0)
                 return 0;
 
-        mpt_alloc_fw_memory(ioc, sz);
+        if (mpt_alloc_fw_memory(ioc, ioc->facts.FWImageSize) != 0)
+                return -ENOMEM;
 
         dinitprintk(ioc, printk(MYIOC_s_INFO_FMT ": FW Image  @ %p[%p], sz=%d[%x] bytes\n",
             ioc->name, ioc->cached_fw, (void *)(ulong)ioc->cached_fw_dma, sz, sz));
 
-        if (ioc->cached_fw == NULL) {
-                /* Major Failure.
-                 */
-                return -ENOMEM;
-        }
-
         prequest = (sleepFlag == NO_SLEEP) ? kzalloc(ioc->req_sz, GFP_ATOMIC) :
             kzalloc(ioc->req_sz, GFP_KERNEL);
         if (!prequest) {
@@ -3498,12 +3507,12 @@ KickStart(MPT_ADAPTER *ioc, int force, int sleepFlag)
 static int
 mpt_diag_reset(MPT_ADAPTER *ioc, int ignore, int sleepFlag)
 {
-        MPT_ADAPTER     *iocp=NULL;
         u32 diag0val;
         u32 doorbell;
         int hard_reset_done = 0;
         int count = 0;
         u32 diag1val = 0;
+        MpiFwHeader_t *cached_fw;       /* Pointer to FW */
 
         /* Clear any existing interrupts */
         CHIPREG_WRITE32(&ioc->chip->IntStatus, 0);
@@ -3635,22 +3644,24 @@ mpt_diag_reset(MPT_ADAPTER *ioc, int ignore, int sleepFlag)
                 }
 
                 if (ioc->cached_fw)
-                        iocp = ioc;
+                        cached_fw = (MpiFwHeader_t *)ioc->cached_fw;
                 else if (ioc->alt_ioc && ioc->alt_ioc->cached_fw)
-                        iocp = ioc->alt_ioc;
-                if (iocp) {
+                        cached_fw = (MpiFwHeader_t *)ioc->alt_ioc->cached_fw;
+                else
+                        cached_fw = NULL;
+                if (cached_fw) {
                         /* If the DownloadBoot operation fails, the
                          * IOC will be left unusable. This is a fatal error
                          * case.  _diag_reset will return < 0
                          */
                         for (count = 0; count < 30; count ++) {
-                                diag0val = CHIPREG_READ32(&iocp->chip->Diagnostic);
+                                diag0val = CHIPREG_READ32(&ioc->chip->Diagnostic);
                                 if (!(diag0val & MPI_DIAG_RESET_ADAPTER)) {
                                         break;
                                 }
 
                                 dprintk(ioc, printk(MYIOC_s_DEBUG_FMT "cached_fw: diag0val=%x count=%d\n",
-                                        iocp->name, diag0val, count));
+                                        ioc->name, diag0val, count));
                                 /* wait 1 sec */
                                 if (sleepFlag == CAN_SLEEP) {
                                         msleep (1000);
@@ -3658,8 +3669,7 @@ mpt_diag_reset(MPT_ADAPTER *ioc, int ignore, int sleepFlag)
                                         mdelay (1000);
                                 }
                         }
-                        if ((count = mpt_downloadboot(ioc,
-                                (MpiFwHeader_t *)iocp->cached_fw, sleepFlag)) < 0) {
+                        if ((count = mpt_downloadboot(ioc, cached_fw, sleepFlag)) < 0) {
                                 printk(MYIOC_s_WARN_FMT
                                         "firmware downloadboot failure (%d)!\n", ioc->name, count);
                         }
diff --git a/drivers/message/fusion/mptbase.h b/drivers/message/fusion/mptbase.h
index d7682e083f59..b49b706c0020 100644
--- a/drivers/message/fusion/mptbase.h
+++ b/drivers/message/fusion/mptbase.h
@@ -907,7 +907,7 @@ extern u32	 mpt_GetIocState(MPT_ADAPTER *ioc, int cooked);
 extern void      mpt_print_ioc_summary(MPT_ADAPTER *ioc, char *buf, int *size, int len, int showlan);
 extern int       mpt_HardResetHandler(MPT_ADAPTER *ioc, int sleepFlag);
 extern int       mpt_config(MPT_ADAPTER *ioc, CONFIGPARMS *cfg);
-extern void      mpt_alloc_fw_memory(MPT_ADAPTER *ioc, int size);
+extern int       mpt_alloc_fw_memory(MPT_ADAPTER *ioc, int size);
 extern void      mpt_free_fw_memory(MPT_ADAPTER *ioc);
 extern int       mpt_findImVolumes(MPT_ADAPTER *ioc);
 extern int       mptbase_sas_persist_operation(MPT_ADAPTER *ioc, u8 persist_opcode);
diff --git a/drivers/message/fusion/mptctl.c b/drivers/message/fusion/mptctl.c
index 6029509702d3..e630b50966ec 100644
--- a/drivers/message/fusion/mptctl.c
+++ b/drivers/message/fusion/mptctl.c
@@ -1708,7 +1708,7 @@ mptctl_replace_fw (unsigned long arg)
  *
  * Outputs:     None.
  * Return:      0 if successful
- *              -EBUSY  if previous command timout and IOC reset is not complete.
+ *              -EBUSY  if previous command timeout and IOC reset is not complete.
  *              -EFAULT if data unavailable
  *              -ENODEV if no such device/adapter
  *              -ETIME  if timer expires
@@ -1748,7 +1748,7 @@ mptctl_mpt_command (unsigned long arg)
  *
  * Outputs:     None.
  * Return:      0 if successful
- *              -EBUSY  if previous command timout and IOC reset is not complete.
+ *              -EBUSY  if previous command timeout and IOC reset is not complete.
  *              -EFAULT if data unavailable
  *              -ENODEV if no such device/adapter
  *              -ETIME  if timer expires
@@ -2316,7 +2316,7 @@ done_free_mem:
  * Outputs:     None.
  * Return:      0 if successful
  *              -EFAULT if data unavailable
- *              -EBUSY  if previous command timout and IOC reset is not complete.
+ *              -EBUSY  if previous command timeout and IOC reset is not complete.
  *              -ENODEV if no such device/adapter
  *              -ETIME  if timer expires
  *              -ENOMEM if memory allocation error
@@ -2553,7 +2553,7 @@ mptctl_hp_hostinfo(unsigned long arg, unsigned int data_size)
  * Outputs:     None.
  * Return:      0 if successful
  *              -EFAULT if data unavailable
- *              -EBUSY  if previous command timout and IOC reset is not complete.
+ *              -EBUSY  if previous command timeout and IOC reset is not complete.
  *              -ENODEV if no such device/adapter
  *              -ETIME  if timer expires
  *              -ENOMEM if memory allocation error
diff --git a/drivers/message/fusion/mptsas.c b/drivers/message/fusion/mptsas.c
index e4c94f93de16..f77b329f6923 100644
--- a/drivers/message/fusion/mptsas.c
+++ b/drivers/message/fusion/mptsas.c
@@ -1343,6 +1343,8 @@ static int mptsas_smp_handler(struct Scsi_Host *shost, struct sas_rphy *rphy,
                 smprep = (SmpPassthroughReply_t *)ioc->sas_mgmt.reply;
                 memcpy(req->sense, smprep, sizeof(*smprep));
                 req->sense_len = sizeof(*smprep);
+                req->data_len = 0;
+                rsp->data_len -= smprep->ResponseDataLength;
         } else {
                 printk(MYIOC_s_ERR_FMT "%s: smp passthru reply failed to be returned\n",
                     ioc->name, __FUNCTION__);
diff --git a/drivers/message/fusion/mptscsih.c b/drivers/message/fusion/mptscsih.c
index 626bb3c9af2b..af1de0ccee2f 100644
--- a/drivers/message/fusion/mptscsih.c
+++ b/drivers/message/fusion/mptscsih.c
@@ -111,7 +111,7 @@ int 		mptscsih_suspend(struct pci_dev *pdev, pm_message_t state);
 int             mptscsih_resume(struct pci_dev *pdev);
 #endif
 
-#define SNS_LEN(scp)    sizeof((scp)->sense_buffer)
+#define SNS_LEN(scp)    SCSI_SENSE_BUFFERSIZE
 
 /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
 /**
@@ -1736,7 +1736,7 @@ mptscsih_IssueTaskMgmt(MPT_SCSI_HOST *hd, u8 type, u8 channel, u8 id, int lun, i
  fail_out:
 
         /*
-         * Free task managment mf, and corresponding tm flags
+         * Free task management mf, and corresponding tm flags
          */
         mpt_free_msg_frame(ioc, mf);
         hd->tmPending = 0;
diff --git a/drivers/message/i2o/i2o_block.c b/drivers/message/i2o/i2o_block.c
index e4ad7a1c4fbd..a95314897402 100644
--- a/drivers/message/i2o/i2o_block.c
+++ b/drivers/message/i2o/i2o_block.c
@@ -412,13 +412,13 @@ static void i2o_block_delayed_request_fn(struct work_struct *work)
 /**
  *      i2o_block_end_request - Post-processing of completed commands
  *      @req: request which should be completed
- *      @uptodate: 1 for success, 0 for I/O error, < 0 for specific error
+ *      @error: 0 for success, < 0 for error
  *      @nr_bytes: number of bytes to complete
  *
  *      Mark the request as complete. The lock must not be held when entering.
  *
  */
-static void i2o_block_end_request(struct request *req, int uptodate,
+static void i2o_block_end_request(struct request *req, int error,
                                   int nr_bytes)
 {
         struct i2o_block_request *ireq = req->special;
@@ -426,22 +426,18 @@ static void i2o_block_end_request(struct request *req, int uptodate,
         struct request_queue *q = req->q;
         unsigned long flags;
 
-        if (end_that_request_chunk(req, uptodate, nr_bytes)) {
+        if (blk_end_request(req, error, nr_bytes)) {
                 int leftover = (req->hard_nr_sectors << KERNEL_SECTOR_SHIFT);
 
                 if (blk_pc_request(req))
                         leftover = req->data_len;
 
-                if (end_io_error(uptodate))
-                        end_that_request_chunk(req, 0, leftover);
+                if (error)
+                        blk_end_request(req, -EIO, leftover);
         }
 
-        add_disk_randomness(req->rq_disk);
-
         spin_lock_irqsave(q->queue_lock, flags);
 
-        end_that_request_last(req, uptodate);
-
         if (likely(dev)) {
                 dev->open_queue_depth--;
                 list_del(&ireq->queue);
@@ -468,7 +464,7 @@ static int i2o_block_reply(struct i2o_controller *c, u32 m,
                            struct i2o_message *msg)
 {
         struct request *req;
-        int uptodate = 1;
+        int error = 0;
 
         req = i2o_cntxt_list_get(c, le32_to_cpu(msg->u.s.tcntxt));
         if (unlikely(!req)) {
@@ -501,10 +497,10 @@ static int i2o_block_reply(struct i2o_controller *c, u32 m,
 
                 req->errors++;
 
-                uptodate = 0;
+                error = -EIO;
         }
 
-        i2o_block_end_request(req, uptodate, le32_to_cpu(msg->body[1]));
+        i2o_block_end_request(req, error, le32_to_cpu(msg->body[1]));
 
         return 1;
 };
diff --git a/drivers/message/i2o/i2o_scsi.c b/drivers/message/i2o/i2o_scsi.c
index aa6fb9429d58..1bcdbbb9e7d3 100644
--- a/drivers/message/i2o/i2o_scsi.c
+++ b/drivers/message/i2o/i2o_scsi.c
@@ -370,7 +370,7 @@ static int i2o_scsi_reply(struct i2o_controller *c, u32 m,
          */
         if (cmd->result)
                 memcpy(cmd->sense_buffer, &msg->body[3],
-                       min(sizeof(cmd->sense_buffer), (size_t) 40));
+                       min(SCSI_SENSE_BUFFERSIZE, 40));
 
         /* only output error code if AdapterStatus is not HBA_SUCCESS */
         if ((error >> 8) & 0xff)
diff --git a/drivers/message/i2o/iop.c b/drivers/message/i2o/iop.c
index 7814a06ae970..da715e11c1b2 100644
--- a/drivers/message/i2o/iop.c
+++ b/drivers/message/i2o/iop.c
@@ -916,7 +916,7 @@ static int i2o_parse_hrt(struct i2o_controller *c)
  *      status block. The status block could then be accessed through
  *      c->status_block.
  *
- *      Returns 0 on sucess or negative error code on failure.
+ *      Returns 0 on success or negative error code on failure.
  */
 int i2o_status_get(struct i2o_controller *c)
 {