Commit ba8a9ba4 authored by Ranjan Kumar's avatar Ranjan Kumar Committed by Martin K. Petersen
Browse files

scsi: mpi3mr: Return proper values for failures in firmware init path 



Return proper non-zero return values for all the cases when the controller
initialization and re-initialization fails.

Signed-off-by: default avatarRanjan Kumar <ranjan.kumar@broadcom.com>
Signed-off-by: default avatarSreekanth Reddy <sreekanth.reddy@broadcom.com>
Link: https://lore.kernel.org/r/20230228140835.4075-5-ranjan.kumar@broadcom.com


Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 0a319f16

drivers/scsi/mpi3mr/mpi3mr_fw.c

+9 −2
Original line number Diff line number Diff line
@@ -3840,8 +3840,10 @@ int mpi3mr_init_ioc(struct mpi3mr_ioc *mrioc) 
	dprint_init(mrioc, "allocating config page buffers\n");

	mrioc->cfg_page = dma_alloc_coherent(&mrioc->pdev->dev,

	    MPI3MR_DEFAULT_CFG_PAGE_SZ, &mrioc->cfg_page_dma, GFP_KERNEL);

	if (!mrioc->cfg_page)

	if (!mrioc->cfg_page) {

		retval = -1;

		goto out_failed_noretry;

	}



	mrioc->cfg_page_sz = MPI3MR_DEFAULT_CFG_PAGE_SZ;
@@ -3903,9 +3905,11 @@ int mpi3mr_init_ioc(struct mpi3mr_ioc *mrioc) 
		dprint_init(mrioc, "allocating memory for throttle groups\n");

		sz = sizeof(struct mpi3mr_throttle_group_info);

		mrioc->throttle_groups = kcalloc(mrioc->num_io_throttle_group, sz, GFP_KERNEL);

		if (!mrioc->throttle_groups)

		if (!mrioc->throttle_groups) {

			retval = -1;

			goto out_failed_noretry;

		}

	}



	retval = mpi3mr_enable_events(mrioc);

	if (retval) {
@@ -3924,6 +3928,7 @@ int mpi3mr_init_ioc(struct mpi3mr_ioc *mrioc) 
		mpi3mr_memset_buffers(mrioc);

		goto retry_init;

	}

	retval = -1;

out_failed_noretry:

	ioc_err(mrioc, "controller initialization failed\n");

	mpi3mr_issue_reset(mrioc, MPI3_SYSIF_HOST_DIAG_RESET_ACTION_DIAG_FAULT,
@@ -4036,6 +4041,7 @@ int mpi3mr_reinit_ioc(struct mpi3mr_ioc *mrioc, u8 is_resume) 
		ioc_err(mrioc,

		    "cannot create minimum number of operational queues expected:%d created:%d\n",

		    mrioc->shost->nr_hw_queues, mrioc->num_op_reply_q);

		retval = -1;

		goto out_failed_noretry;

	}
@@ -4102,6 +4108,7 @@ int mpi3mr_reinit_ioc(struct mpi3mr_ioc *mrioc, u8 is_resume) 
		mpi3mr_memset_buffers(mrioc);

		goto retry_init;

	}

	retval = -1;

out_failed_noretry:

	ioc_err(mrioc, "controller %s is failed\n",

	    (is_resume)?"resume":"re-initialization");