scsi: ufs: core: Prepare to introduce a new clock_gating lock

[ Upstream commit 7869c6521f5715688b3d1f1c897374a68544eef0 ]

Remove hba->clk_gating.active_reqs check from ufshcd_is_ufs_dev_busy()
function to separate clock gating logic from general device busy checks.

Signed-off-by: Avri Altman <avri.altman@wdc.com>
Link: https://lore.kernel.org/r/20241124070808.194860-3-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>

diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c
index 94d7992457a3bf7fb9124c615b79b1937147a241..217619d64940e04e06d25f5beb1e2fd59194706f 100644 (file)
--- a/drivers/ufs/core/ufshcd.c
+++ b/drivers/ufs/core/ufshcd.c
@@ -266,8 +266,7 @@ static bool ufshcd_has_pending_tasks(struct ufs_hba *hba)
 
 static bool ufshcd_is_ufs_dev_busy(struct ufs_hba *hba)
 {
-       return hba->clk_gating.active_reqs || hba->outstanding_reqs ||
-              ufshcd_has_pending_tasks(hba);
+       return hba->outstanding_reqs || ufshcd_has_pending_tasks(hba);
 }
 
 static const struct ufs_dev_quirk ufs_fixups[] = {
@@ -1973,7 +1972,9 @@ static void ufshcd_gate_work(struct work_struct *work)
                goto rel_lock;
        }
 
-       if (ufshcd_is_ufs_dev_busy(hba) || hba->ufshcd_state != UFSHCD_STATE_OPERATIONAL)
+       if (ufshcd_is_ufs_dev_busy(hba) ||
+           hba->ufshcd_state != UFSHCD_STATE_OPERATIONAL ||
+           hba->clk_gating.active_reqs)
                goto rel_lock;
 
        spin_unlock_irqrestore(hba->host->host_lock, flags);
@@ -8272,7 +8273,9 @@ static void ufshcd_rtc_work(struct work_struct *work)
        hba = container_of(to_delayed_work(work), struct ufs_hba, ufs_rtc_update_work);
 
         /* Update RTC only when there are no requests in progress and UFSHCI is operational */
-       if (!ufshcd_is_ufs_dev_busy(hba) && hba->ufshcd_state == UFSHCD_STATE_OPERATIONAL)
+       if (!ufshcd_is_ufs_dev_busy(hba) &&
+           hba->ufshcd_state == UFSHCD_STATE_OPERATIONAL &&
+           !hba->clk_gating.active_reqs)
                ufshcd_update_rtc(hba);
 
        if (ufshcd_is_ufs_dev_active(hba) && hba->dev_info.rtc_update_period)