scsi: ufs: fix wrong command type of UTRD for UFSHCI v2.1

Since the command type of UTRD in UFS 2.1 specification is the same with
UFS 2.0. And it assumes the future UFS specification will follow the
same definition.

Signed-off-by: kehuanlin <kehuanlin@pinecone.net>
Reviewed-by: Subhash Jadavani <subhashj@codeaurora.org>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c
index d4d8ea3..011c336 100644 (file)
--- a/drivers/scsi/ufs/ufshcd.c
+++ b/drivers/scsi/ufs/ufshcd.c
@@ -2198,10 +2198,11 @@ static int ufshcd_comp_devman_upiu(struct ufs_hba *hba, struct ufshcd_lrb *lrbp)
        u32 upiu_flags;
        int ret = 0;
 
-       if (hba->ufs_version == UFSHCI_VERSION_20)
-               lrbp->command_type = UTP_CMD_TYPE_UFS_STORAGE;
-       else
+       if ((hba->ufs_version == UFSHCI_VERSION_10) ||
+           (hba->ufs_version == UFSHCI_VERSION_11))
                lrbp->command_type = UTP_CMD_TYPE_DEV_MANAGE;
+       else
+               lrbp->command_type = UTP_CMD_TYPE_UFS_STORAGE;
 
        ufshcd_prepare_req_desc_hdr(lrbp, &upiu_flags, DMA_NONE);
        if (hba->dev_cmd.type == DEV_CMD_TYPE_QUERY)
@@ -2225,10 +2226,11 @@ static int ufshcd_comp_scsi_upiu(struct ufs_hba *hba, struct ufshcd_lrb *lrbp)
        u32 upiu_flags;
        int ret = 0;
 
-       if (hba->ufs_version == UFSHCI_VERSION_20)
-               lrbp->command_type = UTP_CMD_TYPE_UFS_STORAGE;
-       else
+       if ((hba->ufs_version == UFSHCI_VERSION_10) ||
+           (hba->ufs_version == UFSHCI_VERSION_11))
                lrbp->command_type = UTP_CMD_TYPE_SCSI;
+       else
+               lrbp->command_type = UTP_CMD_TYPE_UFS_STORAGE;
 
        if (likely(lrbp->cmd)) {
                ufshcd_prepare_req_desc_hdr(lrbp, &upiu_flags,