scsi: ufs: increase fDeviceInit query response timeout (e5ad406c) · Commits · 戴 / test

fDeviceInit query response time for some devices is too long that default query request timeout of 100ms may not be enough. Experiments show that fDeviceInit response sometimes takes 500ms so to be on safer side this change sets the timeout to 600ms. Without this change, we might unnecessarily have to retry fDeviceInit query requests multiple times and each query request timeout prints one error message. Reviewed-by:

Gilad Broner <gbroner@codeaurora.org> Reviewed-by:

Dolev Raviv <draviv@codeaurora.org> Signed-off-by:

Subhash Jadavani <subhashj@codeaurora.org> Signed-off-by:

Yaniv Gardi <ygardi@codeaurora.org> Signed-off-by:

Martin K. Petersen <martin.petersen@oracle.com>

drivers/scsi/ufs/ufshcd.c

+11 −1

Original line number	Diff line number	Diff line
		@@ -58,6 +58,12 @@
		#define QUERY_REQ_RETRIES 10
		/* Query request timeout */
		#define QUERY_REQ_TIMEOUT 30 /* msec */
		/*
		* Query request timeout for fDeviceInit flag
		* fDeviceInit query response time for some devices is too large that default
		* QUERY_REQ_TIMEOUT may not be enough for such devices.
		*/
		#define QUERY_FDEVICEINIT_REQ_TIMEOUT 600 /* msec */

		/* Task management command timeout */
		#define TM_CMD_TIMEOUT 100 /* msecs */
		@@ -1650,6 +1656,7 @@ static int ufshcd_query_flag(struct ufs_hba *hba, enum query_opcode opcode,
		struct ufs_query_req *request = NULL;
		struct ufs_query_res *response = NULL;
		int err, index = 0, selector = 0;
		int timeout = QUERY_REQ_TIMEOUT;

		BUG_ON(!hba);

		@@ -1682,7 +1689,10 @@ static int ufshcd_query_flag(struct ufs_hba *hba, enum query_opcode opcode,
		goto out_unlock;
		}

		err = ufshcd_exec_dev_cmd(hba, DEV_CMD_TYPE_QUERY, QUERY_REQ_TIMEOUT);
		if (idn == QUERY_FLAG_IDN_FDEVICEINIT)
		timeout = QUERY_FDEVICEINIT_REQ_TIMEOUT;

		err = ufshcd_exec_dev_cmd(hba, DEV_CMD_TYPE_QUERY, timeout);

		if (err) {
		dev_err(hba->dev,

Admin message