Skip to contentSkip to conversation

ufs: core: wlun suspend SSU/enter hibern8 fail recovery

PATCH Superseded [email protected] 2 participants 3 messages Dec 2, 2022 – Dec 6, 2022

Subsystems (3)

v3 of 6 Superseded Latest is v6 →

lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 ufs: core: wlun suspend SSU/enter hibern8 fail recovery

From: Peter Wang <[email protected]>

When SSU/enter hibern8 fail in wlun suspend flow, trigger error handler and return busy to break the suspend.
If not, wlun runtime pm status become error and the consumer will stuck in runtime suspend status.

---
 drivers/ufs/core/ufshcd.c | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
drivers/ufs/core/ufshcd.c +26 -0
index b1f59a5fe632..a0dbf2c410b1 100644
@@ -9049,6 +9049,19 @@ static int __ufshcd_wl_suspend(struct ufs_hba *hba, enum ufs_pm_op pm_op)
 
 		if (!hba->dev_info.b_rpm_dev_flush_capable) {
 			ret = ufshcd_set_dev_pwr_mode(hba, req_dev_pwr_mode);
+			if (ret && (pm_op != UFS_SHUTDOWN_PM)) {
+				/*
+				 * If return err in suspend flow, IO will hang.
+				 * Trigger error handler and break suspend for
+				 * error recovery.
+				 */
+				spin_lock_irq(hba->host->host_lock);
+				hba->force_reset = true;
+				ufshcd_schedule_eh_work(hba);
+				spin_unlock_irq(hba->host->host_lock);
+
+				ret = -EBUSY;
+			}
 			if (ret)
 				goto enable_scaling;
 		}
@@ -9060,6 +9073,19 @@ static int __ufshcd_wl_suspend(struct ufs_hba *hba, enum ufs_pm_op pm_op)
 	 */
 	check_for_bkops = !ufshcd_is_ufs_dev_deepsleep(hba);
 	ret = ufshcd_link_state_transition(hba, req_link_state, check_for_bkops);
+	if ((ret) && (pm_op != UFS_SHUTDOWN_PM)) {
+		/*
+		 * If return err in suspend flow, IO will hang.
+		 * Trigger error handler and break suspend for
+		 * error recovery.
+		 */
+		spin_lock_irq(hba->host->host_lock);
+		hba->force_reset = true;
+		ufshcd_schedule_eh_work(hba);
+		spin_unlock_irq(hba->host->host_lock);
+
+		ret = -EBUSY;
+	}
 	if (ret)
 		goto set_dev_active;
 
Signature · 1 line
2.18.0
#1 lore raw
Quoted 46 lines · On 12/1/22 23:35, [email protected] wrote:

From: Peter Wang <[email protected]>

When SSU/enter hibern8 fail in wlun suspend flow, trigger error handler and return busy to break the suspend.
If not, wlun runtime pm status become error and the consumer will stuck in runtime suspend status.

---
  drivers/ufs/core/ufshcd.c | 26 ++++++++++++++++++++++++++
  1 file changed, 26 insertions(+)
drivers/ufs/core/ufshcd.c +19 -0
index b1f59a5fe632..a0dbf2c410b1 100644
@@ -9049,6 +9049,19 @@ static int __ufshcd_wl_suspend(struct ufs_hba *hba, enum ufs_pm_op pm_op)
 
  		if (!hba->dev_info.b_rpm_dev_flush_capable) {
  			ret = ufshcd_set_dev_pwr_mode(hba, req_dev_pwr_mode);
+			if (ret && (pm_op != UFS_SHUTDOWN_PM)) {
+				/*
+				 * If return err in suspend flow, IO will hang.
+				 * Trigger error handler and break suspend for
+				 * error recovery.
+				 */
+				spin_lock_irq(hba->host->host_lock);
+				hba->force_reset = true;
+				ufshcd_schedule_eh_work(hba);
+				spin_unlock_irq(hba->host->host_lock);
+
+				ret = -EBUSY;
+			}
  			if (ret)
  				goto enable_scaling;
  		}
@@ -9060,6 +9073,19 @@ static int __ufshcd_wl_suspend(struct ufs_hba *hba, enum ufs_pm_op pm_op)
  	 */
  	check_for_bkops = !ufshcd_is_ufs_dev_deepsleep(hba);
  	ret = ufshcd_link_state_transition(hba, req_link_state, check_for_bkops);
+	if ((ret) && (pm_op != UFS_SHUTDOWN_PM)) {
+		/*
+		 * If return err in suspend flow, IO will hang.
+		 * Trigger error handler and break suspend for
+		 * error recovery.
+		 */

drivers/ufs/core/ufshcd.c static int __ufshcd_wl_suspend(struct ufs_hba *hba, enum ufs_pm_op pm_op) · line 9091

Quoted 10 lines
drivers/ufs/core/ufshcd.c +7 -0
+		spin_lock_irq(hba->host->host_lock);
+		hba->force_reset = true;
+		ufshcd_schedule_eh_work(hba);
+		spin_unlock_irq(hba->host->host_lock);
+
+		ret = -EBUSY;
+	}
  	if (ret)
  		goto set_dev_active;
 

Please follow the coding style that is used elsewhere in the kernel and remove the superfluous parentheses from this patch. "if (ret && (pm_op != UFS_SHUTDOWN_PM)) {" can be changed into "if (ret && pm_op != UFS_SHUTDOWN_PM) {" and "if ((ret) && (pm_op != UFS_SHUTDOWN_PM)) {" can be changed into "if ((ret) && (pm_op != UFS_SHUTDOWN_PM)) {".

Otherwise this patch looks good to me.

Thanks,

Bart.

#2 lore raw
Quoted 73 lines · Bart Van Assche
Quoted 60 lines · On 12/1/22 23:35, [email protected] wrote:

From: Peter Wang <[email protected]>

When SSU/enter hibern8 fail in wlun suspend flow, trigger error handler and return busy to break the suspend.
If not, wlun runtime pm status become error and the consumer will stuck in runtime suspend status.

---
  drivers/ufs/core/ufshcd.c | 26 ++++++++++++++++++++++++++
  1 file changed, 26 insertions(+)
drivers/ufs/core/ufshcd.c +3 -0
index b1f59a5fe632..a0dbf2c410b1 100644
@@ -9049,6 +9049,19 @@ static int __ufshcd_wl_suspend(struct
 ufs_hba *hba, enum ufs_pm_op pm_op)
 
  		if (!hba->dev_info.b_rpm_dev_flush_capable) {
  			ret = ufshcd_set_dev_pwr_mode(hba,
 req_dev_pwr_mode);
+			if (ret && (pm_op != UFS_SHUTDOWN_PM)) {
+				/*
+				 * If return err in suspend flow, IO

will hang.

drivers/ufs/core/ufshcd.c +1 -0
+				 * Trigger error handler and break

suspend for

drivers/ufs/core/ufshcd.c +22 -0
+				 * error recovery.
+				 */
+				spin_lock_irq(hba->host->host_lock);
+				hba->force_reset = true;
+				ufshcd_schedule_eh_work(hba);
+				spin_unlock_irq(hba->host->host_lock);
+
+				ret = -EBUSY;
+			}
  			if (ret)
  				goto enable_scaling;
  		}
@@ -9060,6 +9073,19 @@ static int __ufshcd_wl_suspend(struct
 ufs_hba *hba, enum ufs_pm_op pm_op)
  	 */
  	check_for_bkops = !ufshcd_is_ufs_dev_deepsleep(hba);
  	ret = ufshcd_link_state_transition(hba, req_link_state,
 check_for_bkops);
+	if ((ret) && (pm_op != UFS_SHUTDOWN_PM)) {
+		/*
+		 * If return err in suspend flow, IO will hang.
+		 * Trigger error handler and break suspend for
+		 * error recovery.
+		 */
+		spin_lock_irq(hba->host->host_lock);
+		hba->force_reset = true;
+		ufshcd_schedule_eh_work(hba);
+		spin_unlock_irq(hba->host->host_lock);
+
+		ret = -EBUSY;
+	}
  	if (ret)
Quoted 2 lines

goto set_dev_active;

Please follow the coding style that is used elsewhere in the kernel and
remove the superfluous parentheses from this patch. "if (ret && (pm_op !=
UFS_SHUTDOWN_PM)) {" can be changed into "if (ret && pm_op != UFS_SHUTDOWN_PM) {" and "if ((ret) && (pm_op != UFS_SHUTDOWN_PM)) {" can be
changed into "if ((ret) && (pm_op != UFS_SHUTDOWN_PM)) {".

Quoted 3 lines

Otherwise this patch looks good to me.

Thanks,

Hi Bart,

Got it, will remove parentheses next version.
Thanks for review.

BR
Peter

Quoted 2 lines

Bart.