Commit d18e2a4b authored by Avri Altman's avatar Avri Altman Committed by Wen Zhiwei
Browse files

scsi: ufs: Use pre-calculated offsets in ufshcd_init_lrb() 

stable inclusion
from stable-v6.6.57
commit 7994a4849c8b1501c2e5c21edd1085b16efb98fa
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IB2M97

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=7994a4849c8b1501c2e5c21edd1085b16efb98fa



--------------------------------

commit d5130c5a093257aa4542aaded8034ef116a7624a upstream.

Replace manual offset calculations for response_upiu and prd_table in
ufshcd_init_lrb() with pre-calculated offsets already stored in the
utp_transfer_req_desc structure. The pre-calculated offsets are set
differently in ufshcd_host_memory_configure() based on the
UFSHCD_QUIRK_PRDT_BYTE_GRAN quirk, ensuring correct alignment and
access.

Fixes: 26f968d7 ("scsi: ufs: Introduce UFSHCD_QUIRK_PRDT_BYTE_GRAN quirk")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarAvri Altman <avri.altman@wdc.com>
Link: https://lore.kernel.org/r/20240910044543.3812642-1-avri.altman@wdc.com


Acked-by: default avatarBart Van Assche <bvanassche@acm.org>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarWen Zhiwei <wenzhiwei@kylinos.cn>
parent 722a257a

drivers/ufs/core/ufshcd.c

+2 −3
Original line number Diff line number Diff line
@@ -2804,9 +2804,8 @@ static void ufshcd_init_lrb(struct ufs_hba *hba, struct ufshcd_lrb *lrb, int i) 
	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 = offsetof(struct utp_transfer_cmd_desc,

				       response_upiu);

	u16 prdt_offset = offsetof(struct utp_transfer_cmd_desc, prd_table);

	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 +