Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2d2c2331 authored by Shivasharan S's avatar Shivasharan S Committed by Martin K. Petersen
Browse files

scsi: megaraid_sas: modified few prints in OCR and IOC INIT path 



Signed-off-by: default avatarKashyap Desai <kashyap.desai@broadcom.com>
Signed-off-by: default avatarShivasharan S <shivasharan.srikanteshwara@broadcom.com>
Reviewed-by: default avatarHannes Reinecke <hare@suse.com>
Reviewed-by: default avatarTomas Henzl <thenzl@redhat.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent ba1477aa

drivers/scsi/megaraid/megaraid_sas_fusion.c

+14 −9
Original line number Diff line number Diff line
@@ -916,7 +916,6 @@ megasas_ioc_init_fusion(struct megasas_instance *instance) 
		ret = 1;

		goto fail_fw_init;

	}

	dev_info(&instance->pdev->dev, "Init cmd success\n");



	ret = 0;
@@ -927,6 +926,10 @@ megasas_ioc_init_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;

}
@@ -4314,9 +4317,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
@@ -4362,6 +4362,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))
@@ -4373,11 +4377,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,
@@ -4387,6 +4386,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: