scsi: mpt3sas: Display message before releasing diag buffer

Display message before releasing the diag buffer so that user knows which
event caused the release of diag buffer.

Releasing of diag buffer means HBA firmware stops posting the firmware logs
on the registered diag buffer.

Link: https://lore.kernel.org/r/1568379890-18347-3-git-send-email-sreekanth.reddy@broadcom.com
Signed-off-by: Sreekanth Reddy <sreekanth.reddy@broadcom.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
(cherry picked from commit 4bc50dc1afb7b77dfc80a1f8f0742b14d6f6e376)
Signed-off-by: Michael Reed <Michael.Reed@canonical.com>
BugLink: https://bugs.launchpad.net/bugs/1863574
Update mpt3sas Driver to 33.100.00.00

Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>

diff --git a/drivers/scsi/mpt3sas/mpt3sas_ctl.c b/drivers/scsi/mpt3sas/mpt3sas_ctl.c
index 9b2b639f0eb70baa3642d3bb542883b4366c4464..f39e56ce04cec10a918143b5bafaa5f8a12e0de0 100644 (file)
--- a/drivers/scsi/mpt3sas/mpt3sas_ctl.c
+++ b/drivers/scsi/mpt3sas/mpt3sas_ctl.c
@@ -466,6 +466,13 @@ void mpt3sas_ctl_pre_reset_handler(struct MPT3SAS_ADAPTER *ioc)
                if ((ioc->diag_buffer_status[i] &
                     MPT3_DIAG_BUFFER_IS_RELEASED))
                        continue;
+
+               /*
+                * add a log message to indicate the release
+                */
+               ioc_info(ioc,
+                   "%s: Releasing the trace buffer due to adapter reset.",
+                   __func__);
                mpt3sas_send_diag_release(ioc, i, &issue_reset);
        }
 }

diff --git a/drivers/scsi/mpt3sas/mpt3sas_trigger_diag.c b/drivers/scsi/mpt3sas/mpt3sas_trigger_diag.c
index 6ac453fd5937b0d97214a0367150100d8131ae98..8ec9bab20ec4a93b1ab24d3293e55d5eedff7eaa 100644 (file)
--- a/drivers/scsi/mpt3sas/mpt3sas_trigger_diag.c
+++ b/drivers/scsi/mpt3sas/mpt3sas_trigger_diag.c
@@ -113,15 +113,21 @@ mpt3sas_process_trigger_data(struct MPT3SAS_ADAPTER *ioc,
        struct SL_WH_TRIGGERS_EVENT_DATA_T *event_data)
 {
        u8 issue_reset = 0;
+       u32 *trig_data = (u32 *)&event_data->u.master;
 
        dTriggerDiagPrintk(ioc, ioc_info(ioc, "%s: enter\n", __func__));
 
        /* release the diag buffer trace */
        if ((ioc->diag_buffer_status[MPI2_DIAG_BUF_TYPE_TRACE] &
            MPT3_DIAG_BUFFER_IS_RELEASED) == 0) {
-               dTriggerDiagPrintk(ioc,
-                                  ioc_info(ioc, "%s: release trace diag buffer\n",
-                                           __func__));
+               /*
+                * add a log message so that user knows which event caused
+                * the release
+                */
+               ioc_info(ioc,
+                   "%s: Releasing the trace buffer. Trigger_Type 0x%08x, Data[0] 0x%08x, Data[1] 0x%08x\n",
+                   __func__, event_data->trigger_type,
+                   trig_data[0], trig_data[1]);
                mpt3sas_send_diag_release(ioc, MPI2_DIAG_BUF_TYPE_TRACE,
                    &issue_reset);
        }