From: Venkat Gopalakrishnan <>

In a case where gate work is called as part of cancel work
from ungate path the clk state would be marked as REQ_CLKS_ON.
There is no point gating the clocks and then end up turning
them ON immediately in ungate work, save time by skipping the
gate work and change the clk state to CLKS_ON as they are not
turned off yet.

Signed-off-by: Venkat Gopalakrishnan <>
Signed-off-by: Subhash Jadavani <>
 drivers/scsi/ufs/ufshcd.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c
index 7959793..8cf5d8f 100644
--- a/drivers/scsi/ufs/ufshcd.c
+++ b/drivers/scsi/ufs/ufshcd.c
@@ -739,7 +739,14 @@ static void ufshcd_gate_work(struct work_struct *work)
        unsigned long flags;
        spin_lock_irqsave(hba->host->host_lock, flags);
-       if (hba->clk_gating.is_suspended) {
+       /*
+        * In case you are here to cancel this work the gating state
+        * would be marked as REQ_CLKS_ON. In this case save time by
+        * skipping the gating work and exit after changing the clock
+        * state to CLKS_ON.
+        */
+       if (hba->clk_gating.is_suspended ||
+               (hba->clk_gating.state == REQ_CLKS_ON)) {
                hba->clk_gating.state = CLKS_ON;
                goto rel_lock;
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project

To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to
More majordomo info at

Reply via email to