* [PATCH] scsi: ufs: Add retry flow for failed hba enabling
@ 2020-11-12 5:45 Stanley Chu
2020-11-13 5:28 ` Can Guo
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Stanley Chu @ 2020-11-12 5:45 UTC (permalink / raw)
To: linux-scsi, martin.petersen, avri.altman, alim.akhtar, jejb
Cc: beanhuo, asutoshd, cang, matthias.bgg, bvanassche,
linux-mediatek, linux-arm-kernel, linux-kernel, kuohong.wang,
peter.wang, chun-hung.wu, andy.teng, chaotian.jing, cc.chou,
jiajie.hao, alice.chao, Stanley Chu
Once hba enabling is failed, add retry mechanism and in the
meanwhile allow vendors to apply specific handlings before
the next retry. For example, vendors can do vendor-specific
host reset flow in variant function "ufshcd_vops_hce_enable_notify()".
Signed-off-by: Stanley Chu <stanley.chu@mediatek.com>
---
drivers/scsi/ufs/ufshcd.c | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c
index 8001bbfec5c0..9186ee01379a 100644
--- a/drivers/scsi/ufs/ufshcd.c
+++ b/drivers/scsi/ufs/ufshcd.c
@@ -4328,8 +4328,10 @@ static inline void ufshcd_hba_stop(struct ufs_hba *hba)
*/
static int ufshcd_hba_execute_hce(struct ufs_hba *hba)
{
- int retry;
+ int retry_outer = 3;
+ int retry_inner;
+start:
if (!ufshcd_is_hba_active(hba))
/* change controller state to "reset state" */
ufshcd_hba_stop(hba);
@@ -4355,13 +4357,17 @@ static int ufshcd_hba_execute_hce(struct ufs_hba *hba)
ufshcd_delay_us(hba->vps->hba_enable_delay_us, 100);
/* wait for the host controller to complete initialization */
- retry = 50;
+ retry_inner = 50;
while (ufshcd_is_hba_active(hba)) {
- if (retry) {
- retry--;
+ if (retry_inner) {
+ retry_inner--;
} else {
dev_err(hba->dev,
"Controller enable failed\n");
+ if (retry_outer) {
+ retry_outer--;
+ goto start;
+ }
return -EIO;
}
usleep_range(1000, 1100);
--
2.18.0
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] scsi: ufs: Add retry flow for failed hba enabling
2020-11-12 5:45 [PATCH] scsi: ufs: Add retry flow for failed hba enabling Stanley Chu
@ 2020-11-13 5:28 ` Can Guo
2020-11-17 4:33 ` Martin K. Petersen
2020-11-20 3:31 ` Martin K. Petersen
2 siblings, 0 replies; 4+ messages in thread
From: Can Guo @ 2020-11-13 5:28 UTC (permalink / raw)
To: Stanley Chu
Cc: linux-scsi, martin.petersen, avri.altman, alim.akhtar, jejb,
beanhuo, asutoshd, matthias.bgg, bvanassche, linux-mediatek,
linux-arm-kernel, linux-kernel, kuohong.wang, peter.wang,
chun-hung.wu, andy.teng, chaotian.jing, cc.chou, jiajie.hao,
alice.chao
On 2020-11-12 13:45, Stanley Chu wrote:
> Once hba enabling is failed, add retry mechanism and in the
> meanwhile allow vendors to apply specific handlings before
> the next retry. For example, vendors can do vendor-specific
> host reset flow in variant function "ufshcd_vops_hce_enable_notify()".
>
> Signed-off-by: Stanley Chu <stanley.chu@mediatek.com>
Reviewed-by: Can Guo <cang@codeaurora.org>
> ---
> drivers/scsi/ufs/ufshcd.c | 14 ++++++++++----
> 1 file changed, 10 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c
> index 8001bbfec5c0..9186ee01379a 100644
> --- a/drivers/scsi/ufs/ufshcd.c
> +++ b/drivers/scsi/ufs/ufshcd.c
> @@ -4328,8 +4328,10 @@ static inline void ufshcd_hba_stop(struct
> ufs_hba *hba)
> */
> static int ufshcd_hba_execute_hce(struct ufs_hba *hba)
> {
> - int retry;
> + int retry_outer = 3;
> + int retry_inner;
>
> +start:
> if (!ufshcd_is_hba_active(hba))
> /* change controller state to "reset state" */
> ufshcd_hba_stop(hba);
> @@ -4355,13 +4357,17 @@ static int ufshcd_hba_execute_hce(struct
> ufs_hba *hba)
> ufshcd_delay_us(hba->vps->hba_enable_delay_us, 100);
>
> /* wait for the host controller to complete initialization */
> - retry = 50;
> + retry_inner = 50;
> while (ufshcd_is_hba_active(hba)) {
> - if (retry) {
> - retry--;
> + if (retry_inner) {
> + retry_inner--;
> } else {
> dev_err(hba->dev,
> "Controller enable failed\n");
> + if (retry_outer) {
> + retry_outer--;
> + goto start;
> + }
> return -EIO;
> }
> usleep_range(1000, 1100);
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] scsi: ufs: Add retry flow for failed hba enabling
2020-11-12 5:45 [PATCH] scsi: ufs: Add retry flow for failed hba enabling Stanley Chu
2020-11-13 5:28 ` Can Guo
@ 2020-11-17 4:33 ` Martin K. Petersen
2020-11-20 3:31 ` Martin K. Petersen
2 siblings, 0 replies; 4+ messages in thread
From: Martin K. Petersen @ 2020-11-17 4:33 UTC (permalink / raw)
To: Stanley Chu
Cc: linux-scsi, martin.petersen, avri.altman, alim.akhtar, jejb,
beanhuo, asutoshd, cang, matthias.bgg, bvanassche,
linux-mediatek, linux-arm-kernel, linux-kernel, kuohong.wang,
peter.wang, chun-hung.wu, andy.teng, chaotian.jing, cc.chou,
jiajie.hao, alice.chao
Stanley,
> Once hba enabling is failed, add retry mechanism and in the meanwhile
> allow vendors to apply specific handlings before the next retry. For
> example, vendors can do vendor-specific host reset flow in variant
> function "ufshcd_vops_hce_enable_notify()".
Applied to 5.11/scsi-staging, thanks!
--
Martin K. Petersen Oracle Linux Engineering
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] scsi: ufs: Add retry flow for failed hba enabling
2020-11-12 5:45 [PATCH] scsi: ufs: Add retry flow for failed hba enabling Stanley Chu
2020-11-13 5:28 ` Can Guo
2020-11-17 4:33 ` Martin K. Petersen
@ 2020-11-20 3:31 ` Martin K. Petersen
2 siblings, 0 replies; 4+ messages in thread
From: Martin K. Petersen @ 2020-11-20 3:31 UTC (permalink / raw)
To: jejb, linux-scsi, alim.akhtar, avri.altman, Stanley Chu
Cc: Martin K . Petersen, cang, bvanassche, cc.chou, linux-mediatek,
andy.teng, chaotian.jing, linux-kernel, kuohong.wang, asutoshd,
jiajie.hao, peter.wang, matthias.bgg, linux-arm-kernel,
chun-hung.wu, beanhuo, alice.chao
On Thu, 12 Nov 2020 13:45:37 +0800, Stanley Chu wrote:
> Once hba enabling is failed, add retry mechanism and in the
> meanwhile allow vendors to apply specific handlings before
> the next retry. For example, vendors can do vendor-specific
> host reset flow in variant function "ufshcd_vops_hce_enable_notify()".
Applied to 5.11/scsi-queue, thanks!
[1/1] scsi: ufs: Add retry flow for failed HBA enabling
https://git.kernel.org/mkp/scsi/c/6081b12ceb7d
--
Martin K. Petersen Oracle Linux Engineering
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-11-20 3:32 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-11-12 5:45 [PATCH] scsi: ufs: Add retry flow for failed hba enabling Stanley Chu
2020-11-13 5:28 ` Can Guo
2020-11-17 4:33 ` Martin K. Petersen
2020-11-20 3:31 ` Martin K. Petersen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).