scsi: ufs: core: Call ufshcd_init_lrb() later

Call ufshcd_init_lrb() from inside ufshcd_setup_dev_cmd() instead of
ufshcd_host_memory_configure(). This patch prepares for calling
ufshcd_host_memory_configure() before the information is available that
is required to call ufshcd_setup_dev_cmd().

Reviewed-by: Avri Altman <avri.altman@sandisk.com>
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Link: https://patch.msgid.link/20251031204029.2883185-20-bvanassche@acm.org
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 7935aad4ca13837e1997f93e1ace31c8ef993f0a..f6eecc03282a097175b9af86501f2f3f9b9166ec 100644 (file)
--- a/drivers/ufs/core/ufshcd.c
+++ b/drivers/ufs/core/ufshcd.c
@@ -2904,8 +2904,32 @@ static void ufshcd_comp_scsi_upiu(struct ufs_hba *hba, struct ufshcd_lrb *lrbp)
        ufshcd_prepare_utp_scsi_cmd_upiu(lrbp, upiu_flags);
 }
 
-static void __ufshcd_setup_cmd(struct ufshcd_lrb *lrbp, struct scsi_cmnd *cmd, u8 lun, int tag)
+static void ufshcd_init_lrb(struct ufs_hba *hba, struct ufshcd_lrb *lrb, int i)
+{
+       struct utp_transfer_cmd_desc *cmd_descp =
+               (void *)hba->ucdl_base_addr + i * ufshcd_get_ucd_size(hba);
+       struct utp_transfer_req_desc *utrdlp = hba->utrdl_base_addr;
+       dma_addr_t cmd_desc_element_addr =
+               hba->ucdl_dma_addr + i * ufshcd_get_ucd_size(hba);
+       u16 response_offset = le16_to_cpu(utrdlp[i].response_upiu_offset);
+       u16 prdt_offset = le16_to_cpu(utrdlp[i].prd_table_offset);
+
+       lrb->utr_descriptor_ptr = utrdlp + i;
+       lrb->utrd_dma_addr =
+               hba->utrdl_dma_addr + i * sizeof(struct utp_transfer_req_desc);
+       lrb->ucd_req_ptr = (struct utp_upiu_req *)cmd_descp->command_upiu;
+       lrb->ucd_req_dma_addr = cmd_desc_element_addr;
+       lrb->ucd_rsp_ptr = (struct utp_upiu_rsp *)cmd_descp->response_upiu;
+       lrb->ucd_rsp_dma_addr = cmd_desc_element_addr + response_offset;
+       lrb->ucd_prdt_ptr = (struct ufshcd_sg_entry *)cmd_descp->prd_table;
+       lrb->ucd_prdt_dma_addr = cmd_desc_element_addr + prdt_offset;
+}
+
+static void __ufshcd_setup_cmd(struct ufs_hba *hba, struct ufshcd_lrb *lrbp,
+                              struct scsi_cmnd *cmd, u8 lun, int tag)
 {
+       ufshcd_init_lrb(hba, lrbp, tag);
+
        memset(lrbp->ucd_req_ptr, 0, sizeof(*lrbp->ucd_req_ptr));
 
        lrbp->cmd = cmd;
@@ -2917,7 +2941,7 @@ static void __ufshcd_setup_cmd(struct ufshcd_lrb *lrbp, struct scsi_cmnd *cmd, u
 static void ufshcd_setup_scsi_cmd(struct ufs_hba *hba, struct ufshcd_lrb *lrbp,
                                  struct scsi_cmnd *cmd, u8 lun, int tag)
 {
-       __ufshcd_setup_cmd(lrbp, cmd, lun, tag);
+       __ufshcd_setup_cmd(hba, lrbp, cmd, lun, tag);
        lrbp->intr_cmd = !ufshcd_is_intr_aggr_allowed(hba);
        lrbp->req_abort_skip = false;
 
@@ -2972,27 +2996,6 @@ static void ufshcd_map_queues(struct Scsi_Host *shost)
        }
 }
 
-static void ufshcd_init_lrb(struct ufs_hba *hba, struct ufshcd_lrb *lrb, int i)
-{
-       struct utp_transfer_cmd_desc *cmd_descp = (void *)hba->ucdl_base_addr +
-               i * ufshcd_get_ucd_size(hba);
-       struct utp_transfer_req_desc *utrdlp = hba->utrdl_base_addr;
-       dma_addr_t cmd_desc_element_addr = hba->ucdl_dma_addr +
-               i * ufshcd_get_ucd_size(hba);
-       u16 response_offset = le16_to_cpu(utrdlp[i].response_upiu_offset);
-       u16 prdt_offset = le16_to_cpu(utrdlp[i].prd_table_offset);
-
-       lrb->utr_descriptor_ptr = utrdlp + i;
-       lrb->utrd_dma_addr = hba->utrdl_dma_addr +
-               i * sizeof(struct utp_transfer_req_desc);
-       lrb->ucd_req_ptr = (struct utp_upiu_req *)cmd_descp->command_upiu;
-       lrb->ucd_req_dma_addr = cmd_desc_element_addr;
-       lrb->ucd_rsp_ptr = (struct utp_upiu_rsp *)cmd_descp->response_upiu;
-       lrb->ucd_rsp_dma_addr = cmd_desc_element_addr + response_offset;
-       lrb->ucd_prdt_ptr = (struct ufshcd_sg_entry *)cmd_descp->prd_table;
-       lrb->ucd_prdt_dma_addr = cmd_desc_element_addr + prdt_offset;
-}
-
 /**
  * ufshcd_queuecommand - main entry point for SCSI requests
  * @host: SCSI host pointer
@@ -3085,7 +3088,7 @@ out:
 static void ufshcd_setup_dev_cmd(struct ufs_hba *hba, struct ufshcd_lrb *lrbp,
                             enum dev_cmd_type cmd_type, u8 lun, int tag)
 {
-       __ufshcd_setup_cmd(lrbp, NULL, lun, tag);
+       __ufshcd_setup_cmd(hba, lrbp, NULL, lun, tag);
        lrbp->intr_cmd = true; /* No interrupt aggregation */
        hba->dev_cmd.type = cmd_type;
 }
@@ -4048,8 +4051,6 @@ static void ufshcd_host_memory_configure(struct ufs_hba *hba)
                        utrdlp[i].response_upiu_length =
                                cpu_to_le16(ALIGNED_UPIU_SIZE >> 2);
                }
-
-               ufshcd_init_lrb(hba, &hba->lrb[i], i);
        }
 }