mtd: rawnand: qcom: Fix last codeword read in qcom_param_page_type_exec()

[ 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.

Cc: stable@vger.kernel.org
Fixes: 89550beb098e ("mtd: rawnand: qcom: Implement exec_op()")
Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Tested-by: Lakshmi Sowjanya D <quic_laksd@quicinc.com>
Signed-off-by: Md Sadre Alam <quic_mdalam@quicinc.com>
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/mtd/nand/raw/qcom_nandc.c b/drivers/mtd/nand/raw/qcom_nandc.c
index beafca6ba0df4d7a7fcd7ddf93af5a5c1cc4f00c..275d34119acdcb8bfc8f017cbe64edd6996f864a 100644 (file)
--- a/drivers/mtd/nand/raw/qcom_nandc.c
+++ b/drivers/mtd/nand/raw/qcom_nandc.c
@@ -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);