scsi: mpt3sas: print in which path firmware fault occurred

When Firmware fault occurs then print in which path firmware fault has
occurred. This will be useful while debugging the firmware fault issues.

Link: https://lore.kernel.org/r/20191226111333.26131-7-sreekanth.reddy@broadcom.com
Signed-off-by: Sreekanth Reddy <sreekanth.reddy@broadcom.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/mpt3sas/mpt3sas_base.c b/drivers/scsi/mpt3sas/mpt3sas_base.c
index 0a1828391e3c2650f3f58068018d98d803b3ef49..b96dd2b5d1acb83e43cd77896dcf4c98c78c672a 100644 (file)
--- a/drivers/scsi/mpt3sas/mpt3sas_base.c
+++ b/drivers/scsi/mpt3sas/mpt3sas_base.c
@@ -672,7 +672,7 @@ _base_fault_reset_work(struct work_struct *work)
                timeout /= (FAULT_POLLING_INTERVAL/1000);
 
                if (ioc->ioc_coredump_loop == 0) {
-                       mpt3sas_base_coredump_info(ioc,
+                       mpt3sas_print_coredump_info(ioc,
                            doorbell & MPI2_DOORBELL_DATA_MASK);
                        /* do not accept any IOs and disable the interrupts */
                        spin_lock_irqsave(
@@ -711,11 +711,11 @@ _base_fault_reset_work(struct work_struct *work)
                         __func__, rc == 0 ? "success" : "failed");
                doorbell = mpt3sas_base_get_iocstate(ioc, 0);
                if ((doorbell & MPI2_IOC_STATE_MASK) == MPI2_IOC_STATE_FAULT) {
-                       mpt3sas_base_fault_info(ioc, doorbell &
+                       mpt3sas_print_fault_code(ioc, doorbell &
                            MPI2_DOORBELL_DATA_MASK);
                } else if ((doorbell & MPI2_IOC_STATE_MASK) ==
                    MPI2_IOC_STATE_COREDUMP)
-                       mpt3sas_base_coredump_info(ioc, doorbell &
+                       mpt3sas_print_coredump_info(ioc, doorbell &
                            MPI2_DOORBELL_DATA_MASK);
                if (rc && (doorbell & MPI2_IOC_STATE_MASK) !=
                    MPI2_IOC_STATE_OPERATIONAL)
@@ -864,11 +864,11 @@ mpt3sas_halt_firmware(struct MPT3SAS_ADAPTER *ioc)
 
        doorbell = ioc->base_readl(&ioc->chip->Doorbell);
        if ((doorbell & MPI2_IOC_STATE_MASK) == MPI2_IOC_STATE_FAULT) {
-               mpt3sas_base_fault_info(ioc, doorbell &
+               mpt3sas_print_fault_code(ioc, doorbell &
                    MPI2_DOORBELL_DATA_MASK);
        } else if ((doorbell & MPI2_IOC_STATE_MASK) ==
            MPI2_IOC_STATE_COREDUMP) {
-               mpt3sas_base_coredump_info(ioc, doorbell &
+               mpt3sas_print_coredump_info(ioc, doorbell &
                    MPI2_DOORBELL_DATA_MASK);
        } else {
                writel(0xC0FFEE00, &ioc->chip->Doorbell);
@@ -3306,12 +3306,12 @@ _base_check_for_fault_and_issue_reset(struct MPT3SAS_ADAPTER *ioc)
        dhsprintk(ioc, pr_info("%s: ioc_state(0x%08x)\n", __func__, ioc_state));
 
        if ((ioc_state & MPI2_IOC_STATE_MASK) == MPI2_IOC_STATE_FAULT) {
-               mpt3sas_base_fault_info(ioc, ioc_state &
+               mpt3sas_print_fault_code(ioc, ioc_state &
                    MPI2_DOORBELL_DATA_MASK);
                rc = _base_diag_reset(ioc);
        } else if ((ioc_state & MPI2_IOC_STATE_MASK) ==
            MPI2_IOC_STATE_COREDUMP) {
-               mpt3sas_base_coredump_info(ioc, ioc_state &
+               mpt3sas_print_coredump_info(ioc, ioc_state &
                     MPI2_DOORBELL_DATA_MASK);
                mpt3sas_base_wait_for_coredump_completion(ioc, __func__);
                rc = _base_diag_reset(ioc);
@@ -5656,12 +5656,12 @@ _base_wait_for_doorbell_ack(struct MPT3SAS_ADAPTER *ioc, int timeout)
                        doorbell = ioc->base_readl(&ioc->chip->Doorbell);
                        if ((doorbell & MPI2_IOC_STATE_MASK) ==
                            MPI2_IOC_STATE_FAULT) {
-                               mpt3sas_base_fault_info(ioc , doorbell);
+                               mpt3sas_print_fault_code(ioc, doorbell);
                                return -EFAULT;
                        }
                        if ((doorbell & MPI2_IOC_STATE_MASK) ==
                            MPI2_IOC_STATE_COREDUMP) {
-                               mpt3sas_base_coredump_info(ioc, doorbell);
+                               mpt3sas_print_coredump_info(ioc, doorbell);
                                return -EFAULT;
                        }
                } else if (int_status == 0xFFFFFFFF)
@@ -5763,7 +5763,7 @@ _base_send_ioc_reset(struct MPT3SAS_ADAPTER *ioc, u8 reset_type, int timeout)
                    ioc->fault_reset_work_q == NULL)) {
                        spin_unlock_irqrestore(
                            &ioc->ioc_reset_in_progress_lock, flags);
-                       mpt3sas_base_coredump_info(ioc, ioc_state);
+                       mpt3sas_print_coredump_info(ioc, ioc_state);
                        mpt3sas_base_wait_for_coredump_completion(ioc,
                            __func__);
                        spin_lock_irqsave(
@@ -6164,7 +6164,7 @@ _base_wait_for_iocstate(struct MPT3SAS_ADAPTER *ioc, int timeout)
        }
 
        if ((ioc_state & MPI2_IOC_STATE_MASK) == MPI2_IOC_STATE_FAULT) {
-               mpt3sas_base_fault_info(ioc, ioc_state &
+               mpt3sas_print_fault_code(ioc, ioc_state &
                    MPI2_DOORBELL_DATA_MASK);
                goto issue_diag_reset;
        } else if ((ioc_state & MPI2_IOC_STATE_MASK) ==
@@ -6858,7 +6858,7 @@ _base_make_ioc_ready(struct MPT3SAS_ADAPTER *ioc, enum reset_type type)
        }
 
        if ((ioc_state & MPI2_IOC_STATE_MASK) == MPI2_IOC_STATE_FAULT) {
-               mpt3sas_base_fault_info(ioc, ioc_state &
+               mpt3sas_print_fault_code(ioc, ioc_state &
                    MPI2_DOORBELL_DATA_MASK);
                goto issue_diag_reset;
        }
@@ -6872,7 +6872,7 @@ _base_make_ioc_ready(struct MPT3SAS_ADAPTER *ioc, enum reset_type type)
                 * reset state without copying the FW logs to coredump region.
                 */
                if (ioc->ioc_coredump_loop != MPT3SAS_COREDUMP_LOOP_DONE) {
-                       mpt3sas_base_coredump_info(ioc, ioc_state &
+                       mpt3sas_print_coredump_info(ioc, ioc_state &
                            MPI2_DOORBELL_DATA_MASK);
                        mpt3sas_base_wait_for_coredump_completion(ioc,
                            __func__);

diff --git a/drivers/scsi/mpt3sas/mpt3sas_base.h b/drivers/scsi/mpt3sas/mpt3sas_base.h
index 01eaaca9a8440af10c79430575fffd77880f151e..1145af3232e77df526956e53a7ab47554d1170b9 100644 (file)
--- a/drivers/scsi/mpt3sas/mpt3sas_base.h
+++ b/drivers/scsi/mpt3sas/mpt3sas_base.h
@@ -1547,7 +1547,15 @@ void *mpt3sas_base_get_reply_virt_addr(struct MPT3SAS_ADAPTER *ioc,
 u32 mpt3sas_base_get_iocstate(struct MPT3SAS_ADAPTER *ioc, int cooked);
 
 void mpt3sas_base_fault_info(struct MPT3SAS_ADAPTER *ioc , u16 fault_code);
+#define mpt3sas_print_fault_code(ioc, fault_code) \
+do { pr_err("%s fault info from func: %s\n", ioc->name, __func__); \
+       mpt3sas_base_fault_info(ioc, fault_code); } while (0)
+
 void mpt3sas_base_coredump_info(struct MPT3SAS_ADAPTER *ioc, u16 fault_code);
+#define mpt3sas_print_coredump_info(ioc, fault_code) \
+do { pr_err("%s fault info from func: %s\n", ioc->name, __func__); \
+       mpt3sas_base_coredump_info(ioc, fault_code); } while (0)
+
 int mpt3sas_base_wait_for_coredump_completion(struct MPT3SAS_ADAPTER *ioc,
                const char *caller);
 int mpt3sas_base_sas_iounit_control(struct MPT3SAS_ADAPTER *ioc,

diff --git a/drivers/scsi/mpt3sas/mpt3sas_scsih.c b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
index 81711f2307a917b4e347be14adc7a55ebed0ae9c..4fb6872809391933cb10be249ea3362368295eb8 100644 (file)
--- a/drivers/scsi/mpt3sas/mpt3sas_scsih.c
+++ b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
@@ -2745,13 +2745,13 @@ mpt3sas_scsih_issue_tm(struct MPT3SAS_ADAPTER *ioc, u16 handle, u64 lun,
        }
 
        if ((ioc_state & MPI2_IOC_STATE_MASK) == MPI2_IOC_STATE_FAULT) {
-               mpt3sas_base_fault_info(ioc, ioc_state &
+               mpt3sas_print_fault_code(ioc, ioc_state &
                    MPI2_DOORBELL_DATA_MASK);
                rc = mpt3sas_base_hard_reset_handler(ioc, FORCE_BIG_HAMMER);
                return (!rc) ? SUCCESS : FAILED;
        } else if ((ioc_state & MPI2_IOC_STATE_MASK) ==
            MPI2_IOC_STATE_COREDUMP) {
-               mpt3sas_base_coredump_info(ioc, ioc_state &
+               mpt3sas_print_coredump_info(ioc, ioc_state &
                    MPI2_DOORBELL_DATA_MASK);
                rc = mpt3sas_base_hard_reset_handler(ioc, FORCE_BIG_HAMMER);
                return (!rc) ? SUCCESS : FAILED;
@@ -4545,11 +4545,11 @@ _scsih_temp_threshold_events(struct MPT3SAS_ADAPTER *ioc,
                        doorbell = mpt3sas_base_get_iocstate(ioc, 0);
                        if ((doorbell & MPI2_IOC_STATE_MASK) ==
                            MPI2_IOC_STATE_FAULT) {
-                               mpt3sas_base_fault_info(ioc,
+                               mpt3sas_print_fault_code(ioc,
                                    doorbell & MPI2_DOORBELL_DATA_MASK);
                        } else if ((doorbell & MPI2_IOC_STATE_MASK) ==
                            MPI2_IOC_STATE_COREDUMP) {
-                               mpt3sas_base_coredump_info(ioc,
+                               mpt3sas_print_coredump_info(ioc,
                                    doorbell & MPI2_DOORBELL_DATA_MASK);
                        }
                }