mtd: nand_base: Make Diskonchip work again
Subsystems (2)
RFC 1/1 mtd: nand_base: Make Diskonchip work again
According to my post (http://permalink.gmane.org/gmane.linux.drivers.mtd/45657),
I created a patch to fix the DiskOnChip regression. Patch partially revert "mtd: nand: kill NAND_NO_READRDY". We create NAND_NEED_READDRY option as a replacement NAND_NO_READRDY but with different logic, and restore RDY expectations in reading function, if this option is set. At least, Disconchip works again, so probably it can help in solving other NAND-related bugs in the latest kernels.
Signed-off-by Alexander Shiyan <[email protected]>
--- drivers/mtd/nand/diskonchip.c | 1 + drivers/mtd/nand/nand_base.c | 16 ++++++++++++++++ include/linux/mtd/nand.h | 2 ++ 3 files changed, 19 insertions(+), 0 deletions(-)
drivers/mtd/nand/diskonchip.c +1 -0
@@ -1580,6 +1580,7 @@ static int __init doc_probe(unsigned long physadr) nand->dev_ready = doc200x_dev_ready; nand->waitfunc = doc200x_wait; nand->block_bad = doc200x_block_bad; + nand->options =NAND_NEED_READRDY ; nand->ecc.hwctl = doc200x_enable_hwecc; nand->ecc.calculate = doc200x_calculate_ecc; nand->ecc.correct = doc200x_correct_data;
drivers/mtd/nand/nand_base.c +16 -0
@@ -1523,6 +1523,14 @@ static int nand_do_read_ops(struct mtd_info *mtd, loff_t from, oobreadlen -= toread; } } + +if (chip->options &NAND_NEED_READRDY ) { +/* Apply delay or wait for ready/busy pin */ +if (!chip->dev_ready) +udelay (chip->chip_delay); +else +nand_wait_ready (mtd); + } }else {memcpy (buf, chip->buffers->databuf + col, bytes); buf += bytes;
@@ -1787,6 +1795,14 @@ static int nand_do_read_oob(struct mtd_info *mtd, loff_t from, len =min (len, readlen); buf =nand_transfer_oob (chip, buf, ops, len); +if (chip->options &NAND_NEED_READRDY ) { +/* Apply delay or wait for ready/busy pin */ +if (!chip->dev_ready) +udelay (chip->chip_delay); +else +nand_wait_ready (mtd); + } + readlen -= len;if (!readlen)break ;
include/linux/mtd/nand.h +2 -0
@@ -187,6 +187,8 @@ typedef enum {* This happens with the Renesas AG-AND chips, possibly others. */ #define BBT_AUTO_REFRESH 0x00000080 +/* Chip require ready check on read */ +#define NAND_NEED_READRDY 0x00000100/* Chip does not allow subpage writes */ #define NAND_NO_SUBPAGE_WRITE 0x00000200
Signature · 1 line
1.7.3.4