Signed-off-by: Kashyap Desai <kashyap.de...@broadcom.com>
Signed-off-by: Shivasharan S <shivasharan.srikanteshw...@broadcom.com>
Reviewed-by: Hannes Reinecke <h...@suse.com>
---
 drivers/scsi/megaraid/megaraid_sas_fusion.c | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/drivers/scsi/megaraid/megaraid_sas_fusion.c 
b/drivers/scsi/megaraid/megaraid_sas_fusion.c
index ff4a3a8..dc4aada 100644
--- a/drivers/scsi/megaraid/megaraid_sas_fusion.c
+++ b/drivers/scsi/megaraid/megaraid_sas_fusion.c
@@ -910,7 +910,6 @@ static int megasas_create_sg_sense_fusion(struct 
megasas_instance *instance)
                ret = 1;
                goto fail_fw_init;
        }
-       dev_info(&instance->pdev->dev, "Init cmd success\n");
 
        ret = 0;
 
@@ -921,6 +920,10 @@ static int megasas_create_sg_sense_fusion(struct 
megasas_instance *instance)
                                  sizeof(struct MPI2_IOC_INIT_REQUEST),
                                  IOCInitMessage, ioc_init_handle);
 fail_get_cmd:
+       dev_err(&instance->pdev->dev,
+               "Init cmd return status %s for SCSI host %d\n",
+               ret ? "FAILED" : "SUCCESS", instance->host->host_no);
+
        return ret;
 }
 
@@ -4308,9 +4311,6 @@ int megasas_reset_fusion(struct Scsi_Host *shost, int 
reason)
                        megasas_fusion_update_can_queue(instance, OCR_CONTEXT);
 
                        if (megasas_ioc_init_fusion(instance)) {
-                               dev_warn(&instance->pdev->dev,
-                                      "megasas_ioc_init_fusion() failed! for "
-                                      "scsi%d\n", instance->host->host_no);
                                if (instance->requestorId && !reason)
                                        goto fail_kill_adapter;
                                else
@@ -4356,6 +4356,10 @@ int megasas_reset_fusion(struct Scsi_Host *shost, int 
reason)
                        instance->instancet->enable_intr(instance);
                        atomic_set(&instance->adprecovery, 
MEGASAS_HBA_OPERATIONAL);
 
+                       dev_info(&instance->pdev->dev, "Interrupts are enabled 
and"
+                               " controller is OPERATIONAL for scsi:%d\n",
+                               instance->host->host_no);
+
                        /* Restart SR-IOV heartbeat */
                        if (instance->requestorId) {
                                if (!megasas_sriov_start_heartbeat(instance, 0))
@@ -4367,11 +4371,6 @@ int megasas_reset_fusion(struct Scsi_Host *shost, int 
reason)
                                        instance->skip_heartbeat_timer_del = 1;
                        }
 
-                       /* Adapter reset completed successfully */
-                       dev_warn(&instance->pdev->dev, "Reset "
-                              "successful for scsi%d.\n",
-                               instance->host->host_no);
-
                        if (instance->crash_dump_drv_support &&
                                instance->crash_dump_app_support)
                                megasas_set_crash_dump_params(instance,
@@ -4381,6 +4380,12 @@ int megasas_reset_fusion(struct Scsi_Host *shost, int 
reason)
                                        MR_CRASH_BUF_TURN_OFF);
 
                        retval = SUCCESS;
+
+                       /* Adapter reset completed successfully */
+                       dev_warn(&instance->pdev->dev,
+                                "Reset successful for scsi%d.\n",
+                                instance->host->host_no);
+
                        goto out;
                }
 fail_kill_adapter:
-- 
1.8.3.1

Reply via email to