scsi: ufs: core: Introduce ufshcd_has_pending_tasks()

[ 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: 4fa382be4304 ("scsi: ufs: core: Fix ufshcd_is_ufs_dev_busy() and ufshcd_eh_timed_out()")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c
index a9a7a84e6cbbc38ee20d66ba745f3f892c7bea54..83d69e0564f2d1d8f288784084fa684caf93d74a 100644 (file)
--- a/drivers/ufs/core/ufshcd.c
+++ b/drivers/ufs/core/ufshcd.c
@@ -237,10 +237,16 @@ ufs_get_desired_pm_lvl_for_dev_link_state(enum ufs_dev_pwr_mode dev_state,
        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)
 {
-       return (hba->clk_gating.active_reqs || hba->outstanding_reqs || hba->outstanding_tasks ||
-               hba->active_uic_cmd || hba->uic_async_done);
+       return hba->clk_gating.active_reqs || hba->outstanding_reqs ||
+              ufshcd_has_pending_tasks(hba);
 }
 
 static const struct ufs_dev_quirk ufs_fixups[] = {
@@ -1883,8 +1889,7 @@ static void __ufshcd_release(struct ufs_hba *hba)
 
        if (hba->clk_gating.active_reqs || hba->clk_gating.is_suspended ||
            hba->ufshcd_state != UFSHCD_STATE_OPERATIONAL ||
-           hba->outstanding_tasks || !hba->clk_gating.is_initialized ||
-           hba->active_uic_cmd || hba->uic_async_done ||
+           ufshcd_has_pending_tasks(hba) || !hba->clk_gating.is_initialized ||
            hba->clk_gating.state == CLKS_OFF)
                return;