Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4b761b58 authored by Yaniv Gardi's avatar Yaniv Gardi Committed by Martin K. Petersen
Browse files

scsi: ufs: add index details to query error messages 



When sending query to the device, the index  of the failure
is additional useful information that should be printed out as it
might specify the logical unit (LU) where the error occurred.

Signed-off-by: default avatarYaniv Gardi <ygardi@codeaurora.org>
Signed-off-by: default avatarSubhash Jadavani <subhashj@codeaurora.org>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 61e07359

drivers/scsi/ufs/ufshcd.c

+7 −6
Original line number Diff line number Diff line
@@ -1914,8 +1914,8 @@ static int ufshcd_query_attr(struct ufs_hba *hba, enum query_opcode opcode, 
	err = ufshcd_exec_dev_cmd(hba, DEV_CMD_TYPE_QUERY, QUERY_REQ_TIMEOUT);



	if (err) {

		dev_err(hba->dev, "%s: opcode 0x%.2x for idn %d failed, err = %d\n",

				__func__, opcode, idn, err);

		dev_err(hba->dev, "%s: opcode 0x%.2x for idn %d failed, index %d, err = %d\n",

				__func__, opcode, idn, index, err);

		goto out_unlock;

	}
@@ -2014,8 +2014,8 @@ static int __ufshcd_query_descriptor(struct ufs_hba *hba, 
	err = ufshcd_exec_dev_cmd(hba, DEV_CMD_TYPE_QUERY, QUERY_REQ_TIMEOUT);



	if (err) {

		dev_err(hba->dev, "%s: opcode 0x%.2x for idn %d failed, err = %d\n",

				__func__, opcode, idn, err);

		dev_err(hba->dev, "%s: opcode 0x%.2x for idn %d failed, index %d, err = %d\n",

				__func__, opcode, idn, index, err);

		goto out_unlock;

	}
@@ -2112,8 +2112,9 @@ static int ufshcd_read_desc_param(struct ufs_hba *hba, 
	    (desc_buf[QUERY_DESC_LENGTH_OFFSET] !=

	     ufs_query_desc_max_size[desc_id])

	    || (desc_buf[QUERY_DESC_DESC_TYPE_OFFSET] != desc_id)) {

		dev_err(hba->dev, "%s: Failed reading descriptor. desc_id %d param_offset %d buff_len %d ret %d",

			__func__, desc_id, param_offset, buff_len, ret);

		dev_err(hba->dev, "%s: Failed reading descriptor. desc_id %d, param_offset %d, buff_len %d ,index %d, ret %d",

			__func__, desc_id, param_offset, buff_len,

			desc_index, ret);

		if (!ret)

			ret = -EINVAL;