Hi Avri On 5/21/19 1:54 PM, Avri Altman wrote: > struct ufs_dev_cmd is the main container that supports device management > commands. In the case of a read descriptor request, we assume that the > proper space was allocated in dev_cmd to hold the returning descriptor. > > This is no longer true, as there are flows that doesn't use dev_cmd > for device management requests, and was wrong in the first place. > Can you please put some light on those flows? Are those platform specific? Just curious. > fixes: d44a5f98bb49 (ufs: query descriptor API) > > Signed-off-by: Avri Altman <avri.altman@xxxxxxx> > --- > drivers/scsi/ufs/ufshcd.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c > index 8c1c551..3fe3029 100644 > --- a/drivers/scsi/ufs/ufshcd.c > +++ b/drivers/scsi/ufs/ufshcd.c > @@ -1917,7 +1917,8 @@ int ufshcd_copy_query_response(struct ufs_hba *hba, struct ufshcd_lrb *lrbp) > memcpy(&query_res->upiu_res, &lrbp->ucd_rsp_ptr->qr, QUERY_OSF_SIZE); > > /* Get the descriptor */ > - if (lrbp->ucd_rsp_ptr->qr.opcode == UPIU_QUERY_OPCODE_READ_DESC) { > + if (hba->dev_cmd.query.descriptor && > + lrbp->ucd_rsp_ptr->qr.opcode == UPIU_QUERY_OPCODE_READ_DESC) { > u8 *descp = (u8 *)lrbp->ucd_rsp_ptr + > GENERAL_UPIU_REQUEST_SIZE; > u16 resp_len; > This change looks ok to me. I hope you have tested this patch. Reviewed-by: Alim Akhtar <alim.akhtar@xxxxxxxxxxx>