2015-09-13 23:52 GMT+09:00 Yaniv Gardi <ygardi@xxxxxxxxxxxxxx>: > Query commands have 100ms timeout and it may timeout if they are > issued in parallel to ongoing read/write SCSI commands, this change > adds the retry (max: 10) in case command timeouts. > > Signed-off-by: Subhash Jadavani <subhashj@xxxxxxxxxxxxxx> > Signed-off-by: Yaniv Gardi <ygardi@xxxxxxxxxxxxxx> > > --- > drivers/scsi/ufs/ufshcd.c | 48 ++++++++++++++++++++++++++++++++--------------- > 1 file changed, 33 insertions(+), 15 deletions(-) > > diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c > index a649250..528e46e 100644 > --- a/drivers/scsi/ufs/ufshcd.c > +++ b/drivers/scsi/ufs/ufshcd.c > @@ -1906,21 +1906,7 @@ static int ufshcd_query_attr_retry(struct ufs_hba *hba, > return ret; > } > > -/** > - * ufshcd_query_descriptor - API function for sending descriptor requests > - * hba: per-adapter instance > - * opcode: attribute opcode > - * idn: attribute idn to access > - * index: index field > - * selector: selector field > - * desc_buf: the buffer that contains the descriptor > - * buf_len: length parameter passed to the device > - * > - * Returns 0 for success, non-zero in case of failure. > - * The buf_len parameter will contain, on return, the length parameter > - * received on the response. > - */ > -static int ufshcd_query_descriptor(struct ufs_hba *hba, > +static int __ufshcd_query_descriptor(struct ufs_hba *hba, > enum query_opcode opcode, enum desc_idn idn, u8 index, > u8 selector, u8 *desc_buf, int *buf_len) > { > @@ -1985,6 +1971,38 @@ out: > } > > /** > + * ufshcd_query_descriptor - API function for sending descriptor requests > + * hba: per-adapter instance > + * opcode: attribute opcode > + * idn: attribute idn to access > + * index: index field > + * selector: selector field > + * desc_buf: the buffer that contains the descriptor > + * buf_len: length parameter passed to the device > + * > + * Returns 0 for success, non-zero in case of failure. > + * The buf_len parameter will contain, on return, the length parameter > + * received on the response. > + */ > +int ufshcd_query_descriptor(struct ufs_hba *hba, > + enum query_opcode opcode, enum desc_idn idn, u8 index, > + u8 selector, u8 *desc_buf, int *buf_len) > +{ > + int err; > + int retries; > + > + for (retries = QUERY_REQ_RETRIES; retries > 0; retries--) { > + err = __ufshcd_query_descriptor(hba, opcode, idn, index, > + selector, desc_buf, buf_len); > + if (!err || err == -EINVAL) > + break; > + } > + > + return err; > +} > +EXPORT_SYMBOL(ufshcd_query_descriptor); You introduced query flag and attribute APIs for retry version with '_retry' suffix. This function retries but doesn't have '_retry' suffix. Should we have consistent function names for these query APIs? -- To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html