nand base: Don't panic if a controller driver does ecc its own way.
Subsystems (2)
PATCH 1/3 nand base: Don't panic if a controller driver does ecc its own way.
Some hardware, such as the enhanced local bus controller used on some mpc83xx chips, does ecc transparently when reading and writing data, rather than providing a generic calculate/correct mechanism that can be exported to the nand subsystem.
The subsystem should not BUG() when calculate, correct, or hwctl are missing, if the methods that call them have been overridden.
Signed-off-by Scott Wood <[email protected]>
--- drivers/mtd/nand/nand_base.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-)
drivers/mtd/nand/nand_base.c +6 -2
@@ -2469,8 +2469,12 @@ int nand_scan_tail(struct mtd_info *mtd) chip->ecc.write_oob = nand_write_oob_std;case NAND_ECC_HW_SYNDROME : -if (!chip->ecc.calculate || !chip->ecc.correct || - !chip->ecc.hwctl) { +if ((!chip->ecc.calculate || !chip->ecc.correct || + !chip->ecc.hwctl) && + (!chip->ecc.read_page || + chip->ecc.read_page == nand_read_page_hwecc) || + !chip->ecc.write_page || + chip->ecc.write_page == nand_write_page_hwecc) {printk (KERN_WARNING "No ECC functions supplied, " "Hardware ECC not possible\n" );BUG ();
Signature · 1 line
1.5.3.8