scsi: megaraid_sas: enhance debug logs in OCR context

Add additional logging from driver in OCR context.
Add debug logs for partial completion of IOs is iodone context.

Signed-off-by: Shivasharan S <shivasharan.srikanteshwara@broadcom.com>
Signed-off-by: Kashyap Desai <kashyap.desai@broadcom.com>
Reviewed-by: Hannes Reinecke <hare@suse.com>
Reviewed-by: Tomas Henzl <thenzl@redhat.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 bed8a3784120eceb0a0d44419bff4674b7acc666..93da6dc196adb489ea3c08903cfdaef7a015e0f6 100644 (file)
--- a/drivers/scsi/megaraid/megaraid_sas.h
+++ b/drivers/scsi/megaraid/megaraid_sas.h
@@ -1405,6 +1405,9 @@ struct megasas_ctrl_info {
 
 #define VD_EXT_DEBUG 0
 
+/* Driver's internal Logging levels*/
+#define OCR_LOGS    (1 << 0)
+
 #define SCAN_PD_CHANNEL        0x1
 #define SCAN_VD_CHANNEL        0x2
 

diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c
index 51b35a619d99eedc97cb9a8d0f50f9647bc77b00..b41bbea3667fe52aee63edd3fa8479c967c31cdf 100644 (file)
--- a/drivers/scsi/megaraid/megaraid_sas_base.c
+++ b/drivers/scsi/megaraid/megaraid_sas_base.c
@@ -2741,6 +2741,24 @@ blk_eh_timer_return megasas_reset_timer(struct scsi_cmnd *scmd)
        return BLK_EH_RESET_TIMER;
 }
 
+/**
+ * megasas_dump_frame -        This function will dump MPT/MFI frame
+ */
+static inline void
+megasas_dump_frame(void *mpi_request, int sz)
+{
+       int i;
+       __le32 *mfp = (__le32 *)mpi_request;
+
+       printk(KERN_INFO "IO request frame:\n\t");
+       for (i = 0; i < sz; i++) {
+               if (i && ((i % 8) == 0))
+                       printk("\n\t");
+               printk("%08x ", le32_to_cpu(mfp[i]));
+       }
+       printk("\n");
+}
+
 /**
  * megasas_reset_bus_host -    Bus & host reset handler entry point
  */
@@ -2751,12 +2769,26 @@ static int megasas_reset_bus_host(struct scsi_cmnd *scmd)
 
        instance = (struct megasas_instance *)scmd->device->host->hostdata;
 
+       scmd_printk(KERN_INFO, scmd,
+               "Controller reset is requested due to IO timeout\n"
+               "SCSI command pointer: (%p)\t SCSI host state: %d\t"
+               " SCSI host busy: %d\t FW outstanding: %d\n",
+               scmd, scmd->device->host->shost_state,
+               atomic_read((atomic_t *)&scmd->device->host->host_busy),
+               atomic_read(&instance->fw_outstanding));
+
        /*
         * First wait for all commands to complete
         */
-       if (instance->ctrl_context)
-               ret = megasas_reset_fusion(scmd->device->host, 1);
-       else
+       if (instance->ctrl_context) {
+               struct megasas_cmd_fusion *cmd;
+               cmd = (struct megasas_cmd_fusion *)scmd->SCp.ptr;
+               if (cmd)
+                       megasas_dump_frame(cmd->io_request,
+                               sizeof(struct MPI2_RAID_SCSI_IO_REQUEST));
+               ret = megasas_reset_fusion(scmd->device->host,
+                               SCSIIO_TIMEOUT_OCR);
+       } else
                ret = megasas_generic_reset(scmd);
 
        return ret;

diff --git a/drivers/scsi/megaraid/megaraid_sas_fusion.c b/drivers/scsi/megaraid/megaraid_sas_fusion.c
index 46286719c0aaa16c48c63e85cbe845b6d89323d0..1252a3c08e1a58ff8bf52a8cb82fb2d994b80c1d 100644 (file)
--- a/drivers/scsi/megaraid/megaraid_sas_fusion.c
+++ b/drivers/scsi/megaraid/megaraid_sas_fusion.c
@@ -1445,8 +1445,10 @@ map_cmd_status(struct fusion_context *fusion,
        struct scsi_cmnd *scmd, u8 status, u8 ext_status,
                        u32 data_length, u8 *sense)
 {
+       u8 cmd_type;
        int resid;
 
+       cmd_type = megasas_cmd_type(scmd);
        switch (status) {
 
        case MFI_STAT_OK:
@@ -1477,6 +1479,13 @@ map_cmd_status(struct fusion_context *fusion,
                 */
                resid = (scsi_bufflen(scmd) - data_length);
                scsi_set_resid(scmd, resid);
+
+               if (resid &&
+                       ((cmd_type == READ_WRITE_LDIO) ||
+                       (cmd_type == READ_WRITE_SYSPDIO)))
+                       scmd_printk(KERN_INFO, scmd, "BRCM Debug mfi stat 0x%x, data len"
+                               " requested/completed 0x%x/0x%x\n",
+                               status, scsi_bufflen(scmd), data_length);
                break;
 
        case MFI_STAT_LD_OFFLINE:
@@ -3477,6 +3486,14 @@ int megasas_wait_for_outstanding_fusion(struct megasas_instance *instance,
                               " will reset adapter scsi%d.\n",
                                instance->host->host_no);
                        megasas_complete_cmd_dpc_fusion((unsigned long)instance);
+                       if (instance->requestorId && reason) {
+                               dev_warn(&instance->pdev->dev, "SR-IOV Found FW in FAULT"
+                               " state while polling during"
+                               " I/O timeout handling for %d\n",
+                               instance->host->host_no);
+                               *convert = 1;
+                       }
+
                        retval = 1;
                        goto out;
                }
@@ -3496,7 +3513,7 @@ int megasas_wait_for_outstanding_fusion(struct megasas_instance *instance,
                }
 
                /* If SR-IOV VF mode & I/O timeout, check for HB timeout */
-               if (instance->requestorId && reason) {
+               if (instance->requestorId && (reason == SCSIIO_TIMEOUT_OCR)) {
                        if (instance->hb_host_mem->HB.fwCounter !=
                            instance->hb_host_mem->HB.driverCounter) {
                                instance->hb_host_mem->HB.driverCounter =
@@ -3912,6 +3929,9 @@ int megasas_task_abort_fusion(struct scsi_cmnd *scmd)
        instance = (struct megasas_instance *)scmd->device->host->hostdata;
        fusion = instance->ctrl_context;
 
+       scmd_printk(KERN_INFO, scmd, "task abort called for scmd(%p)\n", scmd);
+       scsi_print_command(scmd);
+
        if (atomic_read(&instance->adprecovery) != MEGASAS_HBA_OPERATIONAL) {
                dev_err(&instance->pdev->dev, "Controller is not OPERATIONAL,"
                "SCSI host:%d\n", instance->host->host_no);
@@ -3992,6 +4012,9 @@ int megasas_reset_target_fusion(struct scsi_cmnd *scmd)
        instance = (struct megasas_instance *)scmd->device->host->hostdata;
        fusion = instance->ctrl_context;
 
+       sdev_printk(KERN_INFO, scmd->device,
+                   "target reset called for scmd(%p)\n", scmd);
+
        if (atomic_read(&instance->adprecovery) != MEGASAS_HBA_OPERATIONAL) {
                dev_err(&instance->pdev->dev, "Controller is not OPERATIONAL,"
                "SCSI host:%d\n", instance->host->host_no);
@@ -4151,6 +4174,9 @@ int megasas_reset_fusion(struct Scsi_Host *shost, int reason)
                if (convert)
                        reason = 0;
 
+               if (megasas_dbg_lvl & OCR_LOGS)
+                       dev_info(&instance->pdev->dev, "\nPending SCSI commands:\n");
+
                /* Now return commands back to the OS */
                for (i = 0 ; i < instance->max_scsi_cmds; i++) {
                        cmd_fusion = fusion->cmd_list[i];
@@ -4161,6 +4187,13 @@ int megasas_reset_fusion(struct Scsi_Host *shost, int reason)
                        }
                        scmd_local = cmd_fusion->scmd;
                        if (cmd_fusion->scmd) {
+                               if (megasas_dbg_lvl & OCR_LOGS) {
+                                       sdev_printk(KERN_INFO,
+                                               cmd_fusion->scmd->device, "SMID: 0x%x\n",
+                                               cmd_fusion->index);
+                                       scsi_print_command(cmd_fusion->scmd);
+                               }
+
                                scmd_local->result =
                                        megasas_check_mpio_paths(instance,
                                                        scmd_local);