Complementary changes for error handling
cover Complementary changes for error handling
Commit cb7e6f05fce67c965194ac04467e1ba7bc70b069 ("scsi: ufs: core: Enable power management for wlun") makes the UFS device W-LU the supplier, based on which we need to make some changes to accomodate error handling.
This series is tested by fault injections (to IRQ handler, UIC cmds and task abort where error handler can possibley be invoked) in all possible contexts, e.g., scaling, gating, runtime and system suspend/resume.
Below changes are tested as a whole and based on 5.14/scsi-queue.
Can Guo (6):
scsi: ufs: Differentiate status between hba pm ops and wl pm ops
scsi: ufs: Update the return value of supplier pm ops
scsi: ufs: Simplify error handling preparation
scsi: ufs: Update ufshcd_recover_pm_error()
scsi: ufs: Let host_sem cover the entire system suspend/resume
scsi: ufs: Update the fast abort path in ufshcd_abort() for PM
requests
drivers/scsi/ufs/ufshcd.c | 180 +++++++++++++++++++++++++--------------------- drivers/scsi/ufs/ufshcd.h | 4 +- 2 files changed, 103 insertions(+), 81 deletions(-)
Signature · 1 line
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project.
PATCH 1/6 scsi: ufs: Differentiate status between hba pm ops and wl pm ops
Put pm_op_in_progress and is_sys_suspend flags back to ufshcd hba pm ops, add two new flags, namely wl_pm_op_in_progress and is_wl_sys_suspended, to track the UFS device W-LU pm ops. This helps us differentiate the status of hba and wl pm ops when we need to do troubleshooting.
--- drivers/scsi/ufs/ufshcd.c | 42 ++++++++++++++++++++++++++++-------------- drivers/scsi/ufs/ufshcd.h | 4 +++- 2 files changed, 31 insertions(+), 15 deletions(-)
drivers/scsi/ufs/ufshcd.c +28 -14
@@ -543,7 +543,9 @@ static void ufshcd_print_host_state(struct ufs_hba *hba) hba->saved_err, hba->saved_uic_err);dev_err (hba->dev,"Device power mode=%d, UIC link state=%d\n" , hba->curr_dev_pwr_mode, hba->uic_link_state); -dev_err (hba->dev,"PM in progress=%d, sys. suspended=%d\n" , +dev_err (hba->dev,"wl_pm_op_in_progress=%d, is_wl_sys_suspended=%d\n" , + hba->wl_pm_op_in_progress, hba->is_wl_sys_suspended); +dev_err (hba->dev,"pm_op_in_progress=%d, is_sys_suspended=%d\n" , hba->pm_op_in_progress, hba->is_sys_suspended);dev_err (hba->dev,"Auto BKOPS=%d, Host self-block=%d\n" , hba->auto_bkops_enabled, hba->host->host_self_blocked);
@@ -1991,7 +1993,7 @@ static void ufshcd_clk_scaling_start_busy(struct ufs_hba *hba)if (!hba->clk_scaling.active_reqs++) queue_resume_work = true; -if (!hba->clk_scaling.is_enabled || hba->pm_op_in_progress) +if (!hba->clk_scaling.is_enabled || hba->wl_pm_op_in_progress)return ;if (queue_resume_work)
@@ -2640,7 +2642,7 @@ static int ufshcd_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *cmd) lrbp = &hba->lrb[tag];if (unlikely (lrbp->in_use)) { -if (hba->pm_op_in_progress) +if (hba->wl_pm_op_in_progress)set_host_byte (cmd,DID_BAD_TARGET );else err =SCSI_MLQUEUE_HOST_BUSY ;
@@ -2687,7 +2689,7 @@ static int ufshcd_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *cmd)* err handler blocked for too long. So, just fail the scsi cmd * sent from PM ops, err handler can recover PM error anyways. */ -if (hba->pm_op_in_progress) { +if (hba->wl_pm_op_in_progress) { hba->force_reset = true;set_host_byte (cmd,DID_BAD_TARGET ); goto out_compl_cmd;
@@ -5036,7 +5038,7 @@ ufshcd_transfer_rsp_status(struct ufs_hba *hba, struct ufshcd_lrb *lrbp)* solution could be to abort the system suspend if * UFS device needs urgent BKOPs. */ -if (!hba->pm_op_in_progress && +if (!hba->wl_pm_op_in_progress && !ufshcd_eh_in_progress (hba) &&ufshcd_is_exception_event (lrbp->ucd_rsp_ptr))/* Flushed in suspend */
@@ -5799,7 +5801,7 @@ static void ufshcd_err_handling_prepare(struct ufs_hba *hba) {ufshcd_rpm_get_sync (hba);if (pm_runtime_status_suspended (&hba->sdev_ufs_device->sdev_gendev) || - hba->is_sys_suspended) { + hba->is_wl_sys_suspended) {enum ufs_pm_op pm_op;/*
@@ -5816,7 +5818,7 @@ static void ufshcd_err_handling_prepare(struct ufs_hba *hba)if (!ufshcd_is_clkgating_allowed (hba))ufshcd_setup_clocks (hba, true);ufshcd_release (hba); - pm_op = hba->is_sys_suspended ?UFS_SYSTEM_PM :UFS_RUNTIME_PM ; + pm_op = hba->is_wl_sys_suspended ?UFS_SYSTEM_PM :UFS_RUNTIME_PM ;ufshcd_vops_resume (hba, pm_op); }else {ufshcd_hold (hba, false);
@@ -5859,7 +5861,7 @@ static void ufshcd_recover_pm_error(struct ufs_hba *hba)struct request_queue *q;int ret; - hba->is_sys_suspended = false; + hba->is_wl_sys_suspended = false;/* * Set RPM status of wlun device to RPM_ACTIVE, * this also clears its runtime error.
@@ -8709,7 +8711,7 @@ static int __ufshcd_wl_suspend(struct ufs_hba *hba, enum ufs_pm_op pm_op)enum ufs_dev_pwr_mode req_dev_pwr_mode;enum uic_link_state req_link_state; - hba->pm_op_in_progress = true; + hba->wl_pm_op_in_progress = true;if (!ufshcd_is_shutdown_pm (pm_op)) { pm_lvl =ufshcd_is_runtime_pm (pm_op) ? hba->rpm_lvl : hba->spm_lvl;
@@ -8844,7 +8846,7 @@ static int __ufshcd_wl_suspend(struct ufs_hba *hba, enum ufs_pm_op pm_op) hba->clk_gating.is_suspended = false;ufshcd_release (hba); } - hba->pm_op_in_progress = false; + hba->wl_pm_op_in_progress = false;return ret; }
@@ -8853,7 +8855,7 @@ static int __ufshcd_wl_resume(struct ufs_hba *hba, enum ufs_pm_op pm_op)int ret;enum uic_link_state old_link_state = hba->uic_link_state; - hba->pm_op_in_progress = true; + hba->wl_pm_op_in_progress = true;/* * Call vendor specific resume callback. As these callbacks may access
@@ -8931,7 +8933,7 @@ static int __ufshcd_wl_resume(struct ufs_hba *hba, enum ufs_pm_op pm_op)ufshcd_update_evt_hist (hba,UFS_EVT_WL_RES_ERR , (u32 )ret); hba->clk_gating.is_suspended = false;ufshcd_release (hba); - hba->pm_op_in_progress = false; + hba->wl_pm_op_in_progress = false;return ret; }
@@ -8997,7 +8999,7 @@ static int ufshcd_wl_suspend(struct device *dev) out:if (!ret) - hba->is_sys_suspended = true; + hba->is_wl_sys_suspended = true;trace_ufshcd_wl_suspend (dev_name (dev), ret,ktime_to_us (ktime_sub (ktime_get (), start)), hba->curr_dev_pwr_mode, hba->uic_link_state);
@@ -9025,7 +9027,7 @@ static int ufshcd_wl_resume(struct device *dev)ktime_to_us (ktime_sub (ktime_get (), start)), hba->curr_dev_pwr_mode, hba->uic_link_state);if (!ret) - hba->is_sys_suspended = false; + hba->is_wl_sys_suspended = false;up (&hba->host_sem);return ret; }
@@ -9067,6 +9069,8 @@ static int ufshcd_suspend(struct ufs_hba *hba)if (!hba->is_powered)return 0 ; + + hba->pm_op_in_progress = true;/* * Disable the host irq as host controller as there won't be any * host controller transaction expected till resume.
@@ -9086,6 +9090,7 @@ static int ufshcd_suspend(struct ufs_hba *hba)ufshcd_vreg_set_lpm (hba);/* Put the host controller in low power mode if possible */ ufshcd_hba_vreg_set_lpm (hba); + hba->pm_op_in_progress = false;return ret; }
@@ -9106,6 +9111,7 @@ static int ufshcd_resume(struct ufs_hba *hba)if (!hba->is_powered)return 0 ; + hba->pm_op_in_progress = true;ufshcd_hba_vreg_set_hpm (hba); ret =ufshcd_vreg_set_hpm (hba);if (ret)
@@ -9125,6 +9131,7 @@ static int ufshcd_resume(struct ufs_hba *hba) out:if (ret)ufshcd_update_evt_hist (hba,UFS_EVT_RESUME_ERR , (u32 )ret); + hba->pm_op_in_progress = false;return ret; }
@@ -9150,6 +9157,10 @@ int ufshcd_system_suspend(struct ufs_hba *hba)trace_ufshcd_system_suspend (dev_name (hba->dev), ret,ktime_to_us (ktime_sub (ktime_get (), start)), hba->curr_dev_pwr_mode, hba->uic_link_state); + +if (!ret) + hba->is_sys_suspended = true; +return ret; }EXPORT_SYMBOL (ufshcd_system_suspend);
@@ -9176,6 +9187,9 @@ int ufshcd_system_resume(struct ufs_hba *hba)ktime_to_us (ktime_sub (ktime_get (), start)), hba->curr_dev_pwr_mode, hba->uic_link_state); +if (!ret) + hba->is_sys_suspended = false; +return ret; }EXPORT_SYMBOL (ufshcd_system_resume);
drivers/scsi/ufs/ufshcd.h +3 -1
@@ -739,7 +739,8 @@ struct ufs_hba {enum ufs_pm_level spm_lvl;struct device_attribute rpm_lvl_attr;struct device_attribute spm_lvl_attr; -int pm_op_in_progress; +bool pm_op_in_progress; +bool wl_pm_op_in_progress;/* Auto-Hibernate Idle Timer register value */ u32 ahit;
@@ -826,6 +827,7 @@ struct ufs_hba {struct devfreq *devfreq;struct ufs_clk_scaling clk_scaling;bool is_sys_suspended; +bool is_wl_sys_suspended;enum bkops_status urgent_bkops_lvl;bool is_urgent_bkops_lvl_checked;
Signature · 1 line
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project.
PATCH 1/6 scsi: ufs: Differentiate status of hba and wl pm ops
In reply to Can GuoPut pm_op_in_progress and is_sys_suspend flags back to ufshcd hba pm ops, add two new flags, namely wl_pm_op_in_progress and is_wl_sys_suspended, to track the UFS device W-LU pm ops. This helps us differentiate the status of hba and wl pm ops when we need to do troubleshooting.
--- drivers/scsi/ufs/ufshcd.c | 42 ++++++++++++++++++++++++++++-------------- drivers/scsi/ufs/ufshcd.h | 4 +++- 2 files changed, 31 insertions(+), 15 deletions(-)
drivers/scsi/ufs/ufshcd.c +28 -14
@@ -543,7 +543,9 @@ static void ufshcd_print_host_state(struct ufs_hba *hba) hba->saved_err, hba->saved_uic_err);dev_err (hba->dev,"Device power mode=%d, UIC link state=%d\n" , hba->curr_dev_pwr_mode, hba->uic_link_state); -dev_err (hba->dev,"PM in progress=%d, sys. suspended=%d\n" , +dev_err (hba->dev,"wl_pm_op_in_progress=%d, is_wl_sys_suspended=%d\n" , + hba->wl_pm_op_in_progress, hba->is_wl_sys_suspended); +dev_err (hba->dev,"pm_op_in_progress=%d, is_sys_suspended=%d\n" , hba->pm_op_in_progress, hba->is_sys_suspended);dev_err (hba->dev,"Auto BKOPS=%d, Host self-block=%d\n" , hba->auto_bkops_enabled, hba->host->host_self_blocked);
@@ -1991,7 +1993,7 @@ static void ufshcd_clk_scaling_start_busy(struct ufs_hba *hba)if (!hba->clk_scaling.active_reqs++) queue_resume_work = true; -if (!hba->clk_scaling.is_enabled || hba->pm_op_in_progress) +if (!hba->clk_scaling.is_enabled || hba->wl_pm_op_in_progress)return ;if (queue_resume_work)
@@ -2640,7 +2642,7 @@ static int ufshcd_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *cmd) lrbp = &hba->lrb[tag];if (unlikely (lrbp->in_use)) { -if (hba->pm_op_in_progress) +if (hba->wl_pm_op_in_progress)set_host_byte (cmd,DID_BAD_TARGET );else err =SCSI_MLQUEUE_HOST_BUSY ;
@@ -2687,7 +2689,7 @@ static int ufshcd_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *cmd)* err handler blocked for too long. So, just fail the scsi cmd * sent from PM ops, err handler can recover PM error anyways. */ -if (hba->pm_op_in_progress) { +if (hba->wl_pm_op_in_progress) { hba->force_reset = true;set_host_byte (cmd,DID_BAD_TARGET ); goto out_compl_cmd;
@@ -5036,7 +5038,7 @@ ufshcd_transfer_rsp_status(struct ufs_hba *hba, struct ufshcd_lrb *lrbp)* solution could be to abort the system suspend if * UFS device needs urgent BKOPs. */ -if (!hba->pm_op_in_progress && +if (!hba->wl_pm_op_in_progress && !ufshcd_eh_in_progress (hba) &&ufshcd_is_exception_event (lrbp->ucd_rsp_ptr))/* Flushed in suspend */
@@ -5799,7 +5801,7 @@ static void ufshcd_err_handling_prepare(struct ufs_hba *hba) {ufshcd_rpm_get_sync (hba);if (pm_runtime_status_suspended (&hba->sdev_ufs_device->sdev_gendev) || - hba->is_sys_suspended) { + hba->is_wl_sys_suspended) {enum ufs_pm_op pm_op;/*
@@ -5816,7 +5818,7 @@ static void ufshcd_err_handling_prepare(struct ufs_hba *hba)if (!ufshcd_is_clkgating_allowed (hba))ufshcd_setup_clocks (hba, true);ufshcd_release (hba); - pm_op = hba->is_sys_suspended ?UFS_SYSTEM_PM :UFS_RUNTIME_PM ; + pm_op = hba->is_wl_sys_suspended ?UFS_SYSTEM_PM :UFS_RUNTIME_PM ;ufshcd_vops_resume (hba, pm_op); }else {ufshcd_hold (hba, false);
@@ -5859,7 +5861,7 @@ static void ufshcd_recover_pm_error(struct ufs_hba *hba)struct request_queue *q;int ret; - hba->is_sys_suspended = false; + hba->is_wl_sys_suspended = false;/* * Set RPM status of wlun device to RPM_ACTIVE, * this also clears its runtime error.
@@ -8709,7 +8711,7 @@ static int __ufshcd_wl_suspend(struct ufs_hba *hba, enum ufs_pm_op pm_op)enum ufs_dev_pwr_mode req_dev_pwr_mode;enum uic_link_state req_link_state; - hba->pm_op_in_progress = true; + hba->wl_pm_op_in_progress = true;if (!ufshcd_is_shutdown_pm (pm_op)) { pm_lvl =ufshcd_is_runtime_pm (pm_op) ? hba->rpm_lvl : hba->spm_lvl;
@@ -8844,7 +8846,7 @@ static int __ufshcd_wl_suspend(struct ufs_hba *hba, enum ufs_pm_op pm_op) hba->clk_gating.is_suspended = false;ufshcd_release (hba); } - hba->pm_op_in_progress = false; + hba->wl_pm_op_in_progress = false;return ret; }
@@ -8853,7 +8855,7 @@ static int __ufshcd_wl_resume(struct ufs_hba *hba, enum ufs_pm_op pm_op)int ret;enum uic_link_state old_link_state = hba->uic_link_state; - hba->pm_op_in_progress = true; + hba->wl_pm_op_in_progress = true;/* * Call vendor specific resume callback. As these callbacks may access
@@ -8931,7 +8933,7 @@ static int __ufshcd_wl_resume(struct ufs_hba *hba, enum ufs_pm_op pm_op)ufshcd_update_evt_hist (hba,UFS_EVT_WL_RES_ERR , (u32 )ret); hba->clk_gating.is_suspended = false;ufshcd_release (hba); - hba->pm_op_in_progress = false; + hba->wl_pm_op_in_progress = false;return ret; }
@@ -8997,7 +8999,7 @@ static int ufshcd_wl_suspend(struct device *dev) out:if (!ret) - hba->is_sys_suspended = true; + hba->is_wl_sys_suspended = true;trace_ufshcd_wl_suspend (dev_name (dev), ret,ktime_to_us (ktime_sub (ktime_get (), start)), hba->curr_dev_pwr_mode, hba->uic_link_state);
@@ -9025,7 +9027,7 @@ static int ufshcd_wl_resume(struct device *dev)ktime_to_us (ktime_sub (ktime_get (), start)), hba->curr_dev_pwr_mode, hba->uic_link_state);if (!ret) - hba->is_sys_suspended = false; + hba->is_wl_sys_suspended = false;up (&hba->host_sem);return ret; }
@@ -9067,6 +9069,8 @@ static int ufshcd_suspend(struct ufs_hba *hba)if (!hba->is_powered)return 0 ; + + hba->pm_op_in_progress = true;/* * Disable the host irq as host controller as there won't be any * host controller transaction expected till resume.
@@ -9086,6 +9090,7 @@ static int ufshcd_suspend(struct ufs_hba *hba)ufshcd_vreg_set_lpm (hba);/* Put the host controller in low power mode if possible */ ufshcd_hba_vreg_set_lpm (hba); + hba->pm_op_in_progress = false;return ret; }
@@ -9106,6 +9111,7 @@ static int ufshcd_resume(struct ufs_hba *hba)if (!hba->is_powered)return 0 ; + hba->pm_op_in_progress = true;ufshcd_hba_vreg_set_hpm (hba); ret =ufshcd_vreg_set_hpm (hba);if (ret)
@@ -9125,6 +9131,7 @@ static int ufshcd_resume(struct ufs_hba *hba) out:if (ret)ufshcd_update_evt_hist (hba,UFS_EVT_RESUME_ERR , (u32 )ret); + hba->pm_op_in_progress = false;return ret; }
@@ -9150,6 +9157,10 @@ int ufshcd_system_suspend(struct ufs_hba *hba)trace_ufshcd_system_suspend (dev_name (hba->dev), ret,ktime_to_us (ktime_sub (ktime_get (), start)), hba->curr_dev_pwr_mode, hba->uic_link_state); + +if (!ret) + hba->is_sys_suspended = true; +return ret; }EXPORT_SYMBOL (ufshcd_system_suspend);
@@ -9176,6 +9187,9 @@ int ufshcd_system_resume(struct ufs_hba *hba)ktime_to_us (ktime_sub (ktime_get (), start)), hba->curr_dev_pwr_mode, hba->uic_link_state); +if (!ret) + hba->is_sys_suspended = false; +return ret; }EXPORT_SYMBOL (ufshcd_system_resume);
drivers/scsi/ufs/ufshcd.h +3 -1
@@ -739,7 +739,8 @@ struct ufs_hba {enum ufs_pm_level spm_lvl;struct device_attribute rpm_lvl_attr;struct device_attribute spm_lvl_attr; -int pm_op_in_progress; +bool pm_op_in_progress; +bool wl_pm_op_in_progress;/* Auto-Hibernate Idle Timer register value */ u32 ahit;
@@ -826,6 +827,7 @@ struct ufs_hba {struct devfreq *devfreq;struct ufs_clk_scaling clk_scaling;bool is_sys_suspended; +bool is_wl_sys_suspended;enum bkops_status urgent_bkops_lvl;bool is_urgent_bkops_lvl_checked;
Signature · 1 line
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project.
Re: [PATCH v1 1/6] scsi: ufs: Differentiate status of hba and wl pm ops
Please ignore this one - it is duplicated.
Quoted 235 lines · Can Guo
Put
pm_op_in_progressandis_sys_suspendflags back to ufshcd hba pm ops, add two new flags, namelywl_pm_op_in_progressandis_wl_sys_suspended, to track the UFS device W-LU pm ops. This helps us differentiate the status of hba and wl pm ops when we need to do troubleshooting.Signed-off-by Can Guo <[email protected]>--- drivers/scsi/ufs/ufshcd.c | 42 ++++++++++++++++++++++++++++-------------- drivers/scsi/ufs/ufshcd.h | 4 +++- 2 files changed, 31 insertions(+), 15 deletions(-)drivers/scsi/ufs/ufshcd.c +3
-1@@ -543,7 +543,9 @@ static void ufshcd_print_host_state(struct ufs_hba *hba) hba->saved_err, hba->saved_uic_err);dev_err (hba->dev,"Device power mode=%d, UIC link state=%d\n" , hba->curr_dev_pwr_mode, hba->uic_link_state); -dev_err (hba->dev,"PM in progress=%d, sys. suspended=%d\n" , +dev_err (hba->dev,"wl_pm_op_in_progress=%d, is_wl_sys_suspended=%d\n", + hba->wl_pm_op_in_progress, hba->is_wl_sys_suspended); +dev_err (hba->dev,"pm_op_in_progress=%d, is_sys_suspended=%d\n" , hba->pm_op_in_progress, hba->is_sys_suspended);drivers/scsi/ufs/ufshcd.c +1
-1dev_err (hba->dev,"Auto BKOPS=%d, Host self-block=%d\n" , hba->auto_bkops_enabled, hba->host->host_self_blocked);@@ -1991,7 +1993,7 @@ static void ufshcd_clk_scaling_start_busy(struct ufs_hba *hba)if (!hba->clk_scaling.active_reqs++) queue_resume_work = true; -if (!hba->clk_scaling.is_enabled || hba->pm_op_in_progress) +if (!hba->clk_scaling.is_enabled || hba->wl_pm_op_in_progress)return ;drivers/scsi/ufs/ufshcd.c +1
-1if (queue_resume_work)@@ -2640,7 +2642,7 @@ static int ufshcd_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *cmd) lrbp = &hba->lrb[tag];if (unlikely (lrbp->in_use)) { -if (hba->pm_op_in_progress) +if (hba->wl_pm_op_in_progress)set_host_byte (cmd,DID_BAD_TARGET );else drivers/scsi/ufs/ufshcd.c +1
-1err =SCSI_MLQUEUE_HOST_BUSY ;@@ -2687,7 +2689,7 @@ static int ufshcd_queuecommand(struct Scsi_Host*host, struct scsi_cmnd *cmd) * err handler blocked for too long. So, just fail the scsi cmd * sent from PM ops, err handler can recover PM error anyways. */ -if (hba->pm_op_in_progress) { +if (hba->wl_pm_op_in_progress) { hba->force_reset = true;set_host_byte (cmd,DID_BAD_TARGET );drivers/scsi/ufs/ufshcd.c +1
-1goto out_compl_cmd;@@ -5036,7 +5038,7 @@ ufshcd_transfer_rsp_status(struct ufs_hba *hba,struct ufshcd_lrb *lrbp) * solution could be to abort the system suspend if * UFS device needs urgent BKOPs. */ -if (!hba->pm_op_in_progress && +if (!hba->wl_pm_op_in_progress && !ufshcd_eh_in_progress (hba) &&ufshcd_is_exception_event (lrbp->ucd_rsp_ptr))drivers/scsi/ufs/ufshcd.c +0
-0/* Flushed in suspend */ @@ -5799,7 +5801,7 @@ static void ufshcd_err_handling_prepare(struct ufs_hba *hba) {ufshcd_rpm_get_sync (hba); if (pm_runtime_status_suspended(&hba->sdev_ufs_device->sdev_gendev)||
drivers/scsi/ufs/ufshcd.c +2
-2- hba->is_sys_suspended) { + hba->is_wl_sys_suspended) {enum ufs_pm_op pm_op;/* @@ -5816,7 +5818,7 @@ static void ufshcd_err_handling_prepare(struct ufs_hba *hba)if (!ufshcd_is_clkgating_allowed (hba))ufshcd_setup_clocks (hba, true);ufshcd_release (hba); - pm_op = hba->is_sys_suspended ?UFS_SYSTEM_PM :UFS_RUNTIME_PM ; + pm_op = hba->is_wl_sys_suspended ?UFS_SYSTEM_PM :UFS_RUNTIME_PM ;ufshcd_vops_resume (hba, pm_op); }else {drivers/scsi/ufs/ufshcd.c +1
-1ufshcd_hold (hba, false);@@ -5859,7 +5861,7 @@ static void ufshcd_recover_pm_error(struct ufs_hba *hba)struct request_queue *q;int ret; - hba->is_sys_suspended = false; + hba->is_wl_sys_suspended = false;/* * Set RPM status of wlun device to RPM_ACTIVE, drivers/scsi/ufs/ufshcd.c +1
-1* this also clears its runtime error. @@ -8709,7 +8711,7 @@ static int __ufshcd_wl_suspend(struct ufs_hba *hba, enum ufs_pm_op pm_op)enum ufs_dev_pwr_mode req_dev_pwr_mode;enum uic_link_state req_link_state; - hba->pm_op_in_progress = true; + hba->wl_pm_op_in_progress = true;if (!ufshcd_is_shutdown_pm (pm_op)) { pm_lvl = ufshcd_is_runtime_pm(pm_op) ?drivers/scsi/ufs/ufshcd.c +2
-2hba->rpm_lvl : hba->spm_lvl;@@ -8844,7 +8846,7 @@ static int __ufshcd_wl_suspend(struct ufs_hba *hba, enum ufs_pm_op pm_op) hba->clk_gating.is_suspended = false;ufshcd_release (hba); } - hba->pm_op_in_progress = false; + hba->wl_pm_op_in_progress = false;return ret; }@@ -8853,7 +8855,7 @@ static int __ufshcd_wl_resume(struct ufs_hba *hba, enum ufs_pm_op pm_op)int ret;enum uic_link_state old_link_state = hba->uic_link_state; - hba->pm_op_in_progress = true; + hba->wl_pm_op_in_progress = true;/* * Call vendor specific resume callback. As these callbacks may
accessdrivers/scsi/ufs/ufshcd.c +15
-3@@ -8931,7 +8933,7 @@ static int __ufshcd_wl_resume(struct ufs_hba *hba, enum ufs_pm_op pm_op) ufshcd_update_evt_hist(hba, UFS_EVT_WL_RES_ERR, (u32)ret); hba->clk_gating.is_suspended = false;ufshcd_release (hba); - hba->pm_op_in_progress = false; + hba->wl_pm_op_in_progress = false;return ret; }@@ -8997,7 +8999,7 @@ static int ufshcd_wl_suspend(struct device *dev) out:if (!ret) - hba->is_sys_suspended = true; + hba->is_wl_sys_suspended = true;trace_ufshcd_wl_suspend (dev_name (dev), ret,ktime_to_us (ktime_sub (ktime_get (), start)), hba->curr_dev_pwr_mode, hba->uic_link_state);@@ -9025,7 +9027,7 @@ static int ufshcd_wl_resume(struct device *dev)ktime_to_us (ktime_sub (ktime_get (), start)), hba->curr_dev_pwr_mode, hba->uic_link_state);if (!ret) - hba->is_sys_suspended = false; + hba->is_wl_sys_suspended = false;up (&hba->host_sem);return ret; }@@ -9067,6 +9069,8 @@ static int ufshcd_suspend(struct ufs_hba *hba)if (!hba->is_powered)return 0 ; + + hba->pm_op_in_progress = true;/* * Disable the host irq as host controller as there won't be any * host controller transaction expected till resume. @@ -9086,6 +9090,7 @@ static int ufshcd_suspend(struct ufs_hba *hba)ufshcd_vreg_set_lpm (hba);/* Put the host controller in low power mode if possible */ ufshcd_hba_vreg_set_lpm (hba); + hba->pm_op_in_progress = false;return ret; }@@ -9106,6 +9111,7 @@ static int ufshcd_resume(struct ufs_hba *hba)if (!hba->is_powered)return 0 ; + hba->pm_op_in_progress = true;ufshcd_hba_vreg_set_hpm (hba); ret =ufshcd_vreg_set_hpm (hba);if (ret)@@ -9125,6 +9131,7 @@ static int ufshcd_resume(struct ufs_hba *hba) out:if (ret)ufshcd_update_evt_hist (hba,UFS_EVT_RESUME_ERR , (u32 )ret); + hba->pm_op_in_progress = false;return ret; }@@ -9150,6 +9157,10 @@ int ufshcd_system_suspend(struct ufs_hba *hba)trace_ufshcd_system_suspend (dev_name (hba->dev), ret,ktime_to_us (ktime_sub (ktime_get (), start)), hba->curr_dev_pwr_mode, hba->uic_link_state); + +if (!ret) + hba->is_sys_suspended = true; +return ret; }EXPORT_SYMBOL (ufshcd_system_suspend);@@ -9176,6 +9187,9 @@ int ufshcd_system_resume(struct ufs_hba *hba)ktime_to_us (ktime_sub (ktime_get (), start)), hba->curr_dev_pwr_mode, hba->uic_link_state); +if (!ret) + hba->is_sys_suspended = false; +return ret; }EXPORT_SYMBOL (ufshcd_system_resume);drivers/scsi/ufs/ufshcd.h +3
-1@@ -739,7 +739,8 @@ struct ufs_hba {enum ufs_pm_level spm_lvl;struct device_attribute rpm_lvl_attr;struct device_attribute spm_lvl_attr; -int pm_op_in_progress; +bool pm_op_in_progress; +bool wl_pm_op_in_progress;/* Auto-Hibernate Idle Timer register value */ u32 ahit;@@ -826,6 +827,7 @@ struct ufs_hba {struct devfreq *devfreq;struct ufs_clk_scaling clk_scaling;bool is_sys_suspended; +bool is_wl_sys_suspended;enum bkops_status urgent_bkops_lvl;bool is_urgent_bkops_lvl_checked;
PATCH 2/6 scsi: ufs: Update the return value of supplier pm ops
In reply to Can Guorpm_get_suppliers() is returning an error only if the error is negative. However, ufshcd_wl_resume() may return a positive error code, e.g., when hibern8 or SSU cmd fails. Make the positive return value a negative error code so that consumers are aware of any resume failure from their supplier. Make the same change to ufshcd_wl_suspend() just to keep symmetry.
--- drivers/scsi/ufs/ufshcd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/scsi/ufs/ufshcd.c +2 -2
@@ -8847,7 +8847,7 @@ static int __ufshcd_wl_suspend(struct ufs_hba *hba, enum ufs_pm_op pm_op)ufshcd_release (hba); } hba->wl_pm_op_in_progress = false; -return ret; +return ret <=0 ? ret : -EINVAL ; }static int __ufshcd_wl_resume (struct ufs_hba *hba,enum ufs_pm_op pm_op)
@@ -8934,7 +8934,7 @@ static int __ufshcd_wl_resume(struct ufs_hba *hba, enum ufs_pm_op pm_op) hba->clk_gating.is_suspended = false;ufshcd_release (hba); hba->wl_pm_op_in_progress = false; -return ret; +return ret <=0 ? ret : -EINVAL ; }static int ufshcd_wl_runtime_suspend (struct device *dev)
Signature · 1 line
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project.
PATCH 3/6 scsi: ufs: Simplify error handling preparation
In reply to Can GuoCommit cb7e6f05fce67c965194ac04467e1ba7bc70b069 ("scsi: ufs: core: Enable power management for wlun") moves UFS operations out of ufshcd_resume(), so in error handling preparation, if ufshcd hba has failed to resume, there is no point to re-enable IRQ/clk/pwr.
--- drivers/scsi/ufs/ufshcd.c | 61 ++++++++++++++++++++++++++++------------------- 1 file changed, 37 insertions(+), 24 deletions(-)
drivers/scsi/ufs/ufshcd.c +37 -24
@@ -2680,8 +2680,8 @@ static int ufshcd_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *cmd)break ;case UFSHCD_STATE_EH_SCHEDULED_FATAL :/* -* pm_runtime_get_sync() is used at error handling preparation -* stage. If a scsi cmd, e.g. the SSU cmd, is sent from hba's +* ufshcd_rpm_get_sync() is used at error handling preparation +* stage. If a scsi cmd, e.g., the SSU cmd, is sent from the * PM ops, it can never be finished if we let SCSI layer keep * retrying it, which gets err handler stuck forever. Neither * can we let the scsi cmd pass through, because UFS is in bad
@@ -5797,28 +5797,33 @@ static void ufshcd_clk_scaling_suspend(struct ufs_hba *hba, bool suspend) } } -static void ufshcd_err_handling_prepare (struct ufs_hba *hba) +static int ufshcd_err_handling_prepare (struct ufs_hba *hba) { +unsigned long flags; + +/* +* Exclusively call pm_runtime_get_sync(hba->dev) once, in case +* following ufshcd_rpm_get_sync() fails. +*/ +pm_runtime_get_sync (hba->dev); +/* +* IRQ, clocks and powers are supposed to be ON by now, unless error +* happened to ufshcd_resume(), which is out of our control. +*/ +if (pm_runtime_suspended (hba->dev) || hba->is_sys_suspended) { +spin_lock_irqsave (hba->host->host_lock, flags); + hba->ufshcd_state =UFSHCD_STATE_ERROR ; +spin_unlock_irqrestore (hba->host->host_lock, flags); +pm_runtime_put (hba->dev); +return -EINVAL ; + } +ufshcd_rpm_get_sync (hba); -if (pm_runtime_status_suspended (&hba->sdev_ufs_device->sdev_gendev) || +if (pm_runtime_suspended (&hba->sdev_ufs_device->sdev_gendev) || hba->is_wl_sys_suspended) { -enum ufs_pm_op pm_op; +enum ufs_pm_op pm_op = hba->is_wl_sys_suspended ? +UFS_SYSTEM_PM :UFS_RUNTIME_PM ; -/* -* Don't assume anything of resume, if -* resume fails, irq and clocks can be OFF, and powers -* can be OFF or in LPM. -*/ -ufshcd_setup_hba_vreg (hba, true); -ufshcd_enable_irq (hba); -ufshcd_setup_vreg (hba, true); -ufshcd_config_vreg_hpm (hba, hba->vreg_info.vccq); -ufshcd_config_vreg_hpm (hba, hba->vreg_info.vccq2); -ufshcd_hold (hba, false); -if (!ufshcd_is_clkgating_allowed (hba)) -ufshcd_setup_clocks (hba, true); -ufshcd_release (hba); - pm_op = hba->is_wl_sys_suspended ?UFS_SYSTEM_PM :UFS_RUNTIME_PM ;ufshcd_vops_resume (hba, pm_op); }else {ufshcd_hold (hba, false);
@@ -5832,6 +5837,7 @@ static void ufshcd_err_handling_prepare(struct ufs_hba *hba)down_write (&hba->clk_scaling_lock);up_write (&hba->clk_scaling_lock);cancel_work_sync (&hba->eeh_work); +return 0 ; }static void ufshcd_err_handling_unprepare (struct ufs_hba *hba)
@@ -5842,6 +5848,7 @@ static void ufshcd_err_handling_unprepare(struct ufs_hba *hba)ufshcd_clk_scaling_suspend (hba, false);ufshcd_clear_ua_wluns (hba);ufshcd_rpm_put (hba); +pm_runtime_put (hba->dev); }static inline bool ufshcd_err_handling_should_stop (struct ufs_hba *hba)
@@ -5933,10 +5940,15 @@ static void ufshcd_err_handler(struct work_struct *work)up (&hba->host_sem);return ; } -ufshcd_set_eh_in_progress (hba);spin_unlock_irqrestore (hba->host->host_lock, flags); -ufshcd_err_handling_prepare (hba); +if (ufshcd_err_handling_prepare (hba)) { +dev_err (hba->dev,"%s: error handling preparation failed\n" , + __func__); +up (&hba->host_sem); +return ; + }spin_lock_irqsave (hba->host->host_lock, flags); +ufshcd_set_eh_in_progress (hba);if (hba->ufshcd_state !=UFSHCD_STATE_ERROR ) hba->ufshcd_state =UFSHCD_STATE_RESET ;
@@ -8922,6 +8934,9 @@ static int __ufshcd_wl_resume(struct ufs_hba *hba, enum ufs_pm_op pm_op)/* Enable Auto-Hibernate if configured */ ufshcd_auto_hibern8_enable (hba); + + hba->clk_gating.is_suspended = false; +ufshcd_release (hba); goto out; set_old_link_state:
@@ -8931,8 +8946,6 @@ static int __ufshcd_wl_resume(struct ufs_hba *hba, enum ufs_pm_op pm_op) out:if (ret)ufshcd_update_evt_hist (hba,UFS_EVT_WL_RES_ERR , (u32 )ret); - hba->clk_gating.is_suspended = false; -ufshcd_release (hba); hba->wl_pm_op_in_progress = false;return ret <=0 ? ret : -EINVAL ; }
Signature · 1 line
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project.
PATCH 4/6 scsi: ufs: Update ufshcd_recover_pm_error()
In reply to Can GuoCommit cb7e6f05fce67c965194ac04467e1ba7bc70b069 ("scsi: ufs: core: Enable power management for wlun") makes UFS device W-LU scsi device the supplier and the others as consumers. If the supplier's runtime pm ops fails or has failed, not only supplier has the error saved to dev->power.runtime_error, the error may (most likely) be saved by one or more consumers, see also rpm_get_suppliers(). Update ufshcd_recover_pm_error() accordingly to clear the runtime_error of the supplier and its consumers to get runtime PM back to work on them.
--- drivers/scsi/ufs/ufshcd.c | 50 ++++++++++++++++++++--------------------------- 1 file changed, 21 insertions(+), 29 deletions(-)
drivers/scsi/ufs/ufshcd.c +21 -29
@@ -242,6 +242,7 @@ static irqreturn_t ufshcd_intr(int irq, void *__hba);static int ufshcd_change_power_mode (struct ufs_hba *hba,struct ufs_pa_layer_attr *pwr_mode);static void ufshcd_schedule_eh_work (struct ufs_hba *hba); +static void ufshcd_recover_pm_error (struct ufs_hba *hba);static int ufshcd_setup_hba_vreg (struct ufs_hba *hba,bool on);static int ufshcd_setup_vreg (struct ufs_hba *hba,bool on); static inline int ufshcd_config_vreg_hpm(struct ufs_hba *hba,
@@ -5840,12 +5841,14 @@ static int ufshcd_err_handling_prepare(struct ufs_hba *hba)return 0 ; } -static void ufshcd_err_handling_unprepare (struct ufs_hba *hba) +static void ufshcd_err_handling_unprepare (struct ufs_hba *hba,int reset_err) {ufshcd_scsi_unblock_requests (hba);ufshcd_release (hba);if (ufshcd_is_clkscaling_supported (hba))ufshcd_clk_scaling_suspend (hba, false); +if (!reset_err) +ufshcd_recover_pm_error (hba);ufshcd_clear_ua_wluns (hba);ufshcd_rpm_put (hba);pm_runtime_put (hba->dev);
@@ -5864,34 +5867,26 @@ static inline bool ufshcd_err_handling_should_stop(struct ufs_hba *hba)static void ufshcd_recover_pm_error (struct ufs_hba *hba) {struct Scsi_Host *shost = hba->host; -struct scsi_device *sdev; -struct request_queue *q; +struct scsi_device *sdev = hba->sdev_ufs_device; +struct scsi_target *starget = sdev->sdev_target;int ret; hba->is_wl_sys_suspended = false; -/* -* Set RPM status of wlun device to RPM_ACTIVE, -* this also clears its runtime error. -*/ - ret =pm_runtime_set_active (&hba->sdev_ufs_device->sdev_gendev); -/* hba device might have a runtime error otherwise */ -if (ret) - ret =pm_runtime_set_active (hba->dev); -/* -* If wlun device had runtime error, we also need to resume those -* consumer scsi devices in case any of them has failed to be -* resumed due to supplier runtime resume failure. This is to unblock -* blk_queue_enter in case there are bios waiting inside it. -*/ -if (!ret) { -shost_for_each_device (sdev, shost) { - q = sdev->request_queue; -if (q->dev && (q->rpm_status ==RPM_SUSPENDED || - q->rpm_status ==RPM_SUSPENDING )) -pm_request_resume (q->dev); - } +/* Resume parent/target to clear path for pm_runtime_set_active() */ +pm_runtime_get_sync (&starget->dev); +shost_for_each_device (sdev, shost) { +struct device *dev = &sdev->sdev_gendev; + +pm_runtime_get_sync (dev); +/* Clear saved dev->power.runtime_error */ + ret =pm_runtime_set_active (dev); +if (!ret) +/* runtime_error cleared, kick blk_queue_enter() */ +blk_set_runtime_active (sdev->request_queue); +pm_runtime_put (dev); } +pm_runtime_put (&starget->dev); }#else static inline void ufshcd_recover_pm_error (struct ufs_hba *hba)
@@ -5925,7 +5920,7 @@ static void ufshcd_err_handler(struct work_struct *work)unsigned long flags;bool err_xfer = false;bool err_tm = false; -int err =0 , pmc_err; +int err =-1 , pmc_err;int tag;bool needs_reset = false, needs_restore = false;
@@ -6094,8 +6089,6 @@ static void ufshcd_err_handler(struct work_struct *work)if (err)dev_err (hba->dev,"%s: reset and restore failed with err %d\n" , __func__, err); -else -ufshcd_recover_pm_error (hba);spin_lock_irqsave (hba->host->host_lock, flags); }
@@ -6109,7 +6102,7 @@ static void ufshcd_err_handler(struct work_struct *work) }ufshcd_clear_eh_in_progress (hba);spin_unlock_irqrestore (hba->host->host_lock, flags); -ufshcd_err_handling_unprepare (hba); +ufshcd_err_handling_unprepare (hba, err);up (&hba->host_sem); }
@@ -6983,7 +6976,6 @@ static int ufshcd_abort(struct scsi_cmnd *cmd) hba->force_reset = true;ufshcd_schedule_eh_work (hba); } -spin_unlock_irqrestore (host->host_lock, flags); goto out; }
Signature · 1 line
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project.
PATCH 5/6 scsi: ufs: Let host_sem cover the entire system suspend/resume
In reply to Can GuoUFS error handling now is doing more than just re-probing, but also sending scsi cmds, e.g., for clearing UACs, and recovering runtime PM error, which may change runtime status of scsi devices. To protect system suspend/resume from being disturbed by error handling, move the host_sem from wl pm ops to ufshcd_suspend_prepare() and ufshcd_resume_complete().
--- drivers/scsi/ufs/ufshcd.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
drivers/scsi/ufs/ufshcd.c +3 -5
@@ -8991,16 +8991,13 @@ static int ufshcd_wl_suspend(struct device *dev)ktime_t start =ktime_get (); hba =shost_priv (sdev->host); -down (&hba->host_sem);if (pm_runtime_suspended (dev)) goto out; ret =__ufshcd_wl_suspend (hba,UFS_SYSTEM_PM ); -if (ret) { +if (ret)dev_err (&sdev->sdev_gendev,"%s failed: %d\n" , __func__, ret); -up (&hba->host_sem); - } out:if (!ret)
@@ -9033,7 +9030,6 @@ static int ufshcd_wl_resume(struct device *dev) hba->curr_dev_pwr_mode, hba->uic_link_state);if (!ret) hba->is_wl_sys_suspended = false; -up (&hba->host_sem); return ret; }#endif
@@ -9600,6 +9596,7 @@ void ufshcd_resume_complete(struct device *dev)ufshcd_rpmb_rpm_put (hba); hba->rpmb_complete_put = false; } +up (&hba->host_sem); }EXPORT_SYMBOL_GPL (ufshcd_resume_complete);
@@ -9626,6 +9623,7 @@ int ufshcd_suspend_prepare(struct device *dev)ufshcd_rpmb_rpm_get_sync (hba); hba->rpmb_complete_put = true; } +down (&hba->host_sem);return 0 ; }EXPORT_SYMBOL_GPL (ufshcd_suspend_prepare);
Signature · 1 line
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project.
Re: [PATCH v1 5/6] scsi: ufs: Let host_sem cover the entire system suspend/resume
Quoted 5 lines · Can Guo
UFS error handling now is doing more than just re-probing, but also sending scsi cmds, e.g., for clearing UACs, and recovering runtime PM error, which may change runtime status of scsi devices. To protect system suspend/resume from being disturbed by error handling, move the
host_semfrom wl pm ops toufshcd_suspend_prepare()andufshcd_resume_complete().
In ufshcd.h I found the following:
* @host_sem: semaphore used to serialize concurrent contexts
That's the wrong way to use a synchronization object. A synchronization object must protect data instead of code. Does host_sem perhaps need to be split into multiple synchronization objects?
Thanks,
Bart.
Re: [PATCH v1 5/6] scsi: ufs: Let host_sem cover the entire system suspend/resume
Hi Bart,
Quoted 7 lines · Bart Van Assche
Quoted 5 lines · Can Guo
UFS error handling now is doing more than just re-probing, but also sending scsi cmds, e.g., for clearing UACs, and recovering runtime PM error, which may change runtime status of scsi devices. To protect system suspend/resume from being disturbed by error handling, move the
host_semfrom wl pm ops toufshcd_suspend_prepare()andufshcd_resume_complete().
Quoted 7 lines
In
ufshcd.hI found the following:* @host_sem: semaphore used to serialize concurrent contexts
That's the wrong way to use a synchronization object. A synchronization object must protect data instead of code. Does
host_semperhaps need to be split into multiple synchronization objects?
Thanks for the comments. These contexts are changing critical data and registers, so the sem is used to protect data actually, just like the scaling_lock protecting scaling and cmd transations.
Thanks,
Can Guo.
Quoted 4 lines
Thanks,
Bart.
Re: [PATCH v1 5/6] scsi: ufs: Let host_sem cover the entire system suspend/resume
Quoted 17 lines · Can Guo
Hi Bart,
Quoted 14 lines · Bart Van Assche
Quoted 8 lines · Can Guo
UFS error handling now is doing more than just re-probing, but also sending
scsi cmds, e.g., for clearing UACs, and recovering runtime PM error, which
may change runtime status of scsi devices. To protect system suspend/resume
from being disturbed by error handling, move thehost_semfrom wl pm ops toufshcd_suspend_prepare()andufshcd_resume_complete().In
ufshcd.hI found the following:* @host_sem: semaphore used to serialize concurrent contexts
Quoted 7 lines
Quoted 3 lines
That's the wrong way to use a synchronization object. A synchronization object must protect data instead of code. Does
host_semperhaps need to be split into multiple synchronization objects?Thanks for the comments. These contexts are changing critical data and registers, so the sem is used to protect data actually, just like the
scaling_lockprotecting scaling and cmd transations.
But where is the documentation that explains which data members are protected by hba->host_sem and which data members are protected by hba->host->host_lock? Was the host_lock protection perhaps introduced before scsi-mq was introduced? Before scsi-mq acquiring the host_lock was sufficient to serialize against ufshcd_queuecommand() but that is not sufficient when using scsi-mq.
I want to verify whether locking is used correctly in the UFS driver but without documentation of which synchronization object protects which data members that is not possible.
Thanks,
Bart.
PATCH 6/6 scsi: ufs: Update the fast abort path in ufshcd_abort() for PM requests
In reply to Can GuoIf PM requests fail during runtime suspend/resume, RPM framework saves the error to dev->power.runtime_error. Before the runtime_error gets cleared, runtime PM on this specific device won't work again, leaving the device in either suspended or active state permanently.
When task abort happens to a PM request sent during runtime suspend/resume, even if it can be successfully aborted, RPM framework anyways saves the (TIMEOUT) error. But we want more and we can do better - let error handling recover and clear the runtime_error. So, let PM requests take the fast abort path in ufshcd_abort().
--- drivers/scsi/ufs/ufshcd.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-)
drivers/scsi/ufs/ufshcd.c +12 -9
@@ -2643,7 +2643,7 @@ static int ufshcd_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *cmd) lrbp = &hba->lrb[tag];if (unlikely (lrbp->in_use)) { -if (hba->wl_pm_op_in_progress) +if (cmd->request->rq_flags &RQF_PM )set_host_byte (cmd,DID_BAD_TARGET );else err =SCSI_MLQUEUE_HOST_BUSY ;
@@ -2690,7 +2690,7 @@ static int ufshcd_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *cmd)* err handler blocked for too long. So, just fail the scsi cmd * sent from PM ops, err handler can recover PM error anyways. */ -if (hba->wl_pm_op_in_progress) { +if (cmd->request->rq_flags &RQF_PM ) { hba->force_reset = true;set_host_byte (cmd,DID_BAD_TARGET ); goto out_compl_cmd;
@@ -6959,14 +6959,17 @@ static int ufshcd_abort(struct scsi_cmnd *cmd) }/* -* Task abort to the device W-LUN is illegal. When this command -* will fail, due to spec violation, scsi err handling next step -* will be to send LU reset which, again, is a spec violation. -* To avoid these unnecessary/illegal steps, first we clean up -* the lrb taken by this cmd and mark the lrb as in_use, then -* queue the eh_work and bail. +* This fast path guarantees the cmd always gets aborted successfully, +* meanwhile it invokes the error handler. It allows contexts, which +* are blocked by this cmd, to fail fast. It serves multiple purposes: +* #1 To avoid unnecessary/illagal abort attempts to the W-LU. +* #2 To avoid live lock between eh_work and specific contexts, i.e., +* suspend/resume and eh_work itself. +* #3 To let eh_work recover runtime PM error in case abort happens +* to cmds sent from runtime suspend/resume ops. */ -if (lrbp->lun ==UFS_UPIU_UFS_DEVICE_WLUN ) { +if (lrbp->lun ==UFS_UPIU_UFS_DEVICE_WLUN || + (cmd->request->rq_flags &RQF_PM )) {ufshcd_update_evt_hist (hba,UFS_EVT_ABORT , lrbp->lun);spin_lock_irqsave (host->host_lock, flags);if (lrbp->cmd) {
Signature · 1 line
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project.
Re: [PATCH v1 6/6] scsi: ufs: Update the fast abort path in ufshcd_abort() for PM requests
Quoted 10 lines · Can Guo
If PM requests fail during runtime suspend/resume, RPM framework saves the error to
dev->power.runtime_error. Before theruntime_errorgets cleared, runtime PM on this specific device won't work again, leaving the device in either suspended or active state permanently.When task abort happens to a PM request sent during runtime suspend/resume, even if it can be successfully aborted, RPM framework anyways saves the (TIMEOUT) error. But we want more and we can do better - let error handling recover and clear the
runtime_error. So, let PM requests take the fast abort path inufshcd_abort().
The only RQF_PM requests I know of are START STOP UNIT and SYNCHRONIZE CACHE. Are there devices for which these commands can time out or do these commands perhaps only time out as the result of error injection?
drivers/scsi/ufs/ufshcd.c static int ufshcd_abort(struct scsi_cmnd *cmd) · line 6972
Quoted 3 lines
drivers/scsi/ufs/ufshcd.c +2
-1-if (lrbp->lun ==UFS_UPIU_UFS_DEVICE_WLUN ) { +if (lrbp->lun ==UFS_UPIU_UFS_DEVICE_WLUN || + (cmd->request->rq_flags &RQF_PM )) {
Which are the RQF_PM commands that are not sent to a WLUN? Are these START STOP UNIT and SYNCHRONIZE CACHE only?
Thanks,
Bart.
Re: [PATCH v1 6/6] scsi: ufs: Update the fast abort path in ufshcd_abort() for PM requests
Quoted 12 lines · Bart Van Assche
Quoted 10 lines · Can Guo
If PM requests fail during runtime suspend/resume, RPM framework saves the error to
dev->power.runtime_error. Before theruntime_errorgets cleared, runtime PM on this specific device won't work again, leaving the device in either suspended or active state permanently.When task abort happens to a PM request sent during runtime suspend/resume, even if it can be successfully aborted, RPM framework anyways saves the (TIMEOUT) error. But we want more and we can do better - let error handling recover and clear the
runtime_error. So, let PM requests take the fast abort path inufshcd_abort().
Quoted 3 lines
The only
RQF_PMrequests I know of are START STOP UNIT and SYNCHRONIZE CACHE. Are there devices for which these commands can time out or do these commands perhaps only time out as the result of error injection?
There are also REQUEST SENSE requests sent with RQF_PM flag set from pm ops. And they do time out (device does not respond in 60s) in real cases, at least I have seen quite a lot of related issues reported from customers these years.
Quoted 8 lines
drivers/scsi/ufs/ufshcd.c static int ufshcd_abort(struct scsi_cmnd *cmd) · line 6972
Quoted 4 lines
drivers/scsi/ufs/ufshcd.c +2
-1-if (lrbp->lun ==UFS_UPIU_UFS_DEVICE_WLUN ) { +if (lrbp->lun ==UFS_UPIU_UFS_DEVICE_WLUN || + (cmd->request->rq_flags &RQF_PM )) {Which are the
RQF_PMcommands that are not sent to a WLUN? Are these START STOP UNIT and SYNCHRONIZE CACHE only?
There are also REQUEST SENSE cmds sent to the RPMB W-LU, in ufshcd_add_wlus(), ufshcd_err_handler() and ufshcd_rpmb_resume() and/or ufshcd_wl_resume().
And SYNCHRONIZE CACHE cmd is only sent to general LUs, but not W-LUs.
Thanks,
Can Guo.
Quoted 3 lines
Thanks,
Bart.