Commit 2d3f59cf authored by Kiwoong Kim's avatar Kiwoong Kim Committed by Martin K. Petersen
Browse files

scsi: ufs: core: Move __ufshcd_send_uic_cmd() outside host_lock 



__ufshcd_send_uic_cmd() is wrapped by uic_cmd_mutex and its related
contexts are accessed within the section wrapped by uic_cmd_mutex. Thus,
wrapping with host_lock is redundant.

Signed-off-by: default avatarKiwoong Kim <kwmad.kim@samsung.com>
Link: https://lore.kernel.org/r/782ba5f26f0a96e58d85dff50751787d2d2a6b2b.1693790060.git.kwmad.kim@samsung.com


Reviewed-by: default avatarBart Van Assche <bvanassche@acm.org>
Reviewed-by: default avatarChanwoo Lee <cw9316.lee@samsung.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 7df0b260

drivers/ufs/core/ufshcd.c

+1 −5
Original line number Diff line number Diff line
@@ -2392,7 +2392,6 @@ __ufshcd_send_uic_cmd(struct ufs_hba *hba, struct uic_command *uic_cmd, 
		      bool completion)

{

	lockdep_assert_held(&hba->uic_cmd_mutex);

	lockdep_assert_held(hba->host->host_lock);



	if (!ufshcd_ready_for_uic_cmd(hba)) {

		dev_err(hba->dev,
@@ -2419,7 +2418,6 @@ __ufshcd_send_uic_cmd(struct ufs_hba *hba, struct uic_command *uic_cmd, 
int ufshcd_send_uic_cmd(struct ufs_hba *hba, struct uic_command *uic_cmd)

{

	int ret;

	unsigned long flags;



	if (hba->quirks & UFSHCD_QUIRK_BROKEN_UIC_CMD)

		return 0;
@@ -2428,9 +2426,7 @@ int ufshcd_send_uic_cmd(struct ufs_hba *hba, struct uic_command *uic_cmd) 
	mutex_lock(&hba->uic_cmd_mutex);

	ufshcd_add_delay_before_dme_cmd(hba);



	spin_lock_irqsave(hba->host->host_lock, flags);

	ret = __ufshcd_send_uic_cmd(hba, uic_cmd, true);

	spin_unlock_irqrestore(hba->host->host_lock, flags);

	if (!ret)

		ret = ufshcd_wait_for_uic_cmd(hba, uic_cmd);
@@ -4133,8 +4129,8 @@ static int ufshcd_uic_pwr_ctrl(struct ufs_hba *hba, struct uic_command *cmd) 
		wmb();

		reenable_intr = true;

	}

	ret = __ufshcd_send_uic_cmd(hba, cmd, false);

	spin_unlock_irqrestore(hba->host->host_lock, flags);

	ret = __ufshcd_send_uic_cmd(hba, cmd, false);

	if (ret) {

		dev_err(hba->dev,

			"pwr ctrl cmd 0x%x with mode 0x%x uic error %d\n",