UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Avri Altman <avri.altman@wdc.com>
Signed-off-by: Nitin Rawat <nitirawa@codeaurora.org>
Signed-off-by: Can Guo <cang@codeaurora.org>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
Nitin Rawat 2021-02-23 21:36:48 -08:00 committed by Martin K. Petersen
parent aa53f580e6
commit 4a791574a0
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/scsi/ufs/ufs-qcom.c
View File

@ -253,12 +253,17 @@ static int ufs_qcom_host_reset(struct ufs_hba *hba)
{ {
int ret = 0; int ret = 0;
struct ufs_qcom_host *host = ufshcd_get_variant(hba); struct ufs_qcom_host *host = ufshcd_get_variant(hba);
bool reenable_intr = false;
if (!host->core_reset) { if (!host->core_reset) {
dev_warn(hba->dev, "%s: reset control not set\n", __func__); dev_warn(hba->dev, "%s: reset control not set\n", __func__);
goto out; goto out;
} }
reenable_intr = hba->is_irq_enabled;
disable_irq(hba->irq);
hba->is_irq_enabled = false;
ret = reset_control_assert(host->core_reset); ret = reset_control_assert(host->core_reset);
if (ret) { if (ret) {
dev_err(hba->dev, "%s: core_reset assert failed, err = %d\n", 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); usleep_range(1000, 1100);
if (reenable_intr) {
enable_irq(hba->irq);
hba->is_irq_enabled = true;
}
out: out:
return ret; return ret;
} }