moonjuice/kernel_arpi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ANDROID: scsi: ufs: Backport the remainder of "Fix devfreq deadlocks"

Browse Source 
Stable kernel v5.15.91 includes commit b03f7ed9af ("scsi: ufs: core:
Fix devfreq deadlocks"). That commit is a backport of upstream commit
ba81043753ff ("scsi: ufs: core: Fix devfreq deadlocks"). Merge commit
c45adc3d89 ("Merge 5.15.92 into android14-5.15") removed the 'err'
argument from ufshcd_clock_scaling_unprepare(). Restore the 'err'
argument.

Fixes: c45adc3d89 ("Merge 5.15.92 into android14-5.15")
Change-Id: Icce2a7cb69ba7ccf9a6d548406d786e15d279acc
Signed-off-by: Bart Van Assche <bvanassche@google.com>
This commit is contained in:
Bart Van Assche
2023-02-09 08:03:51 -08:00
committed by Greg Kroah-Hartman
parent f34aed1750
commit e1aee10e87
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/ufs/core/ufshcd.c
View File

@@ -1311,12 +1311,12 @@ out:
return ret; return ret;
} }
static void ufshcd_clock_scaling_unprepare(struct ufs_hba *hba, bool scale_up) static void ufshcd_clock_scaling_unprepare(struct ufs_hba *hba, int err, bool scale_up)
{ {
up_write(&hba->clk_scaling_lock); up_write(&hba->clk_scaling_lock);
/* Enable Write Booster if we have scaled up else disable it */ /* Enable Write Booster if we have scaled up else disable it */
if (ufshcd_enable_wb_if_scaling_up(hba)) if (ufshcd_enable_wb_if_scaling_up(hba) && !err)
ufshcd_wb_toggle(hba, scale_up); ufshcd_wb_toggle(hba, scale_up);
mutex_unlock(&hba->wb_mutex); mutex_unlock(&hba->wb_mutex);
@@ -1374,7 +1374,7 @@ static int ufshcd_devfreq_scale(struct ufs_hba *hba, bool scale_up)
} }
out_unprepare: out_unprepare:
ufshcd_clock_scaling_unprepare(hba, scale_up); ufshcd_clock_scaling_unprepare(hba, ret, scale_up);
return ret; return ret;
} }
@@ -1774,7 +1774,7 @@ EXPORT_SYMBOL_GPL(ufshcd_freeze_scsi_devs);
/* Resume processing of SCSI commands. */ /* Resume processing of SCSI commands. */
void ufshcd_unfreeze_scsi_devs(struct ufs_hba *hba) void ufshcd_unfreeze_scsi_devs(struct ufs_hba *hba)
{ {
ufshcd_clock_scaling_unprepare(hba, true); ufshcd_clock_scaling_unprepare(hba, 0, true);
} }
EXPORT_SYMBOL_GPL(ufshcd_unfreeze_scsi_devs); EXPORT_SYMBOL_GPL(ufshcd_unfreeze_scsi_devs);