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>

diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c
index 03c47f9a2750f23faf1bfc99afec39c3b06e10f4..9434328ba3231996430348e5013279203376b968 100644 (file)
--- a/drivers/ufs/core/ufshcd.c
+++ b/drivers/ufs/core/ufshcd.c
@@ -2242,10 +2242,11 @@ void ufshcd_send_command(struct ufs_hba *hba, unsigned int task_tag,
 
        if (is_mcq_enabled(hba)) {
                int utrd_size = sizeof(struct utp_transfer_req_desc);
+               struct utp_transfer_req_desc *src = lrbp->utr_descriptor_ptr;
+               struct utp_transfer_req_desc *dest = hwq->sqe_base_addr + hwq->sq_tail_slot;
 
                spin_lock(&hwq->sq_lock);
-               memcpy(hwq->sqe_base_addr + (hwq->sq_tail_slot * utrd_size),
-                      lrbp->utr_descriptor_ptr, utrd_size);
+               memcpy(dest, src, utrd_size);
                ufshcd_inc_sq_tail(hwq);
                spin_unlock(&hwq->sq_lock);
        } else {

diff --git a/include/ufs/ufshcd.h b/include/ufs/ufshcd.h
index 8b1046c21960c5cd2b0f5902c1b6a8776ef3a0c8..721ae4cd370237ab00bfdb2397b66720d3d2a9f9 100644 (file)
--- a/include/ufs/ufshcd.h
+++ b/include/ufs/ufshcd.h
@@ -1095,7 +1095,7 @@ struct ufs_hw_queue {
        void __iomem *mcq_cq_head;
        void __iomem *mcq_cq_tail;
 
-       void *sqe_base_addr;
+       struct utp_transfer_req_desc *sqe_base_addr;
        dma_addr_t sqe_dma_addr;
        struct cq_entry *cqe_base_addr;
        dma_addr_t cqe_dma_addr;