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

Conflicts:
	litmus/sched_cedf.c

1 files changed, 15 insertions, 10 deletions

diff --git a/drivers/message/fusion/mptsas.c b/drivers/message/fusion/mptsas.c
index 83a5115f0251..7596aecd5072 100644
--- a/drivers/message/fusion/mptsas.c
+++ b/drivers/message/fusion/mptsas.c
@@ -307,7 +307,7 @@ mptsas_requeue_fw_event(MPT_ADAPTER *ioc, struct fw_event_work *fw_event,
         spin_unlock_irqrestore(&ioc->fw_event_lock, flags);
 }
 
-/* free memory assoicated to a sas firmware event */
+/* free memory associated to a sas firmware event */
 static void
 mptsas_free_fw_event(MPT_ADAPTER *ioc, struct fw_event_work *fw_event)
 {
@@ -1094,7 +1094,7 @@ mptsas_block_io_starget(struct scsi_target *starget)
 /**
  * mptsas_target_reset_queue
  *
- * Receive request for TARGET_RESET after recieving an firmware
+ * Receive request for TARGET_RESET after receiving an firmware
  * event NOT_RESPONDING_EVENT, then put command in link list
  * and queue if task_queue already in use.
  *
@@ -1146,7 +1146,7 @@ mptsas_target_reset_queue(MPT_ADAPTER *ioc,
  *
  * This function will delete scheduled target reset from the list and
  * try to send next target reset. This will be called from completion
- * context of any Task managment command.
+ * context of any Task management command.
  */
 
 void
@@ -1403,7 +1403,7 @@ mptsas_sas_enclosure_pg0(MPT_ADAPTER *ioc, struct mptsas_enclosure *enclosure,
 /**
  *      mptsas_add_end_device - report a new end device to sas transport layer
  *      @ioc: Pointer to MPT_ADAPTER structure
- *      @phy_info: decribes attached device
+ *      @phy_info: describes attached device
  *
  *      return (0) success (1) failure
  *
@@ -1481,7 +1481,7 @@ mptsas_add_end_device(MPT_ADAPTER *ioc, struct mptsas_phyinfo *phy_info)
 /**
  *      mptsas_del_end_device - report a deleted end device to sas transport layer
  *      @ioc: Pointer to MPT_ADAPTER structure
- *      @phy_info: decribes attached device
+ *      @phy_info: describes attached device
  *
  **/
 static void
@@ -1889,7 +1889,7 @@ mptsas_slave_alloc(struct scsi_device *sdev)
 }
 
 static int
-mptsas_qcmd(struct scsi_cmnd *SCpnt, void (*done)(struct scsi_cmnd *))
+mptsas_qcmd_lck(struct scsi_cmnd *SCpnt, void (*done)(struct scsi_cmnd *))
 {
         MPT_SCSI_HOST   *hd;
         MPT_ADAPTER     *ioc;
@@ -1913,6 +1913,8 @@ mptsas_qcmd(struct scsi_cmnd *SCpnt, void (*done)(struct scsi_cmnd *))
         return mptscsih_qcmd(SCpnt,done);
 }
 
+static DEF_SCSI_QCMD(mptsas_qcmd)
+
 /**
  *      mptsas_mptsas_eh_timed_out - resets the scsi_cmnd timeout
  *              if the device under question is currently in the
@@ -1971,7 +1973,6 @@ static struct scsi_host_template mptsas_driver_template = {
         .change_queue_depth             = mptscsih_change_queue_depth,
         .eh_abort_handler               = mptscsih_abort,
         .eh_device_reset_handler        = mptscsih_dev_reset,
-        .eh_bus_reset_handler           = mptscsih_bus_reset,
         .eh_host_reset_handler          = mptscsih_host_reset,
         .bios_param                     = mptscsih_bios_param,
         .can_queue                      = MPT_SAS_CAN_QUEUE,
@@ -3061,6 +3062,9 @@ static int mptsas_probe_one_phy(struct device *dev,
         case MPI_SAS_IOUNIT0_RATE_3_0:
                 phy->negotiated_linkrate = SAS_LINK_RATE_3_0_GBPS;
                 break;
+        case MPI_SAS_IOUNIT0_RATE_6_0:
+                phy->negotiated_linkrate = SAS_LINK_RATE_6_0_GBPS;
+                break;
         case MPI_SAS_IOUNIT0_RATE_SATA_OOB_COMPLETE:
         case MPI_SAS_IOUNIT0_RATE_UNKNOWN:
         default:
@@ -3689,7 +3693,8 @@ mptsas_send_link_status_event(struct fw_event_work *fw_event)
         }
 
         if (link_rate == MPI_SAS_IOUNIT0_RATE_1_5 ||
-            link_rate == MPI_SAS_IOUNIT0_RATE_3_0) {
+            link_rate == MPI_SAS_IOUNIT0_RATE_3_0 ||
+            link_rate == MPI_SAS_IOUNIT0_RATE_6_0) {
 
                 if (!port_info) {
                         if (ioc->old_sas_discovery_protocal) {
@@ -5007,7 +5012,6 @@ mptsas_event_process(MPT_ADAPTER *ioc, EventNotificationReply_t *reply)
                         (ioc_stat & MPI_IOCSTATUS_FLAG_LOG_INFO_AVAILABLE)) {
                         VirtTarget *vtarget = NULL;
                         u8              id, channel;
-                        u32      log_info = le32_to_cpu(reply->IOCLogInfo);
 
                         id = sas_event_data->TargetID;
                         channel = sas_event_data->Bus;
@@ -5018,7 +5022,8 @@ mptsas_event_process(MPT_ADAPTER *ioc, EventNotificationReply_t *reply)
                                     "LogInfo (0x%x) available for "
                                    "INTERNAL_DEVICE_RESET"
                                    "fw_id %d fw_channel %d\n", ioc->name,
-                                   log_info, id, channel));
+                                   le32_to_cpu(reply->IOCLogInfo),
+                                   id, channel));
                                 if (vtarget->raidVolume) {
                                         devtprintk(ioc, printk(MYIOC_s_DEBUG_FMT
                                         "Skipping Raid Volume for inDMD\n",