2 files changed, 18 insertions, 0 deletions

diff --git a/drivers/scsi/mpt3sas/mpt3sas_base.c b/drivers/scsi/mpt3sas/mpt3sas_base.c
index 93d7c28f8162..b7f4e664f5f3 100644
--- a/drivers/scsi/mpt3sas/mpt3sas_base.c
+++ b/drivers/scsi/mpt3sas/mpt3sas_base.c
@@ -655,6 +655,9 @@ _base_display_event_data(struct MPT3SAS_ADAPTER *ioc,
         case MPI2_EVENT_TEMP_THRESHOLD:
                 desc = "Temperature Threshold";
                 break;
+        case MPI2_EVENT_ACTIVE_CABLE_EXCEPTION:
+                desc = "Active cable exception";
+                break;
         }
 
         if (!desc)
@@ -5424,6 +5427,8 @@ mpt3sas_base_attach(struct MPT3SAS_ADAPTER *ioc)
         _base_unmask_events(ioc, MPI2_EVENT_IR_OPERATION_STATUS);
         _base_unmask_events(ioc, MPI2_EVENT_LOG_ENTRY_ADDED);
         _base_unmask_events(ioc, MPI2_EVENT_TEMP_THRESHOLD);
+        if (ioc->hba_mpi_version_belonged == MPI26_VERSION)
+                _base_unmask_events(ioc, MPI2_EVENT_ACTIVE_CABLE_EXCEPTION);
 
         r = _base_make_ioc_operational(ioc, CAN_SLEEP);
         if (r)
diff --git a/drivers/scsi/mpt3sas/mpt3sas_scsih.c b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
index f2139e5604a3..4f2500b24c59 100644
--- a/drivers/scsi/mpt3sas/mpt3sas_scsih.c
+++ b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
@@ -7848,6 +7848,7 @@ mpt3sas_scsih_event_callback(struct MPT3SAS_ADAPTER *ioc, u8 msix_index,
         Mpi2EventNotificationReply_t *mpi_reply;
         u16 event;
         u16 sz;
+        Mpi26EventDataActiveCableExcept_t *ActiveCableEventData;
 
         /* events turned off due to host reset or driver unloading */
         if (ioc->remove_host || ioc->pci_error_recovery)
@@ -7960,6 +7961,18 @@ mpt3sas_scsih_event_callback(struct MPT3SAS_ADAPTER *ioc, u8 msix_index,
                         (Mpi2EventDataTemperature_t *)
                         mpi_reply->EventData);
                 break;
+        case MPI2_EVENT_ACTIVE_CABLE_EXCEPTION:
+                ActiveCableEventData =
+                    (Mpi26EventDataActiveCableExcept_t *) mpi_reply->EventData;
+                if (ActiveCableEventData->ReasonCode ==
+                                MPI26_EVENT_ACTIVE_CABLE_INSUFFICIENT_POWER)
+                        pr_info(MPT3SAS_FMT "Currently an active cable with ReceptacleID %d",
+                            ioc->name, ActiveCableEventData->ReceptacleID);
+                        pr_info("cannot be powered and devices connected to this active cable");
+                        pr_info("will not be seen. This active cable");
+                        pr_info("requires %d mW of power",
+                            ActiveCableEventData->ActiveCablePowerRequirement);
+                break;
 
         default: /* ignore the rest */
                 return 1;