Commit 83dc7e3d authored by kehuanlin's avatar kehuanlin Committed by Martin K. Petersen
Browse files

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: default avatarkehuanlin <kehuanlin@pinecone.net>
Reviewed-by: default avatarSubhash Jadavani <subhashj@codeaurora.org>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 3d21fbde

drivers/scsi/ufs/ufshcd.c

+8 −6
Original line number Diff line number Diff line
@@ -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,

CRA Git | Maintained and supported by SUSTech CRA and CCSE