diff options
| author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2020-10-22 14:25:22 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2020-10-23 09:04:25 +0200 |
| commit | 3588d40c5385e0487800764902dbaaa766699816 (patch) | |
| tree | b3dc8e8fe40ebace2a1606f6dbba34318688719f | |
| parent | 7e2f6a1ffd64f8099222436362bd0df33b9c7a96 (diff) | |
| download | barebox-3588d40c5385e0487800764902dbaaa766699816.tar.gz barebox-3588d40c5385e0487800764902dbaaa766699816.tar.xz | |
mtd: nand-imx: repair reading the oob area
After sending the READOOB command the core (in nand_read_oob_std()) uses
the read_buf callback to fetch the result. So in the imx driver it is
necessary to emit the NFC_OUTPUT command to make the controller actually
read the requested data into the internal buffer and then copy the data
to the location where read_buf expects it.
This fixes reading from /dev/nand0.oob and also (somewhat) reading bad
block markers in the absence of a bad block table.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Tested-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| -rw-r--r-- | drivers/mtd/nand/nand_imx.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/drivers/mtd/nand/nand_imx.c b/drivers/mtd/nand/nand_imx.c index d69a012f01..f9d3c2e34a 100644 --- a/drivers/mtd/nand/nand_imx.c +++ b/drivers/mtd/nand/nand_imx.c @@ -996,14 +996,23 @@ static void imx_nand_command(struct mtd_info *mtd, unsigned command, else host->buf_start = column + mtd->writesize; - command = NAND_CMD_READ0; - - host->send_cmd(host, command); + host->send_cmd(host, NAND_CMD_READ0); mxc_do_addr_cycle(mtd, column, page_addr); if (host->pagesize_2k) /* send read confirm command */ host->send_cmd(host, NAND_CMD_READSTART); + + /* + * After the core issued READOOB the result is read using + * .read_buf, so we have to make sure the data is actually + * there. + */ + if (command == NAND_CMD_READOOB) { + host->send_page(host, NFC_OUTPUT); + copy_spare(mtd, 1, host->data_buf + mtd->writesize); + } + break; case NAND_CMD_SEQIN: |