diff mbox series

[v1,1/1] scsi: ufs: mcq: Fix the search/wrap around logic

Message ID ff49c15be205135ed3ec186f3086694c02867dbd.1692149603.git.quic_nguyenb@quicinc.com (mailing list archive)
State Accepted
Headers show
Series [v1,1/1] scsi: ufs: mcq: Fix the search/wrap around logic | expand

Commit Message

Bao D. Nguyen Aug. 16, 2023, 1:38 a.m. UTC
The search and wrap around logic in the ufshcd_mcq_sqe_search()
function does not work correctly when the hwq's queue depth
is not a power of two number. Correct it so that any queue depth
with a positive integer value within the supported range would work.

Signed-off-by: Bao D. Nguyen <quic_nguyenb@quicinc.com>
---
 drivers/ufs/core/ufs-mcq.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

Comments

Bart Van Assche Aug. 16, 2023, 11:45 p.m. UTC | #1
On 8/15/23 18:38, Bao D. Nguyen wrote:
> The search and wrap around logic in the ufshcd_mcq_sqe_search()
> function does not work correctly when the hwq's queue depth
> is not a power of two number. Correct it so that any queue depth
> with a positive integer value within the supported range would work.

Does this patch need a Fixes: tag?

Anyway:

Reviewed-by: Bart Van Assche <bvanassche@acm.org>
diff mbox series

Patch

diff --git a/drivers/ufs/core/ufs-mcq.c b/drivers/ufs/core/ufs-mcq.c
index 66a4e24..2ba8ec2 100644
--- a/drivers/ufs/core/ufs-mcq.c
+++ b/drivers/ufs/core/ufs-mcq.c
@@ -578,7 +578,6 @@  static bool ufshcd_mcq_sqe_search(struct ufs_hba *hba,
 {
 	struct ufshcd_lrb *lrbp = &hba->lrb[task_tag];
 	struct utp_transfer_req_desc *utrd;
-	u32 mask = hwq->max_entries - 1;
 	__le64  cmd_desc_base_addr;
 	bool ret = false;
 	u64 addr, match;
@@ -606,7 +605,10 @@  static bool ufshcd_mcq_sqe_search(struct ufs_hba *hba,
 			ret = true;
 			goto out;
 		}
-		sq_head_slot = (sq_head_slot + 1) & mask;
+
+		sq_head_slot++;
+		if (sq_head_slot == hwq->max_entries)
+			sq_head_slot = 0;
 	}
 
 out: