Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-10-31 01:01:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

scsi: ufs: add queries retry mechanism

Browse Source 
Some of the queries might fail during init. To avoid
system failure, we add retry mechanism to issue queries
several times.

Signed-off-by: Dolev Raviv <draviv@codeaurora.org>
Signed-off-by: Subhash Jadavani <subhashj@codeaurora.org>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
Dolev Raviv 2016-11-23 16:30:49 -08:00 committed by Martin K. Petersen
parent 021e292758
commit 61e073590b
1 changed files with 45 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
drivers/scsi/ufs/ufshcd.c
View File

@ -2141,7 +2141,18 @@ static inline int ufshcd_read_power_desc(struct ufs_hba *hba,
u8 *buf, u8 *buf,
u32 size) u32 size)
{ {
return ufshcd_read_desc(hba, QUERY_DESC_IDN_POWER, 0, buf, size); int err = 0;
int retries;
for (retries = QUERY_REQ_RETRIES; retries > 0; retries--) {
/* Read descriptor*/
err = ufshcd_read_desc(hba, QUERY_DESC_IDN_POWER, 0, buf, size);
if (!err)
break;
dev_dbg(hba->dev, "%s: error %d retrying\n", __func__, err);
}
return err;
} }
int ufshcd_read_device_desc(struct ufs_hba *hba, u8 *buf, u32 size) int ufshcd_read_device_desc(struct ufs_hba *hba, u8 *buf, u32 size)
@ -3251,16 +3262,24 @@ static void ufshcd_set_queue_depth(struct scsi_device *sdev)
{ {
int ret = 0; int ret = 0;
u8 lun_qdepth; u8 lun_qdepth;
int retries;
struct ufs_hba *hba; struct ufs_hba *hba;
hba = shost_priv(sdev->host); hba = shost_priv(sdev->host);
lun_qdepth = hba->nutrs; lun_qdepth = hba->nutrs;
ret = ufshcd_read_unit_desc_param(hba, for (retries = QUERY_REQ_RETRIES; retries > 0; retries--) {
ufshcd_scsi_to_upiu_lun(sdev->lun), /* Read descriptor*/
UNIT_DESC_PARAM_LU_Q_DEPTH, ret = ufshcd_read_unit_desc_param(hba,
&lun_qdepth, ufshcd_scsi_to_upiu_lun(sdev->lun),
sizeof(lun_qdepth)); UNIT_DESC_PARAM_LU_Q_DEPTH,
&lun_qdepth,
sizeof(lun_qdepth));
if (!ret || ret == -ENOTSUPP)
break;
dev_dbg(hba->dev, "%s: error %d retrying\n", __func__, ret);
}
/* Some WLUN doesn't support unit descriptor */ /* Some WLUN doesn't support unit descriptor */
if (ret == -EOPNOTSUPP) if (ret == -EOPNOTSUPP)
@ -4796,6 +4815,24 @@ out:
return icc_level; return icc_level;
} }
static int ufshcd_set_icc_levels_attr(struct ufs_hba *hba, u32 icc_level)
{
int ret = 0;
int retries;
for (retries = QUERY_REQ_RETRIES; retries > 0; retries--) {
/* write attribute */
ret = ufshcd_query_attr(hba, UPIU_QUERY_OPCODE_WRITE_ATTR,
QUERY_ATTR_IDN_ACTIVE_ICC_LVL, 0, 0, &icc_level);
if (!ret)
break;
dev_dbg(hba->dev, "%s: failed with error %d\n", __func__, ret);
}
return ret;
}
static void ufshcd_init_icc_levels(struct ufs_hba *hba) static void ufshcd_init_icc_levels(struct ufs_hba *hba)
{ {
int ret; int ret;
@ -4816,9 +4853,8 @@ static void ufshcd_init_icc_levels(struct ufs_hba *hba)
dev_dbg(hba->dev, "%s: setting icc_level 0x%x", dev_dbg(hba->dev, "%s: setting icc_level 0x%x",
__func__, hba->init_prefetch_data.icc_level); __func__, hba->init_prefetch_data.icc_level);
ret = ufshcd_query_attr_retry(hba, UPIU_QUERY_OPCODE_WRITE_ATTR, ret = ufshcd_set_icc_levels_attr(hba,
QUERY_ATTR_IDN_ACTIVE_ICC_LVL, 0, 0, hba->init_prefetch_data.icc_level);
&hba->init_prefetch_data.icc_level);
if (ret) if (ret)
dev_err(hba->dev, dev_err(hba->dev,