2 files changed, 25 insertions, 8 deletions

diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c
index df525e3b2c19..3a2de56fe080 100644
--- a/drivers/scsi/ufs/ufshcd.c
+++ b/drivers/scsi/ufs/ufshcd.c
@@ -4884,13 +4884,19 @@ static int ufshcd_suspend(struct ufs_hba *hba, enum ufs_pm_op pm_op)
         }
 
         if (ufshcd_is_runtime_pm(pm_op)) {
-                /*
-                 * The device is idle with no requests in the queue,
-                 * allow background operations if needed.
-                 */
-                ret = ufshcd_bkops_ctrl(hba, BKOPS_STATUS_NON_CRITICAL);
-                if (ret)
-                        goto enable_gating;
+                if (ufshcd_can_autobkops_during_suspend(hba)) {
+                        /*
+                         * The device is idle with no requests in the queue,
+                         * allow background operations if bkops status shows
+                         * that performance might be impacted.
+                         */
+                        ret = ufshcd_urgent_bkops(hba);
+                        if (ret)
+                                goto enable_gating;
+                } else {
+                        /* make sure that auto bkops is disabled */
+                        ufshcd_disable_auto_bkops(hba);
+                }
         }
 
         if ((req_dev_pwr_mode != hba->curr_dev_pwr_mode) &&
@@ -5038,7 +5044,11 @@ static int ufshcd_resume(struct ufs_hba *hba, enum ufs_pm_op pm_op)
                         goto set_old_link_state;
         }
 
-        ufshcd_disable_auto_bkops(hba);
+        /*
+         * If BKOPs operations are urgently needed at this moment then
+         * keep auto-bkops enabled or else disable it.
+         */
+        ufshcd_urgent_bkops(hba);
         hba->clk_gating.is_suspended = false;
 
         if (ufshcd_is_clkscaling_enabled(hba))
diff --git a/drivers/scsi/ufs/ufshcd.h b/drivers/scsi/ufs/ufshcd.h
index 908db3eb0609..d7fec869d590 100644
--- a/drivers/scsi/ufs/ufshcd.h
+++ b/drivers/scsi/ufs/ufshcd.h
@@ -469,6 +469,8 @@ struct ufs_hba {
 #define UFSHCD_CAP_HIBERN8_WITH_CLK_GATING (1 << 1)
         /* Allow dynamic clk scaling */
 #define UFSHCD_CAP_CLK_SCALING  (1 << 2)
+        /* Allow auto bkops to enabled during runtime suspend */
+#define UFSHCD_CAP_AUTO_BKOPS_SUSPEND (1 << 3)
 
         struct devfreq *devfreq;
         struct ufs_clk_scaling clk_scaling;
@@ -487,6 +489,11 @@ static inline int ufshcd_is_clkscaling_enabled(struct ufs_hba *hba)
 {
         return hba->caps & UFSHCD_CAP_CLK_SCALING;
 }
+static inline bool ufshcd_can_autobkops_during_suspend(struct ufs_hba *hba)
+{
+        return hba->caps & UFSHCD_CAP_AUTO_BKOPS_SUSPEND;
+}
+
 #define ufshcd_writel(hba, val, reg)    \
         writel((val), (hba)->mmio_base + (reg))
 #define ufshcd_readl(hba, reg)  \