Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
IronPort-SDR: 28wNf8Ygi3leoSoYkyHJyNERZnX+/iSSPKoqeZ9FkNFPCCqZ3tCaqcJvJ9s1jgFJGGMxlPK8NP
 B7yPjDWwJZ1NdcJi4QPAi572iT0WDCEZy1gdJlBMqPBlf4ZEZtP2h/2UDCzlbg82n7BhxspNi2
 9Lxm5/KSnigPxG71YNl1sZhKUifRgjTnmklAAjFtYzSn/pORD5kFRPQpV4NrH3yfK/Iz52IEcB
 V6mrx97PsgAUOk+JE6/0kM4gxWbI57/mZR+MSNLzz1A9LTbDWCFCeaT96f5zXixoHyA8mPbuhf
 HyM=
IronPort-SDR: ktiaKIgyfHdgGWoL/Lk76w+HuD0q7JFMOe0UO9PK9oLpqgSE0AZQSnr1G2NhKtAOABC372EWTH
 GgSQaoX7WrTSys3K8zdkoJGeiJrognQAlJHdHCcFMoQ2/9NE4Jw0w3dxg7a4qK7vUVvDJ2nNhH
 PcbuuwfdDU9/GxCqBo6a81fNieoEnfIuV9uyL6zLUNsMKzVj8kFQT+mz8vrQToye1yCJ/U3XhQ
 +euLLxAUwnvWAq/9W+/YwCi5mGnBHohn5X5ZdL6lOtlS2S4w/nHp46UPtvBs6GJj4Ppu8bpsCG
 j8s=
WDCIronportException: Internal
From:   Avri Altman <avri.altman@wdc.com>
To:     "James E . J . Bottomley" <jejb@linux.vnet.ibm.com>,
        "Martin K . Petersen" <martin.petersen@oracle.com>
Cc:     Asutosh Das <quic_asutoshd@quicinc.com>, quic_cang@quicinc.com,
        linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org,
        Avri Altman <avri.altman@wdc.com>
Subject: [PATCH 2/2] scsi: ufs: mcq: Use pointer arithmetic in send_command
Date:   Wed, 29 Mar 2023 13:13:03 +0300
Message-Id: <20230329101303.18377-3-avri.altman@wdc.com>
In-Reply-To: <20230329101303.18377-1-avri.altman@wdc.com>
References: <20230329101303.18377-1-avri.altman@wdc.com>
Precedence: bulk

Make sqe_base_addr a UTRD pointer it is, instead of an opaque void *.

Signed-off-by: Avri Altman <avri.altman@wdc.com>
---
 drivers/ufs/core/ufshcd.c | 5 +++--
 include/ufs/ufshcd.h      | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c
index 35a3bd95c5e4..aa7bb05e99eb 100644
--- 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 25aab8ec4f86..bd42477706b6 100644
--- a/include/ufs/ufshcd.h
+++ b/include/ufs/ufshcd.h
@@ -1100,7 +1100,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;
-- 
2.17.1