[PATCH v1] ufs: core: wlun suspend dev/link state error recovery

[PATCH v1] ufs: core: wlun suspend dev/link state error recovery

[peter.wang]

From: Peter Wang <peter.wang@mediatek.com>

When wl suspend error occurs, for example, BKOP or SSU timeout, the host
triggers an error handler and returns -EBUSY to break the wl suspend process.
However, it is possible for the runtime PM to enter wl suspend again before
the error handler has finished, and return -EINVAL because the device is
in an error state. To address this, ensure that the rumtime PM waits for the
error handler to finish, or trigger the error handler in such cases,
because returning -EINVAL can cause the I/O to hang.

Signed-off-by: Peter Wang <peter.wang@mediatek.com>
---
 drivers/ufs/core/ufshcd.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c
index e30fd125988d..0a32f423f6a0 100644
--- a/drivers/ufs/core/ufshcd.c
+++ b/drivers/ufs/core/ufshcd.c
@@ -9791,7 +9791,10 @@ static int __ufshcd_wl_suspend(struct ufs_hba *hba, enum ufs_pm_op pm_op)
 
 	/* UFS device & link must be active before we enter in this function */
 	if (!ufshcd_is_ufs_dev_active(hba) || !ufshcd_is_link_active(hba)) {
-		ret = -EINVAL;
+		/*  Wait err handler finish or tirgger err recovery in this case */
+		if (!ufshcd_eh_in_progress(hba))
+			ufshcd_force_error_recovery(hba);
+		ret = -EBUSY;
 		goto enable_scaling;
 	}
 
-- 
2.18.0

Re: [PATCH v1] ufs: core: wlun suspend dev/link state error recovery

[Bart Van Assche]

On 3/28/24 03:47, peter.wang@mediatek.com wrote:
> diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c
> index e30fd125988d..0a32f423f6a0 100644
> --- a/drivers/ufs/core/ufshcd.c
> +++ b/drivers/ufs/core/ufshcd.c
> @@ -9791,7 +9791,10 @@ static int __ufshcd_wl_suspend(struct ufs_hba *hba, enum ufs_pm_op pm_op)
>   
>   	/* UFS device & link must be active before we enter in this function */
>   	if (!ufshcd_is_ufs_dev_active(hba) || !ufshcd_is_link_active(hba)) {
> -		ret = -EINVAL;
> +		/*  Wait err handler finish or tirgger err recovery in this case */
> +		if (!ufshcd_eh_in_progress(hba))
> +			ufshcd_force_error_recovery(hba);
> +		ret = -EBUSY;
>   		goto enable_scaling;
>   	}

Please fix the spelling in the above source code comment ("tirgger").

Thanks,

Bart.

Re: [PATCH v1] ufs: core: wlun suspend dev/link state error recovery

[Peter Wang (王信友)]

On Thu, 2024-03-28 at 10:31 -0700, Bart Van Assche wrote:
>  	 
> External email : Please do not click links or open attachments until
> you have verified the sender or the content.
>  On 3/28/24 03:47, peter.wang@mediatek.com wrote:
> > diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c
> > index e30fd125988d..0a32f423f6a0 100644
> > --- a/drivers/ufs/core/ufshcd.c
> > +++ b/drivers/ufs/core/ufshcd.c
> > @@ -9791,7 +9791,10 @@ static int __ufshcd_wl_suspend(struct
> ufs_hba *hba, enum ufs_pm_op pm_op)
> >   
> >   /* UFS device & link must be active before we enter in this
> function */
> >   if (!ufshcd_is_ufs_dev_active(hba) ||
> !ufshcd_is_link_active(hba)) {
> > -ret = -EINVAL;
> > +/*  Wait err handler finish or tirgger err recovery in this case
> */
> > +if (!ufshcd_eh_in_progress(hba))
> > +ufshcd_force_error_recovery(hba);
> > +ret = -EBUSY;
> >   goto enable_scaling;
> >   }
> 
> Please fix the spelling in the above source code comment ("tirgger").
> 
> Thanks,
> 
> Bart.
> 
> 

Hi Bart,

Will fix typo next version.

Thanks
Peter