FAILED: patch "[PATCH] mtd: rawnand: qcom: Fix last codeword read in" failed to apply to 6.12-stable tree
Subsystems (4)
[email protected]
maintainerThe patch below does not apply to the 6.12-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.12.y
git checkout FETCH_HEAD
git cherry-pick -x 47bddabbf69da50999ec68be92b58356c687e1d6
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2025062002-disperser-removing-78fc@gregkh' --subject-prefix 'PATCH 6.12.y' HEAD^..
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 47bddabbf69da50999ec68be92b58356c687e1d6 Mon Sep 17 00:00:00 2001
From: Md Sadre Alam <[email protected]>
Date: Thu, 10 Apr 2025 15:30:18 +0530
Subject: [PATCH] mtd: rawnand: qcom: Fix last codeword read in
qcom_param_page_type_exec()
For QPIC V2 onwards there is a separate register to read last code word "QPIC_NAND_READ_LOCATION_LAST_CW_n".
qcom_param_page_type_exec() is used to read only one code word If it configures the number of code words to 1 in QPIC_NAND_DEV0_CFG0 register then QPIC controller thinks its reading the last code word, since we are having separate register to read the last code word, we have to configure "QPIC_NAND_READ_LOCATION_LAST_CW_n" register to fetch data from QPIC buffer to system memory.
Without this change page read was failing with timeout error
/ # hexdump -C /dev/mtd1
[ 129.206113] qcom-nandc 1cc8000.nand-controller: failure to read page/oob
hexdump: /dev/mtd1: Connection timed out
This issue only seen on SDX targets since SDX target used QPICv2. But same working on IPQ targets since IPQ used QPICv1.
drivers/mtd/nand/raw/qcom_nandc.c +10 -2
@@ -1863,7 +1863,12 @@ static int qcom_param_page_type_exec(struct nand_chip *chip, const struct nand_const struct nand_op_instr *instr =NULL ;unsigned int op_id =0 ;unsigned int len =0 ; -int ret; +int ret, reg_base; + + reg_base =NAND_READ_LOCATION_0 ; + +if (nandc->props->qpic_version2) + reg_base =NAND_READ_LOCATION_LAST_CW_0 ; ret =qcom_parse_instructions (chip, subop, &q_op);if (ret)
@@ -1915,7 +1920,10 @@ static int qcom_param_page_type_exec(struct nand_chip *chip, const struct nand_ op_id = q_op.data_instr_idx; len =nand_subop_get_data_len (subop, op_id); -nandc_set_read_loc (chip,0 ,0 ,0 , len,1 ); +if (nandc->props->qpic_version2) +nandc_set_read_loc_last (chip, reg_base,0 , len,1 ); +else +nandc_set_read_loc_first (chip, reg_base,0 , len,1 );if (!nandc->props->qpic_version2) {qcom_write_reg_dma (nandc, &nandc->regs->vld,NAND_DEV_CMD_VLD ,1 ,0 );
Sasha Levin
maintainerPATCH 1/1 mtd: rawnand: qcom: Fix last codeword read in qcom_param_page_type_exec()
From: Md Sadre Alam <[email protected]>
[ Upstream commit 47bddabbf69da50999ec68be92b58356c687e1d6 ]
For QPIC V2 onwards there is a separate register to read last code word "QPIC_NAND_READ_LOCATION_LAST_CW_n".
qcom_param_page_type_exec() is used to read only one code word If it configures the number of code words to 1 in QPIC_NAND_DEV0_CFG0 register then QPIC controller thinks its reading the last code word, since we are having separate register to read the last code word, we have to configure "QPIC_NAND_READ_LOCATION_LAST_CW_n" register to fetch data from QPIC buffer to system memory.
Without this change page read was failing with timeout error
/ # hexdump -C /dev/mtd1
[ 129.206113] qcom-nandc 1cc8000.nand-controller: failure to read page/oob
hexdump: /dev/mtd1: Connection timed out
This issue only seen on SDX targets since SDX target used QPICv2. But same working on IPQ targets since IPQ used QPICv1.
--- drivers/mtd/nand/raw/qcom_nandc.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
drivers/mtd/nand/raw/qcom_nandc.c +10 -2
@@ -2858,7 +2858,12 @@ static int qcom_param_page_type_exec(struct nand_chip *chip, const struct nand_const struct nand_op_instr *instr =NULL ;unsigned int op_id =0 ;unsigned int len =0 ; -int ret; +int ret, reg_base; + + reg_base =NAND_READ_LOCATION_0 ; + +if (nandc->props->qpic_v2) + reg_base =NAND_READ_LOCATION_LAST_CW_0 ; ret =qcom_parse_instructions (chip, subop, &q_op);if (ret)
@@ -2910,7 +2915,10 @@ static int qcom_param_page_type_exec(struct nand_chip *chip, const struct nand_ op_id = q_op.data_instr_idx; len =nand_subop_get_data_len (subop, op_id); -nandc_set_read_loc (chip,0 ,0 ,0 , len,1 ); +if (nandc->props->qpic_v2) +nandc_set_read_loc_last (chip, reg_base,0 , len,1 ); +else +nandc_set_read_loc_first (chip, reg_base,0 , len,1 );if (!nandc->props->qpic_v2) {write_reg_dma (nandc,NAND_DEV_CMD_VLD ,1 ,0 );
Signature · 1 line
2.39.5