scsi: megaraid_sas: Print FW fault information

When driver detects a firmware fault during load, dump additional
information on fault code and subcode that will help in debugging.

Signed-off-by: Sumit Saxena <sumit.saxena@broadcom.com>
Signed-off-by: Shivasharan S <shivasharan.srikanteshwara@broadcom.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/megaraid/megaraid_sas.h b/drivers/scsi/megaraid/megaraid_sas.h
index 27980d68cf1b2db977dd5a3ba92ba8b0bdb8eeaf..8df6ef01785e249263b31bb348ac7817e4da6d5d 100644 (file)
--- a/drivers/scsi/megaraid/megaraid_sas.h
+++ b/drivers/scsi/megaraid/megaraid_sas.h
@@ -135,6 +135,8 @@
 #define MFI_RESET_ADAPTER                      0x00000002
 #define MEGAMFI_FRAME_SIZE                     64
 
+#define MFI_STATE_FAULT_CODE                   0x0FFF0000
+#define MFI_STATE_FAULT_SUBCODE                        0x0000FF00
 /*
  * During FW init, clear pending cmds & reset state using inbound_msg_0
  *

diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c
index ed38cec35604cd08ac087a60cd048e654383d632..fce79f36ace64b0ecc9c1815022dec52dcbbc48b 100644 (file)
--- a/drivers/scsi/megaraid/megaraid_sas_base.c
+++ b/drivers/scsi/megaraid/megaraid_sas_base.c
@@ -3918,7 +3918,10 @@ megasas_transition_to_ready(struct megasas_instance *instance, int ocr)
                switch (fw_state) {
 
                case MFI_STATE_FAULT:
-                       dev_printk(KERN_DEBUG, &instance->pdev->dev, "FW in FAULT state!!\n");
+                       dev_printk(KERN_ERR, &instance->pdev->dev,
+                                  "FW in FAULT state, Fault code:0x%x subcode:0x%x func:%s\n",
+                                  abs_state & MFI_STATE_FAULT_CODE,
+                                  abs_state & MFI_STATE_FAULT_SUBCODE, __func__);
                        if (ocr) {
                                max_wait = MEGASAS_RESET_WAIT_TIME;
                                cur_state = MFI_STATE_FAULT;

diff --git a/drivers/scsi/megaraid/megaraid_sas_fusion.c b/drivers/scsi/megaraid/megaraid_sas_fusion.c
index 7ee9d128ae43d5d591df73a51e976ed3a81d144e..7ec4920e3618c69fb7ac4454665d5086141bae37 100644 (file)
--- a/drivers/scsi/megaraid/megaraid_sas_fusion.c
+++ b/drivers/scsi/megaraid/megaraid_sas_fusion.c
@@ -3983,7 +3983,7 @@ megasas_check_reset_fusion(struct megasas_instance *instance,
 static inline void megasas_trigger_snap_dump(struct megasas_instance *instance)
 {
        int j;
-       u32 fw_state;
+       u32 fw_state, abs_state;
 
        if (!instance->disableOnlineCtrlReset) {
                dev_info(&instance->pdev->dev, "Trigger snap dump\n");
@@ -3993,11 +3993,13 @@ static inline void megasas_trigger_snap_dump(struct megasas_instance *instance)
        }
 
        for (j = 0; j < instance->snapdump_wait_time; j++) {
-               fw_state = instance->instancet->read_fw_status_reg(instance) &
-                               MFI_STATE_MASK;
+               abs_state = instance->instancet->read_fw_status_reg(instance);
+               fw_state = abs_state & MFI_STATE_MASK;
                if (fw_state == MFI_STATE_FAULT) {
-                       dev_err(&instance->pdev->dev,
-                               "Found FW in FAULT state, after snap dump trigger\n");
+                       dev_printk(KERN_ERR, &instance->pdev->dev,
+                                  "FW in FAULT state Fault code:0x%x subcode:0x%x func:%s\n",
+                                  abs_state & MFI_STATE_FAULT_CODE,
+                                  abs_state & MFI_STATE_FAULT_SUBCODE, __func__);
                        return;
                }
                msleep(1000);
@@ -4009,7 +4011,7 @@ int megasas_wait_for_outstanding_fusion(struct megasas_instance *instance,
                                        int reason, int *convert)
 {
        int i, outstanding, retval = 0, hb_seconds_missed = 0;
-       u32 fw_state;
+       u32 fw_state, abs_state;
        u32 waittime_for_io_completion;
 
        waittime_for_io_completion =
@@ -4028,12 +4030,13 @@ int megasas_wait_for_outstanding_fusion(struct megasas_instance *instance,
 
        for (i = 0; i < waittime_for_io_completion; i++) {
                /* Check if firmware is in fault state */
-               fw_state = instance->instancet->read_fw_status_reg(instance) &
-                               MFI_STATE_MASK;
+               abs_state = instance->instancet->read_fw_status_reg(instance);
+               fw_state = abs_state & MFI_STATE_MASK;
                if (fw_state == MFI_STATE_FAULT) {
-                       dev_warn(&instance->pdev->dev, "Found FW in FAULT state,"
-                              " will reset adapter scsi%d.\n",
-                               instance->host->host_no);
+                       dev_printk(KERN_ERR, &instance->pdev->dev,
+                                  "FW in FAULT state Fault code:0x%x subcode:0x%x func:%s\n",
+                                  abs_state & MFI_STATE_FAULT_CODE,
+                                  abs_state & MFI_STATE_FAULT_SUBCODE, __func__);
                        megasas_complete_cmd_dpc_fusion((unsigned long)instance);
                        if (instance->requestorId && reason) {
                                dev_warn(&instance->pdev->dev, "SR-IOV Found FW in FAULT"