| Message ID | 1504691919-30832-1-git-send-email-kehuanlin@pinecone.net (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
On 2017-09-06 02:58, kehuanlin wrote: > 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> > --- > drivers/scsi/ufs/ufshcd.c | 14 ++++++++------ > 1 file changed, 8 insertions(+), 6 deletions(-) > > diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c > index 5bc9dc1..c33a2f8 100644 > --- a/drivers/scsi/ufs/ufshcd.c > +++ b/drivers/scsi/ufs/ufshcd.c > @@ -2195,10 +2195,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) > @@ -2222,10 +2223,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, Looks good to me. Reviewed-by: Subhash Jadavani <subhashj@codeaurora.org>
kehuanlin, > 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. Applied to 4.15/scsi-queue. Thanks!
diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c index 5bc9dc1..c33a2f8 100644 --- a/drivers/scsi/ufs/ufshcd.c +++ b/drivers/scsi/ufs/ufshcd.c @@ -2195,10 +2195,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) @@ -2222,10 +2223,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,
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> --- drivers/scsi/ufs/ufshcd.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)