Commit 2903265e authored by Bart Van Assche's avatar Bart Van Assche Committed by Martin K. Petersen
Browse files

scsi: ufs: Fix residual handling 



Only call scsi_set_resid() in case of an underflow. Do not call
scsi_set_resid() in case of an overflow.

Cc: Avri Altman <avri.altman@wdc.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Fixes: cb38845d ("scsi: ufs: core: Set the residual byte count")
Signed-off-by: default avatarBart Van Assche <bvanassche@acm.org>
Link: https://lore.kernel.org/r/20230724200843.3376570-2-bvanassche@acm.org


Reviewed-by: default avatarAvri Altman <avri.altman@wdc.com>
Reviewed-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 65aca38b

drivers/ufs/core/ufshcd.c

+10 −2
Original line number Diff line number Diff line
@@ -5222,9 +5222,17 @@ ufshcd_transfer_rsp_status(struct ufs_hba *hba, struct ufshcd_lrb *lrbp, 
	int result = 0;

	int scsi_status;

	enum utp_ocs ocs;

	u8 upiu_flags;

	u32 resid;



	scsi_set_resid(lrbp->cmd,

		be32_to_cpu(lrbp->ucd_rsp_ptr->sr.residual_transfer_count));

	upiu_flags = be32_to_cpu(lrbp->ucd_rsp_ptr->header.dword_0) >> 16;

	resid = be32_to_cpu(lrbp->ucd_rsp_ptr->sr.residual_transfer_count);

	/*

	 * Test !overflow instead of underflow to support UFS devices that do

	 * not set either flag.

	 */

	if (resid && !(upiu_flags & UPIU_RSP_FLAG_OVERFLOW))

		scsi_set_resid(lrbp->cmd, resid);



	/* overall command status of utrd */

	ocs = ufshcd_get_tr_ocs(lrbp, cqe);

include/ufs/ufs.h

+6 −0
Original line number Diff line number Diff line
@@ -104,6 +104,12 @@ enum { 
	UPIU_CMD_FLAGS_READ	= 0x40,

};



/* UPIU response flags */

enum {

	UPIU_RSP_FLAG_UNDERFLOW	= 0x20,

	UPIU_RSP_FLAG_OVERFLOW	= 0x40,

};



/* UPIU Task Attributes */

enum {

	UPIU_TASK_ATTR_SIMPLE	= 0x00,