ufs: invalidate the whole descriptor data segment after a query read
PATCH 1/1 ufs: invalidate the whole descriptor data segment after a query read
ufshcd_get_req_rsp() invalidates only sizeof(struct utp_upiu_rsp) of the DMA'd response, but a READ DESCRIPTOR response's data segment follows the UPIU header at GENERAL_UPIU_REQUEST_SIZE and can extend past that window. The tail of a longer descriptor was therefore read from stale cache (the pre-transfer memset had zeroed it), so its last bytes came back as 0.
This corrupted the last UTF-16 code unit of longer string descriptors:
e.g. a 34-byte product-name descriptor "THGJFGT0T25BAZZA" was read as "THGJFGT0T25BAZZ\0", dropping the final 'A'. Shorter descriptors that fit within the invalidated cache line (serial numbers, etc.) were unaffected.
Invalidate the descriptor region before copying it out.
Tested on the Qualcomm IQ-9075-EVK.
--- drivers/ufs/ufs-uclass.c | 1 + 1 file changed, 1 insertion(+)
drivers/ufs/ufs-uclass.c +1 -0
@@ -1008,6 +1008,7 @@ static int ufshcd_copy_query_response(struct ufs_hba *hba) buf_len =be16_to_cpu (hba->dev_cmd.query.request.upiu_req.length);if (likely (buf_len >= resp_len)) { +ufshcd_cache_invalidate (descp, resp_len);memcpy (hba->dev_cmd.query.descriptor, descp, resp_len); }else { dev_warn(hba->dev,
Signature · 1 line
2.54.0
Quoted 1 line · Jorge Ramirez-Ortiz
ufs: invalidate the whole descriptor data segment after a query read
Signature · 1 line
Neha Malcom Francis <[email protected]>
Hi,
Quoted 6 lines · Jorge Ramirez-Ortiz
ufshcd_get_req_rsp()invalidates onlysizeof(struct utp_upiu_rsp)of the DMA'd response, but a READ DESCRIPTOR response's data segment follows the UPIU header atGENERAL_UPIU_REQUEST_SIZEand can extend past that window. The tail of a longer descriptor was therefore read from stale cache (the pre-transfer memset had zeroed it), so its last bytes came back as 0.
Quoted 6 lines
This corrupted the last UTF-16 code unit of longer string descriptors:
e.g. a 34-byte product-name descriptor "THGJFGT0T25BAZZA" was read as "THGJFGT0T25BAZZ\0", dropping the final 'A'. Shorter descriptors that fit within the invalidated cache line (serial numbers, etc.) were unaffected.[...]
Thanks, Applied to https://git.u-boot-project.org/u-boot/custodians/neil.armstrong/u-boot-ufs (u-boot-ufs-fixes)
[1/1] ufs: invalidate the whole descriptor data segment after a query read
https://git.u-boot-project.org/u-boot/custodians/neil.armstrong/u-boot-ufs/-/commit/38bfdf0a770219e2f753023998bc9d0b45254785
Signature · 1 line
Neil