[RFC,v1,2/2] ufs: change the way to complete fDeviceInit

Commit Message

Kiwoong Kim June 20, 2020, 7:31 a.m. UTC

Currently, UFS driver checks if fDeviceInit
is cleared at several times, not period. This patch
is to wait its completion with the period, not retrying.
Many device vendors usually provides the specification on
it with just period, not a combination of a number of retrying
and period. So it could be proper to regard to the information
coming from device vendors.

I first added one value regarding the information.

Signed-off-by: Kiwoong Kim <[e-mail]>
---
 drivers/scsi/ufs/ufshcd.c | 32 +++++++++++++++++++++++---------
 1 file changed, 23 insertions(+), 9 deletions(-)

Comments

Bart Van Assche June 20, 2020, 4:27 p.m. UTC | #1

On 2020-06-20 00:31, Kiwoong Kim wrote:
>  static struct ufs_dev_value ufs_dev_values[] = {
> +	UFS_DEV_VAL(UFS_VENDOR_TOSHIBA, UFS_ANY_MODEL,
> +			DEV_VAL_FDEVICEINIT, 2000),
>  	END_FIX
>  };

Can this array be declared 'const'?

Thanks,

Bart.

Kiwoong Kim June 23, 2020, 1:51 a.m. UTC | #2

> On 2020-06-20 00:31, Kiwoong Kim wrote:
> >  static struct ufs_dev_value ufs_dev_values[] = {
> > +	UFS_DEV_VAL(UFS_VENDOR_TOSHIBA, UFS_ANY_MODEL,
> > +			DEV_VAL_FDEVICEINIT, 2000),
> >  	END_FIX
> >  };
> 
> Can this array be declared 'const'?
> 
> Thanks,
> 
> Bart.

Sure. Thanks !

Patch

diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c
index b6bc333..a1d85c6 100644
--- a/drivers/scsi/ufs/ufshcd.c
+++ b/drivers/scsi/ufs/ufshcd.c
@@ -208,6 +208,8 @@  static struct ufs_dev_fix ufs_fixups[] = {
 };
 
 static struct ufs_dev_value ufs_dev_values[] = {
+	UFS_DEV_VAL(UFS_VENDOR_TOSHIBA, UFS_ANY_MODEL,
+			DEV_VAL_FDEVICEINIT, 2000),
 	END_FIX
 };
 
@@ -4162,9 +4164,12 @@  EXPORT_SYMBOL_GPL(ufshcd_config_pwr_mode);
  */
 static int ufshcd_complete_dev_init(struct ufs_hba *hba)
 {
-	int i;
+	u32 dev_init_compl_in_ms = 500;
+	unsigned long timeout;
 	int err;
 	bool flag_res = true;
+	bool is_dev_val;
+	u32 val;
 
 	err = ufshcd_query_flag_retry(hba, UPIU_QUERY_OPCODE_SET_FLAG,
 		QUERY_FLAG_IDN_FDEVICEINIT, 0, NULL);
@@ -4175,19 +4180,28 @@  static int ufshcd_complete_dev_init(struct ufs_hba *hba)
 		goto out;
 	}
 
-	/* poll for max. 1000 iterations for fDeviceInit flag to clear */
-	for (i = 0; i < 1000 && !err && flag_res; i++)
-		err = ufshcd_query_flag_retry(hba, UPIU_QUERY_OPCODE_READ_FLAG,
-			QUERY_FLAG_IDN_FDEVICEINIT, 0, &flag_res);
+	/* Poll fDeviceInit flag to be cleared */
+	is_dev_val = ufs_get_dev_specific_value(hba, DEV_VAL_FDEVICEINIT, &val);
+	dev_init_compl_in_ms = (is_dev_val) ? val : 500;
+	timeout = jiffies + msecs_to_jiffies(dev_init_compl_in_ms);
+	do {
+		err = ufshcd_query_flag(hba, UPIU_QUERY_OPCODE_READ_FLAG,
+					QUERY_FLAG_IDN_FDEVICEINIT, 0, &flag_res);
+		if (!flag_res)
+			break;
+		usleep_range(1000, 2000);
+	} while (time_before(jiffies, timeout));
 
-	if (err)
+	if (err) {
 		dev_err(hba->dev,
-			"%s reading fDeviceInit flag failed with error %d\n",
-			__func__, err);
-	else if (flag_res)
+				"%s reading fDeviceInit flag failed with error %d\n",
+				__func__, err);
+	} else if (flag_res) {
 		dev_err(hba->dev,
 			"%s fDeviceInit was not cleared by the device\n",
 			__func__);
+		err = -EBUSY;
+	}
 
 out:
 	return err;