Message ID | 20120213215539.GA7541@schlenkerla.am.freescale.net |
---|---|
State | Accepted |
Commit | 1f7b1743d389fec616e9021012a03847f490cd18 |
Delegated to: | Scott Wood |
Headers | show |
Hello Tom, will you take this patch? Or should we add the CONFIG_MTD_ECC_SOFT to the boards? Regards, Thomas On 02/13/2012 10:55 PM, Scott Wood wrote: > This reverts commit 4fee6c2f295f932b8febdc7ce8731ba045695fa5. > > It breaks boards that currently rely on soft-ecc, as pointed out here: > http://patchwork.ozlabs.org/patch/140872/ > > The reverted patch should be resubmitted with documentation, and with the > CONFIG_MTD_ECC_SOFT selected from every board that needs it. We could > start by looking at what NAND driver the board selects, and whether > that driver ever asks for soft ECC. > > Signed-off-by: Scott Wood<scottwood@freescale.com> > --- > drivers/mtd/nand/Makefile | 2 +- > drivers/mtd/nand/nand_base.c | 4 ---- > include/linux/mtd/nand_ecc.h | 25 ------------------------- > 3 files changed, 1 insertions(+), 30 deletions(-) > > diff --git a/drivers/mtd/nand/Makefile b/drivers/mtd/nand/Makefile > index 998fc73..1d1b628 100644 > --- a/drivers/mtd/nand/Makefile > +++ b/drivers/mtd/nand/Makefile > @@ -39,7 +39,7 @@ COBJS-y += nand_bbt.o > COBJS-y += nand_ids.o > COBJS-y += nand_util.o > endif > -COBJS-$(CONFIG_MTD_ECC_SOFT) += nand_ecc.o > +COBJS-y += nand_ecc.o > COBJS-y += nand_base.o > COBJS-$(CONFIG_NAND_ECC_BCH) += nand_bch.o > > diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c > index 12b960f..8ab8303 100644 > --- a/drivers/mtd/nand/nand_base.c > +++ b/drivers/mtd/nand/nand_base.c > @@ -3028,10 +3028,6 @@ int nand_scan_tail(struct mtd_info *mtd) > chip->ecc.mode = NAND_ECC_SOFT; > > case NAND_ECC_SOFT: > - if (!mtd_nand_has_ecc_soft()) { > - printk(KERN_WARNING "CONFIG_MTD_ECC_SOFT not enabled\n"); > - return -EINVAL; > - } > chip->ecc.calculate = nand_calculate_ecc; > chip->ecc.correct = nand_correct_data; > chip->ecc.read_page = nand_read_page_swecc; > diff --git a/include/linux/mtd/nand_ecc.h b/include/linux/mtd/nand_ecc.h > index 9715a53..090da50 100644 > --- a/include/linux/mtd/nand_ecc.h > +++ b/include/linux/mtd/nand_ecc.h > @@ -15,10 +15,6 @@ > > struct mtd_info; > > -#if defined(CONFIG_MTD_ECC_SOFT) > - > -static inline int mtd_nand_has_ecc_soft(void) { return 1; } > - > /* > * Calculate 3 byte ECC code for 256 byte block > */ > @@ -29,25 +25,4 @@ int nand_calculate_ecc(struct mtd_info *mtd, const u_char *dat, u_char *ecc_code > */ > int nand_correct_data(struct mtd_info *mtd, u_char *dat, u_char *read_ecc, u_char *calc_ecc); > > -#else > - > -static inline int mtd_nand_has_ecc_soft(void) { return 0; } > - > -static inline int > -nand_calculate_ecc(struct mtd_info *mtd, const u_char *dat, u_char *ecc_code) > -{ > - return -1; > -} > - > -static inline int > -nand_correct_data(struct mtd_info *mtd, > - u_char *dat, > - u_char *read_ecc, > - u_char *calc_ecc) > -{ > - return -1; > -} > - > -#endif > - > #endif /* __MTD_NAND_ECC_H__ */
On Fri, Mar 2, 2012 at 11:43 PM, Thomas Weber <thomas.weber.linux@googlemail.com> wrote: > Hello Tom, > > will you take this patch? Or should we add the CONFIG_MTD_ECC_SOFT to the > boards? This just hit mainline via Scott's tree.
Thank you, gentlemen, the patch worked a treat... ................................ U-Boot 2011.12-00374-g54e9668-dirty (Mar 03 2012 - 11:08:23) Pogoplug E02 SoC: Kirkwood 88F6281_A0 DRAM: 256 MiB WARNING: Caches not enabled NAND: 128 MiB ``````````````````````````````` Dave On Sat, Mar 3, 2012 at 8:24 AM, Tom Rini <trini@ti.com> wrote: > On Fri, Mar 2, 2012 at 11:43 PM, Thomas Weber > <thomas.weber.linux@googlemail.com> wrote: >> Hello Tom, >> >> will you take this patch? Or should we add the CONFIG_MTD_ECC_SOFT to the >> boards? > > This just hit mainline via Scott's tree. > > -- > Tom
diff --git a/drivers/mtd/nand/Makefile b/drivers/mtd/nand/Makefile index 998fc73..1d1b628 100644 --- a/drivers/mtd/nand/Makefile +++ b/drivers/mtd/nand/Makefile @@ -39,7 +39,7 @@ COBJS-y += nand_bbt.o COBJS-y += nand_ids.o COBJS-y += nand_util.o endif -COBJS-$(CONFIG_MTD_ECC_SOFT) += nand_ecc.o +COBJS-y += nand_ecc.o COBJS-y += nand_base.o COBJS-$(CONFIG_NAND_ECC_BCH) += nand_bch.o diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c index 12b960f..8ab8303 100644 --- a/drivers/mtd/nand/nand_base.c +++ b/drivers/mtd/nand/nand_base.c @@ -3028,10 +3028,6 @@ int nand_scan_tail(struct mtd_info *mtd) chip->ecc.mode = NAND_ECC_SOFT; case NAND_ECC_SOFT: - if (!mtd_nand_has_ecc_soft()) { - printk(KERN_WARNING "CONFIG_MTD_ECC_SOFT not enabled\n"); - return -EINVAL; - } chip->ecc.calculate = nand_calculate_ecc; chip->ecc.correct = nand_correct_data; chip->ecc.read_page = nand_read_page_swecc; diff --git a/include/linux/mtd/nand_ecc.h b/include/linux/mtd/nand_ecc.h index 9715a53..090da50 100644 --- a/include/linux/mtd/nand_ecc.h +++ b/include/linux/mtd/nand_ecc.h @@ -15,10 +15,6 @@ struct mtd_info; -#if defined(CONFIG_MTD_ECC_SOFT) - -static inline int mtd_nand_has_ecc_soft(void) { return 1; } - /* * Calculate 3 byte ECC code for 256 byte block */ @@ -29,25 +25,4 @@ int nand_calculate_ecc(struct mtd_info *mtd, const u_char *dat, u_char *ecc_code */ int nand_correct_data(struct mtd_info *mtd, u_char *dat, u_char *read_ecc, u_char *calc_ecc); -#else - -static inline int mtd_nand_has_ecc_soft(void) { return 0; } - -static inline int -nand_calculate_ecc(struct mtd_info *mtd, const u_char *dat, u_char *ecc_code) -{ - return -1; -} - -static inline int -nand_correct_data(struct mtd_info *mtd, - u_char *dat, - u_char *read_ecc, - u_char *calc_ecc) -{ - return -1; -} - -#endif - #endif /* __MTD_NAND_ECC_H__ */
This reverts commit 4fee6c2f295f932b8febdc7ce8731ba045695fa5. It breaks boards that currently rely on soft-ecc, as pointed out here: http://patchwork.ozlabs.org/patch/140872/ The reverted patch should be resubmitted with documentation, and with the CONFIG_MTD_ECC_SOFT selected from every board that needs it. We could start by looking at what NAND driver the board selects, and whether that driver ever asks for soft ECC. Signed-off-by: Scott Wood <scottwood@freescale.com> --- drivers/mtd/nand/Makefile | 2 +- drivers/mtd/nand/nand_base.c | 4 ---- include/linux/mtd/nand_ecc.h | 25 ------------------------- 3 files changed, 1 insertions(+), 30 deletions(-)