| Message ID | 20211016132228.40254-2-paul@crapouillou.net |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [v2,1/5] mtd: rawnand/davinci: Don't calculate ECC when reading page | expand |
On Sat, 2021-10-16 at 13:22:25 UTC, Paul Cercueil wrote: > The function nand_davinci_read_page_hwecc_oob_first() first reads the > OOB data, extracts the ECC information, programs the ECC hardware before > reading the actual data in a loop. > > Right after the OOB data was read, it called nand_read_page_op() to > reset the read cursor to the beginning of the page. This caused the > first page to be read twice: in that call, and later in the loop. > > Address that issue by changing the call to nand_read_page_op() to > nand_change_read_column_op(), which will only reset the read cursor. > > Cc: <stable@vger.kernel.org> # v5.2 > Fixes: a0ac778eb82c ("mtd: rawnand: ingenic: Add support for the JZ4740") > Signed-off-by: Paul Cercueil <paul@crapouillou.net> Applied to https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git nand/next, thanks. Miquel
diff --git a/drivers/mtd/nand/raw/davinci_nand.c b/drivers/mtd/nand/raw/davinci_nand.c index 89de24d3bb7a..2e6a0c1671be 100644 --- a/drivers/mtd/nand/raw/davinci_nand.c +++ b/drivers/mtd/nand/raw/davinci_nand.c @@ -401,7 +401,8 @@ static int nand_davinci_read_page_hwecc_oob_first(struct nand_chip *chip, if (ret) return ret; - ret = nand_read_page_op(chip, page, 0, NULL, 0); + /* Move read cursor to start of page */ + ret = nand_change_read_column_op(chip, 0, NULL, 0, false); if (ret) return ret;
The function nand_davinci_read_page_hwecc_oob_first() first reads the OOB data, extracts the ECC information, programs the ECC hardware before reading the actual data in a loop. Right after the OOB data was read, it called nand_read_page_op() to reset the read cursor to the beginning of the page. This caused the first page to be read twice: in that call, and later in the loop. Address that issue by changing the call to nand_read_page_op() to nand_change_read_column_op(), which will only reset the read cursor. Cc: <stable@vger.kernel.org> # v5.2 Fixes: a0ac778eb82c ("mtd: rawnand: ingenic: Add support for the JZ4740") Signed-off-by: Paul Cercueil <paul@crapouillou.net> --- drivers/mtd/nand/raw/davinci_nand.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)