| From 83dc7e3dea76b77b6bcc289eb86c5b5c145e8dff Mon Sep 17 00:00:00 2001 |
| From: kehuanlin <chgokhl@gmail.com> |
| Date: Wed, 6 Sep 2017 17:58:39 +0800 |
| Subject: scsi: ufs: fix wrong command type of UTRD for UFSHCI v2.1 |
| |
| From: kehuanlin <chgokhl@gmail.com> |
| |
| commit 83dc7e3dea76b77b6bcc289eb86c5b5c145e8dff upstream. |
| |
| 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> |
| Signed-off-by: Arnd Bergmann <arnd@arndb.de> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/scsi/ufs/ufshcd.c | 14 ++++++++------ |
| 1 file changed, 8 insertions(+), 6 deletions(-) |
| |
| --- a/drivers/scsi/ufs/ufshcd.c |
| +++ b/drivers/scsi/ufs/ufshcd.c |
| @@ -1348,10 +1348,11 @@ static int ufshcd_comp_devman_upiu(struc |
| 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) |
| @@ -1375,10 +1376,11 @@ static int ufshcd_comp_scsi_upiu(struct |
| 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, |
