From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from 003.mia.mailroute.net (003.mia.mailroute.net [199.89.3.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A5F692DFA3B for ; Thu, 30 Oct 2025 19:40:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=199.89.3.6 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761853225; cv=none; b=RLIrFye6mCEQCOY21x2GEDl0Z0qOzUNS/ptm/Uh897Ya0BCkEBRHaoE2bIEeMOStwg8VEEmi3XeLGE14bl7TbnSQCvNT2ydEZ3BXVbdpunmNmgwN+Ndn+LTVrhVmZkL7cWSQQnjdE7Ro+50mItZwXMdrF1HIlccRtFNma1r5G4I= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761853225; c=relaxed/simple; bh=jj9Zwg5k9uJ5a7IjbPPsy992azsav0ZaykjfpISVhLI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=uuo8YEXlfKyHmEdHQMjo5ZBKi0gQ/UOQYqmp8mJIaoaJWqdH2xEakCevJOKBANezJffmGbx4h33RBKw52GzsdoltfvrGO+9SHNUMiziyu0zvhNwD74xuxOuWlC5qDNayY5A1yKVSlVvn0M2QzhMpy71plvSjZWmbFUeR68wO+uE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=acm.org; spf=pass smtp.mailfrom=acm.org; dkim=pass (2048-bit key) header.d=acm.org header.i=@acm.org header.b=176gijDJ; arc=none smtp.client-ip=199.89.3.6 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=acm.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=acm.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=acm.org header.i=@acm.org header.b="176gijDJ" Received: from localhost (localhost [127.0.0.1]) by 003.mia.mailroute.net (Postfix) with ESMTP id 4cyDwk1HwQzltNPs; Thu, 30 Oct 2025 19:40:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=acm.org; h= content-transfer-encoding:mime-version:references:in-reply-to :x-mailer:message-id:date:date:subject:subject:from:from :received:received; s=mr01; t=1761853220; x=1764445221; bh=v7dFW LMl20bXD3lZy/kc3iHLpTtzT39MA38TirbeOAU=; b=176gijDJk0PT2IkZ7mnEd bR/Wln80LczoW/Nh6bLn2nXtYjV5G3G1ylQTdpNCIBwevafROeJBkOaprIbd7vij ecbenJXvXoo0UfWdAHQlrRMuLfzcQhcl/tjLrz8wqdDmf+Gv0I/6rHRnNCybHN24 vJ3EP6d+XtnwA/s1nc8wkp7QAhMdGQPs0ivazMpSo71Vbc/dPJd9uQzp5p63p3uq ItyY6+PaGy02DPRNmwpJ5pwmByZlwmRLL3m66G/pyfPup9pQEQwiI9TrKdS57xD5 BKIlWsT6khjXv+U69Z6HK59vwKF5whNoDlZtNTeZkXyXL+toIlwlUwi817P6did6 Q== X-Virus-Scanned: by MailRoute Received: from 003.mia.mailroute.net ([127.0.0.1]) by localhost (003.mia [127.0.0.1]) (mroute_mailscanner, port 10029) with LMTP id eu-YhqDifDcu; Thu, 30 Oct 2025 19:40:20 +0000 (UTC) Received: from bvanassche.mtv.corp.google.com (unknown [104.135.180.219]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: bvanassche@acm.org) by 003.mia.mailroute.net (Postfix) with ESMTPSA id 4cyDwZ126Tzlngp5; Thu, 30 Oct 2025 19:40:13 +0000 (UTC) From: Bart Van Assche To: "Martin K . Petersen" Cc: linux-scsi@vger.kernel.org, Bart Van Assche , Avri Altman , "James E.J. Bottomley" , Peter Wang , Bean Huo , "Bao D. Nguyen" , Adrian Hunter Subject: [PATCH v7 19/28] ufs: core: Call ufshcd_init_lrb() later Date: Thu, 30 Oct 2025 12:36:18 -0700 Message-ID: <20251030193720.871635-20-bvanassche@acm.org> X-Mailer: git-send-email 2.51.1.930.gacf6e81ea2-goog In-Reply-To: <20251030193720.871635-1-bvanassche@acm.org> References: <20251030193720.871635-1-bvanassche@acm.org> Precedence: bulk X-Mailing-List: linux-scsi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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 Signed-off-by: Bart Van Assche --- drivers/ufs/core/ufshcd.c | 53 ++++++++++++++++++++------------------- 1 file changed, 27 insertions(+), 26 deletions(-) diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c index 7935aad4ca13..f6eecc03282a 100644 --- 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); } =20 -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 =3D + (void *)hba->ucdl_base_addr + i * ufshcd_get_ucd_size(hba); + struct utp_transfer_req_desc *utrdlp =3D hba->utrdl_base_addr; + dma_addr_t cmd_desc_element_addr =3D + hba->ucdl_dma_addr + i * ufshcd_get_ucd_size(hba); + u16 response_offset =3D le16_to_cpu(utrdlp[i].response_upiu_offset); + u16 prdt_offset =3D le16_to_cpu(utrdlp[i].prd_table_offset); + + lrb->utr_descriptor_ptr =3D utrdlp + i; + lrb->utrd_dma_addr =3D + hba->utrdl_dma_addr + i * sizeof(struct utp_transfer_req_desc); + lrb->ucd_req_ptr =3D (struct utp_upiu_req *)cmd_descp->command_upiu; + lrb->ucd_req_dma_addr =3D cmd_desc_element_addr; + lrb->ucd_rsp_ptr =3D (struct utp_upiu_rsp *)cmd_descp->response_upiu; + lrb->ucd_rsp_dma_addr =3D cmd_desc_element_addr + response_offset; + lrb->ucd_prdt_ptr =3D (struct ufshcd_sg_entry *)cmd_descp->prd_table; + lrb->ucd_prdt_dma_addr =3D cmd_desc_element_addr + prdt_offset; +} + +static void __ufshcd_setup_cmd(struct ufs_hba *hba, struct ufshcd_lrb *l= rbp, + 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)); =20 lrbp->cmd =3D cmd; @@ -2917,7 +2941,7 @@ static void __ufshcd_setup_cmd(struct ufshcd_lrb *l= rbp, 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 =3D !ufshcd_is_intr_aggr_allowed(hba); lrbp->req_abort_skip =3D false; =20 @@ -2972,27 +2996,6 @@ static void ufshcd_map_queues(struct Scsi_Host *sh= ost) } } =20 -static void ufshcd_init_lrb(struct ufs_hba *hba, struct ufshcd_lrb *lrb,= int i) -{ - struct utp_transfer_cmd_desc *cmd_descp =3D (void *)hba->ucdl_base_addr= + - i * ufshcd_get_ucd_size(hba); - struct utp_transfer_req_desc *utrdlp =3D hba->utrdl_base_addr; - dma_addr_t cmd_desc_element_addr =3D hba->ucdl_dma_addr + - i * ufshcd_get_ucd_size(hba); - u16 response_offset =3D le16_to_cpu(utrdlp[i].response_upiu_offset); - u16 prdt_offset =3D le16_to_cpu(utrdlp[i].prd_table_offset); - - lrb->utr_descriptor_ptr =3D utrdlp + i; - lrb->utrd_dma_addr =3D hba->utrdl_dma_addr + - i * sizeof(struct utp_transfer_req_desc); - lrb->ucd_req_ptr =3D (struct utp_upiu_req *)cmd_descp->command_upiu; - lrb->ucd_req_dma_addr =3D cmd_desc_element_addr; - lrb->ucd_rsp_ptr =3D (struct utp_upiu_rsp *)cmd_descp->response_upiu; - lrb->ucd_rsp_dma_addr =3D cmd_desc_element_addr + response_offset; - lrb->ucd_prdt_ptr =3D (struct ufshcd_sg_entry *)cmd_descp->prd_table; - lrb->ucd_prdt_dma_addr =3D cmd_desc_element_addr + prdt_offset; -} - /** * ufshcd_queuecommand - main entry point for SCSI requests * @host: SCSI host pointer @@ -3085,7 +3088,7 @@ static int ufshcd_queuecommand(struct Scsi_Host *ho= st, struct scsi_cmnd *cmd) 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 =3D true; /* No interrupt aggregation */ hba->dev_cmd.type =3D cmd_type; } @@ -4048,8 +4051,6 @@ static void ufshcd_host_memory_configure(struct ufs= _hba *hba) utrdlp[i].response_upiu_length =3D cpu_to_le16(ALIGNED_UPIU_SIZE >> 2); } - - ufshcd_init_lrb(hba, &hba->lrb[i], i); } } =20