2021-06-23 07:39:16

by Can Guo

Subject: [PATCH v4 04/10] scsi: ufs: Enable IRQ after enabling clocks in error handling preparation

In error handling preparation, enable IRQ after enabling clocks in case
unclocked register access happens.

Fixes: c72e79c0ad2bd ("scsi: ufs: Recover HBA runtime PM error in error handler")
Signed-off-by: Can Guo <[email protected]>
---
drivers/scsi/ufs/ufshcd.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c
index ee70522..5f837c4 100644
--- a/drivers/scsi/ufs/ufshcd.c
+++ b/drivers/scsi/ufs/ufshcd.c
@@ -5927,13 +5927,14 @@ static void ufshcd_err_handling_prepare(struct ufs_hba *hba)
* 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))
+ if (!ufshcd_is_clkgating_allowed(hba)) {
ufshcd_setup_clocks(hba, true);
+ ufshcd_enable_irq(hba);
+ }
ufshcd_release(hba);
pm_op = hba->is_wlu_sys_suspended ? UFS_SYSTEM_PM : UFS_RUNTIME_PM;
ufshcd_vops_resume(hba, pm_op);
--
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project.

2021-06-23 21:22:33

by Bart Van Assche

Subject: Re: [PATCH v4 04/10] scsi: ufs: Enable IRQ after enabling clocks in error handling preparation

On 6/23/21 12:35 AM, Can Guo wrote:
> In error handling preparation, enable IRQ after enabling clocks in case
> unclocked register access happens.
>
> Fixes: c72e79c0ad2bd ("scsi: ufs: Recover HBA runtime PM error in error handler")
> Signed-off-by: Can Guo <[email protected]>
> ---
> drivers/scsi/ufs/ufshcd.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c
> index ee70522..5f837c4 100644
> --- a/drivers/scsi/ufs/ufshcd.c
> +++ b/drivers/scsi/ufs/ufshcd.c
> @@ -5927,13 +5927,14 @@ static void ufshcd_err_handling_prepare(struct ufs_hba *hba)
> * 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))
> + if (!ufshcd_is_clkgating_allowed(hba)) {
> ufshcd_setup_clocks(hba, true);
> + ufshcd_enable_irq(hba);
> + }
> ufshcd_release(hba);
> pm_op = hba->is_wlu_sys_suspended ? UFS_SYSTEM_PM : UFS_RUNTIME_PM;
> ufshcd_vops_resume(hba, pm_op);

Reviewed-by: Bart Van Assche <[email protected]>