Skip to content

Commit 3c85f08

Browse files
avri-altman-sndkmartinkpetersen
authored andcommitted
scsi: ufs: mcq: Use pointer arithmetic in ufshcd_send_command()
Make sqe_base_addr the UTRD pointer it is, instead of an opaque void *. Signed-off-by: Avri Altman <avri.altman@wdc.com> Link: https://lore.kernel.org/r/20230329101303.18377-3-avri.altman@wdc.com Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
1 parent 4de243c commit 3c85f08

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

drivers/ufs/core/ufshcd.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2242,10 +2242,11 @@ void ufshcd_send_command(struct ufs_hba *hba, unsigned int task_tag,
22422242

22432243
if (is_mcq_enabled(hba)) {
22442244
int utrd_size = sizeof(struct utp_transfer_req_desc);
2245+
struct utp_transfer_req_desc *src = lrbp->utr_descriptor_ptr;
2246+
struct utp_transfer_req_desc *dest = hwq->sqe_base_addr + hwq->sq_tail_slot;
22452247

22462248
spin_lock(&hwq->sq_lock);
2247-
memcpy(hwq->sqe_base_addr + (hwq->sq_tail_slot * utrd_size),
2248-
lrbp->utr_descriptor_ptr, utrd_size);
2249+
memcpy(dest, src, utrd_size);
22492250
ufshcd_inc_sq_tail(hwq);
22502251
spin_unlock(&hwq->sq_lock);
22512252
} else {

include/ufs/ufshcd.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1095,7 +1095,7 @@ struct ufs_hw_queue {
10951095
void __iomem *mcq_cq_head;
10961096
void __iomem *mcq_cq_tail;
10971097

1098-
void *sqe_base_addr;
1098+
struct utp_transfer_req_desc *sqe_base_addr;
10991099
dma_addr_t sqe_dma_addr;
11001100
struct cq_entry *cqe_base_addr;
11011101
dma_addr_t cqe_dma_addr;

0 commit comments

Comments
 (0)