scsi: ufs: Data Segment only needed for WRITE DESCRIPTOR

Some devices have problems handling a Query UPIU with Data Segment
set. Only set it for WRITE DESCRIPTOR commands.

[mkp: updated patch description]

Signed-off-by: Zang Leigang <zangleigang@hisilicon.com>
Reviewed-by: Subhash Jadavani <subhashj@codeaurora.org>
Reviewed-by: Kiwoong Kim <kwmad.kim@samsung.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

1 files changed, 6 insertions, 3 deletions

diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c
index 37f3c51e9d92..d2ec42512641 100644
--- a/drivers/scsi/ufs/ufshcd.c
+++ b/drivers/scsi/ufs/ufshcd.c
@@ -1266,9 +1266,12 @@ static void ufshcd_prepare_utp_query_req_upiu(struct ufs_hba *hba,
         ucd_req_ptr->header.dword_1 = UPIU_HEADER_DWORD(
                         0, query->request.query_func, 0, 0);
 
-        /* Data segment length */
-        ucd_req_ptr->header.dword_2 = UPIU_HEADER_DWORD(
-                        0, 0, len >> 8, (u8)len);
+        /* Data segment length only need for WRITE_DESC */
+        if (query->request.upiu_req.opcode == UPIU_QUERY_OPCODE_WRITE_DESC)
+                ucd_req_ptr->header.dword_2 =
+                        UPIU_HEADER_DWORD(0, 0, (len >> 8), (u8)len);
+        else
+                ucd_req_ptr->header.dword_2 = 0;
 
         /* Copy the Query Request buffer as is */
         memcpy(&ucd_req_ptr->qr, &query->request.upiu_req,