1 files changed, 41 insertions, 1 deletions

diff --git a/drivers/scsi/mpt3sas/mpt3sas_scsih.c b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
index 94261ee9e72d..5a97e3286719 100644
--- a/drivers/scsi/mpt3sas/mpt3sas_scsih.c
+++ b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
@@ -3,7 +3,8 @@
  *
  * This code is based on drivers/scsi/mpt3sas/mpt3sas_scsih.c
  * Copyright (C) 2012-2014  LSI Corporation
- *  (mailto:DL-MPTFusionLinux@lsi.com)
+ * Copyright (C) 2013-2014 Avago Technologies
+ *  (mailto: MPT-FusionLinux.pdl@avagotech.com)
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -2392,9 +2393,17 @@ _scsih_host_reset(struct scsi_cmnd *scmd)
             ioc->name, scmd);
         scsi_print_command(scmd);
 
+        if (ioc->is_driver_loading) {
+                pr_info(MPT3SAS_FMT "Blocking the host reset\n",
+                    ioc->name);
+                r = FAILED;
+                goto out;
+        }
+
         retval = mpt3sas_base_hard_reset_handler(ioc, CAN_SLEEP,
             FORCE_BIG_HAMMER);
         r = (retval < 0) ? FAILED : SUCCESS;
+out:
         pr_info(MPT3SAS_FMT "host reset: %s scmd(%p)\n",
             ioc->name, ((r == SUCCESS) ? "SUCCESS" : "FAILED"), scmd);
 
@@ -3342,6 +3351,31 @@ _scsih_check_volume_delete_events(struct MPT3SAS_ADAPTER *ioc,
 }
 
 /**
+ * _scsih_temp_threshold_events - display temperature threshold exceeded events
+ * @ioc: per adapter object
+ * @event_data: the temp threshold event data
+ * Context: interrupt time.
+ *
+ * Return nothing.
+ */
+static void
+_scsih_temp_threshold_events(struct MPT3SAS_ADAPTER *ioc,
+        Mpi2EventDataTemperature_t *event_data)
+{
+        if (ioc->temp_sensors_count >= event_data->SensorNum) {
+                pr_err(MPT3SAS_FMT "Temperature Threshold flags %s%s%s%s"
+                  " exceeded for Sensor: %d !!!\n", ioc->name,
+                  ((le16_to_cpu(event_data->Status) & 0x1) == 1) ? "0 " : " ",
+                  ((le16_to_cpu(event_data->Status) & 0x2) == 2) ? "1 " : " ",
+                  ((le16_to_cpu(event_data->Status) & 0x4) == 4) ? "2 " : " ",
+                  ((le16_to_cpu(event_data->Status) & 0x8) == 8) ? "3 " : " ",
+                  event_data->SensorNum);
+                pr_err(MPT3SAS_FMT "Current Temp In Celsius: %d\n",
+                        ioc->name, event_data->CurrentTemperature);
+        }
+}
+
+/**
  * _scsih_flush_running_cmds - completing outstanding commands.
  * @ioc: per adapter object
  *
@@ -7194,6 +7228,12 @@ mpt3sas_scsih_event_callback(struct MPT3SAS_ADAPTER *ioc, u8 msix_index,
         case MPI2_EVENT_IR_PHYSICAL_DISK:
                 break;
 
+        case MPI2_EVENT_TEMP_THRESHOLD:
+                _scsih_temp_threshold_events(ioc,
+                        (Mpi2EventDataTemperature_t *)
+                        mpi_reply->EventData);
+                break;
+
         default: /* ignore the rest */
                 return 1;
         }