Unverified Commit a348aa03 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!14918 [OLK-5.10] backport important bugfix from the kernel-5.10.y 

Merge Pull Request from: @shangbaogen 
 
mpt3sas驱动:
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=linux-5.10.y&id=f37f301d84ea5a9c95e6057b576fc154cdbd1446 
 
Link:https://gitee.com/openeuler/kernel/pulls/14918

 

Reviewed-by: default avatarsanglipeng <sanglipeng1@jd.com>
Reviewed-by: default avatarLi Nan <linan122@huawei.com>
Signed-off-by: default avatarLi Nan <linan122@huawei.com>
parents c2f6be99 3f38b2a4

drivers/scsi/mpt3sas/mpt3sas_base.c

+6 −1
Original line number Diff line number Diff line
@@ -6008,11 +6008,12 @@ _base_handshake_req_reply_wait(struct MPT3SAS_ADAPTER *ioc, int request_bytes, 
	int i;

	u8 failed;

	__le32 *mfp;

	int ret_val;



	/* make sure doorbell is not in use */

	if ((ioc->base_readl_ext_retry(&ioc->chip->Doorbell) & MPI2_DOORBELL_USED)) {

		ioc_err(ioc, "doorbell is in use (line=%d)\n", __LINE__);

		return -EFAULT;

		goto doorbell_diag_reset;

	}



	/* clear pending doorbell interrupts from previous state changes */
@@ -6102,6 +6103,10 @@ _base_handshake_req_reply_wait(struct MPT3SAS_ADAPTER *ioc, int request_bytes, 
			    le32_to_cpu(mfp[i]));

	}

	return 0;



doorbell_diag_reset:

	ret_val = _base_diag_reset(ioc);

	return ret_val;

}



/**