2 files changed, 63 insertions, 9 deletions

diff --git a/drivers/scsi/mpt2sas/mpt2sas_base.h b/drivers/scsi/mpt2sas/mpt2sas_base.h
index 89f944ac0028..6ce7020afa52 100644
--- a/drivers/scsi/mpt2sas/mpt2sas_base.h
+++ b/drivers/scsi/mpt2sas/mpt2sas_base.h
@@ -355,6 +355,7 @@ struct _internal_cmd {
  * @slot: number number
  * @phy: phy identifier provided in sas device page 0
  * @responding: used in _scsih_sas_device_mark_responding
+ * @pfa_led_on: flag for PFA LED status
  */
 struct _sas_device {
         struct list_head list;
@@ -373,6 +374,7 @@ struct _sas_device {
         u16     slot;
         u8      phy;
         u8      responding;
+        u8      pfa_led_on;
 };
 
 /**
diff --git a/drivers/scsi/mpt2sas/mpt2sas_scsih.c b/drivers/scsi/mpt2sas/mpt2sas_scsih.c
index db71b60e8a87..e7303edc3d8e 100644
--- a/drivers/scsi/mpt2sas/mpt2sas_scsih.c
+++ b/drivers/scsi/mpt2sas/mpt2sas_scsih.c
@@ -145,7 +145,7 @@ struct sense_info {
 };
 
 
-#define MPT2SAS_TURN_ON_FAULT_LED (0xFFFC)
+#define MPT2SAS_TURN_ON_PFA_LED (0xFFFC)
 #define MPT2SAS_PORT_ENABLE_COMPLETE (0xFFFD)
 #define MPT2SAS_REMOVE_UNRESPONDING_DEVICES (0xFFFF)
 /**
@@ -4308,7 +4308,7 @@ _scsih_scsi_ioc_info(struct MPT2SAS_ADAPTER *ioc, struct scsi_cmnd *scmd,
 #endif
 
 /**
- * _scsih_turn_on_fault_led - illuminate Fault LED
+ * _scsih_turn_on_pfa_led - illuminate PFA LED
  * @ioc: per adapter object
  * @handle: device handle
  * Context: process
@@ -4316,10 +4316,15 @@ _scsih_scsi_ioc_info(struct MPT2SAS_ADAPTER *ioc, struct scsi_cmnd *scmd,
  * Return nothing.
  */
 static void
-_scsih_turn_on_fault_led(struct MPT2SAS_ADAPTER *ioc, u16 handle)
+_scsih_turn_on_pfa_led(struct MPT2SAS_ADAPTER *ioc, u16 handle)
 {
         Mpi2SepReply_t mpi_reply;
         Mpi2SepRequest_t mpi_request;
+        struct _sas_device *sas_device;
+
+        sas_device = _scsih_sas_device_find_by_handle(ioc, handle);
+        if (!sas_device)
+                return;
 
         memset(&mpi_request, 0, sizeof(Mpi2SepRequest_t));
         mpi_request.Function = MPI2_FUNCTION_SCSI_ENCLOSURE_PROCESSOR;
@@ -4334,6 +4339,47 @@ _scsih_turn_on_fault_led(struct MPT2SAS_ADAPTER *ioc, u16 handle)
                 __FILE__, __LINE__, __func__);
                 return;
         }
+        sas_device->pfa_led_on = 1;
+
+
+        if (mpi_reply.IOCStatus || mpi_reply.IOCLogInfo) {
+                dewtprintk(ioc, printk(MPT2SAS_INFO_FMT
+                 "enclosure_processor: ioc_status (0x%04x), loginfo(0x%08x)\n",
+                 ioc->name, le16_to_cpu(mpi_reply.IOCStatus),
+                 le32_to_cpu(mpi_reply.IOCLogInfo)));
+                return;
+        }
+}
+
+/**
+ * _scsih_turn_off_pfa_led - turn off PFA LED
+ * @ioc: per adapter object
+ * @sas_device: sas device whose PFA LED has to turned off
+ * Context: process
+ *
+ * Return nothing.
+ */
+static void
+_scsih_turn_off_pfa_led(struct MPT2SAS_ADAPTER *ioc,
+        struct _sas_device *sas_device)
+{
+        Mpi2SepReply_t mpi_reply;
+        Mpi2SepRequest_t mpi_request;
+
+        memset(&mpi_request, 0, sizeof(Mpi2SepRequest_t));
+        mpi_request.Function = MPI2_FUNCTION_SCSI_ENCLOSURE_PROCESSOR;
+        mpi_request.Action = MPI2_SEP_REQ_ACTION_WRITE_STATUS;
+        mpi_request.SlotStatus = 0;
+        mpi_request.Slot = cpu_to_le16(sas_device->slot);
+        mpi_request.DevHandle = 0;
+        mpi_request.EnclosureHandle = cpu_to_le16(sas_device->enclosure_handle);
+        mpi_request.Flags = MPI2_SEP_REQ_FLAGS_ENCLOSURE_SLOT_ADDRESS;
+        if ((mpt2sas_base_scsi_enclosure_processor(ioc, &mpi_reply,
+            &mpi_request)) != 0) {
+                printk(MPT2SAS_ERR_FMT "failure at %s:%d/%s()!\n", ioc->name,
+                __FILE__, __LINE__, __func__);
+                return;
+        }
 
         if (mpi_reply.IOCStatus || mpi_reply.IOCLogInfo) {
                 dewtprintk(ioc, printk(MPT2SAS_INFO_FMT "enclosure_processor: "
@@ -4345,7 +4391,7 @@ _scsih_turn_on_fault_led(struct MPT2SAS_ADAPTER *ioc, u16 handle)
 }
 
 /**
- * _scsih_send_event_to_turn_on_fault_led - fire delayed event
+ * _scsih_send_event_to_turn_on_pfa_led - fire delayed event
  * @ioc: per adapter object
  * @handle: device handle
  * Context: interrupt.
@@ -4353,14 +4399,14 @@ _scsih_turn_on_fault_led(struct MPT2SAS_ADAPTER *ioc, u16 handle)
  * Return nothing.
  */
 static void
-_scsih_send_event_to_turn_on_fault_led(struct MPT2SAS_ADAPTER *ioc, u16 handle)
+_scsih_send_event_to_turn_on_pfa_led(struct MPT2SAS_ADAPTER *ioc, u16 handle)
 {
         struct fw_event_work *fw_event;
 
         fw_event = kzalloc(sizeof(struct fw_event_work), GFP_ATOMIC);
         if (!fw_event)
                 return;
-        fw_event->event = MPT2SAS_TURN_ON_FAULT_LED;
+        fw_event->event = MPT2SAS_TURN_ON_PFA_LED;
         fw_event->device_handle = handle;
         fw_event->ioc = ioc;
         _scsih_fw_event_add(ioc, fw_event);
@@ -4404,7 +4450,7 @@ _scsih_smart_predicted_fault(struct MPT2SAS_ADAPTER *ioc, u16 handle)
         spin_unlock_irqrestore(&ioc->sas_device_lock, flags);
 
         if (ioc->pdev->subsystem_vendor == PCI_VENDOR_ID_IBM)
-                _scsih_send_event_to_turn_on_fault_led(ioc, handle);
+                _scsih_send_event_to_turn_on_pfa_led(ioc, handle);
 
         /* insert into event log */
         sz = offsetof(Mpi2EventNotificationReply_t, EventData) +
@@ -5325,6 +5371,12 @@ _scsih_remove_device(struct MPT2SAS_ADAPTER *ioc,
 {
         struct MPT2SAS_TARGET *sas_target_priv_data;
 
+        if ((ioc->pdev->subsystem_vendor == PCI_VENDOR_ID_IBM) &&
+                (sas_device->pfa_led_on)) {
+                _scsih_turn_off_pfa_led(ioc, sas_device);
+                sas_device->pfa_led_on = 0;
+        }
+
         dewtprintk(ioc, printk(MPT2SAS_INFO_FMT "%s: enter: "
             "handle(0x%04x), sas_addr(0x%016llx)\n", ioc->name, __func__,
                 sas_device->handle, (unsigned long long)
@@ -7441,8 +7493,8 @@ _firmware_event_work(struct work_struct *work)
                 dewtprintk(ioc, printk(MPT2SAS_INFO_FMT "port enable: complete "
                     "from worker thread\n", ioc->name));
                 break;
-        case MPT2SAS_TURN_ON_FAULT_LED:
-                _scsih_turn_on_fault_led(ioc, fw_event->device_handle);
+        case MPT2SAS_TURN_ON_PFA_LED:
+                _scsih_turn_on_pfa_led(ioc, fw_event->device_handle);
                 break;
         case MPI2_EVENT_SAS_TOPOLOGY_CHANGE_LIST:
                 _scsih_sas_topology_change_event(ioc, fw_event);