Commit 4a791574 authored by Nitin Rawat's avatar Nitin Rawat Committed by Martin K. Petersen
Browse files

scsi: ufs: ufs-qcom: Disable interrupt in reset path 

Disable interrupt in reset path to flush pending IRQ handler in order to
avoid possible NoC issues.

Link: https://lore.kernel.org/r/1614145010-36079-3-git-send-email-cang@codeaurora.org


Reviewed-by: default avatarAvri Altman <avri.altman@wdc.com>
Signed-off-by: default avatarNitin Rawat <nitirawa@codeaurora.org>
Signed-off-by: default avatarCan Guo <cang@codeaurora.org>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent aa53f580

drivers/scsi/ufs/ufs-qcom.c

+10 −0
Original line number Diff line number Diff line
@@ -253,12 +253,17 @@ static int ufs_qcom_host_reset(struct ufs_hba *hba) 
{

	int ret = 0;

	struct ufs_qcom_host *host = ufshcd_get_variant(hba);

	bool reenable_intr = false;



	if (!host->core_reset) {

		dev_warn(hba->dev, "%s: reset control not set\n", __func__);

		goto out;

	}



	reenable_intr = hba->is_irq_enabled;

	disable_irq(hba->irq);

	hba->is_irq_enabled = false;



	ret = reset_control_assert(host->core_reset);

	if (ret) {

		dev_err(hba->dev, "%s: core_reset assert failed, err = %d\n",
@@ -280,6 +285,11 @@ static int ufs_qcom_host_reset(struct ufs_hba *hba) 


	usleep_range(1000, 1100);



	if (reenable_intr) {

		enable_irq(hba->irq);

		hba->is_irq_enabled = true;

	}



out:

	return ret;

}