tmakin/ack-tegra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

scsi: ufs: core: Introduce ufshcd_has_pending_tasks()

Browse Source 
[ Upstream commit e738ba458e7539be1757dcdf85835a5c7b11fad4 ]

Prepare to remove hba->clk_gating.active_reqs check from
ufshcd_is_ufs_dev_busy().

Signed-off-by: Avri Altman <avri.altman@wdc.com>
Link: https://lore.kernel.org/r/20241124070808.194860-2-avri.altman@wdc.com
Reviewed-by: Bart Van Assche <bvanassche@acm.org>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Stable-dep-of: 839a74b5649c ("scsi: ufs: Fix toggling of clk_gating.state when clock gating is not allowed")
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Avri Altman
2024-11-24 09:08:05 +02:00
committed by Greg Kroah-Hartman
parent cc3d79e7c8
commit f7015dcac2
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/ufs/core/ufshcd.c
+9 -4
View File
@@ -258,10 +258,16 @@ ufs_get_desired_pm_lvl_for_dev_link_state(enum ufs_dev_pwr_mode dev_state,
return UFS_PM_LVL_0; return UFS_PM_LVL_0;
} }
static bool ufshcd_has_pending_tasks(struct ufs_hba *hba)
{
return hba->outstanding_tasks || hba->active_uic_cmd ||
hba->uic_async_done;
}
static bool ufshcd_is_ufs_dev_busy(struct ufs_hba *hba) static bool ufshcd_is_ufs_dev_busy(struct ufs_hba *hba)
{ {
return (hba->clk_gating.active_reqs || hba->outstanding_reqs || hba->outstanding_tasks || return hba->clk_gating.active_reqs || hba->outstanding_reqs ||
hba->active_uic_cmd || hba->uic_async_done); ufshcd_has_pending_tasks(hba);
} }
static const struct ufs_dev_quirk ufs_fixups[] = { static const struct ufs_dev_quirk ufs_fixups[] = {
@@ -2023,8 +2029,7 @@ static void __ufshcd_release(struct ufs_hba *hba)
if (hba->clk_gating.active_reqs || hba->clk_gating.is_suspended || if (hba->clk_gating.active_reqs || hba->clk_gating.is_suspended ||
hba->ufshcd_state != UFSHCD_STATE_OPERATIONAL || hba->ufshcd_state != UFSHCD_STATE_OPERATIONAL ||
hba->outstanding_tasks || !hba->clk_gating.is_initialized || ufshcd_has_pending_tasks(hba) || !hba->clk_gating.is_initialized ||
hba->active_uic_cmd || hba->uic_async_done ||
hba->clk_gating.state == CLKS_OFF) hba->clk_gating.state == CLKS_OFF)
return; return;