| Message ID | 20110314015056.GA6819@darkstar |
|---|---|
| State | New, archived |
| Headers | show |
On Mon, 2011-03-14 at 09:50 +0800, Yang Ruirui wrote: > From: Yang Ruirui<ruirui.r.yang@tieto.com> > > As Artem Bityutskiy's suggestion, The strict erase error handling option > does not make much sense. Well, I does make sense, but we just have no prove it is any useful, this is why I suggested to kill it. > > Here kill the option, and still keep the retry times as before. > > Signed-off-by: Yang Ruirui<ruirui.r.yang@tieto.com> > --- > drivers/mtd/Kconfig | 8 -------- > drivers/mtd/mtdswap.c | 8 +------- > 2 files changed, 1 insertion(+), 15 deletions(-) Thank, I've amended the commit message and pushed to my l2-mtd-2.6.git tree. Artem.
On 03/14/2011 04:39 PM, Artem Bityutskiy wrote: > On Mon, 2011-03-14 at 09:50 +0800, Yang Ruirui wrote: >> From: Yang Ruirui<ruirui.r.yang@tieto.com> >> >> As Artem Bityutskiy's suggestion, The strict erase error handling option >> does not make much sense. > > Well, I does make sense, but we just have no prove it is any useful, > this is why I suggested to kill it. > >> >> Here kill the option, and still keep the retry times as before. >> >> Signed-off-by: Yang Ruirui<ruirui.r.yang@tieto.com> >> --- >> drivers/mtd/Kconfig | 8 -------- >> drivers/mtd/mtdswap.c | 8 +------- >> 2 files changed, 1 insertion(+), 15 deletions(-) > > Thank, I've amended the commit message and pushed to my l2-mtd-2.6.git > tree. Thanks about that. > > Artem. >
--- mtd-2.6-fc2ff59.orig/drivers/mtd/mtdswap.c 2011-03-12 01:49:31.000000000 +0800 +++ mtd-2.6-fc2ff59/drivers/mtd/mtdswap.c 2011-03-14 09:36:09.283329099 +0800 @@ -156,12 +156,6 @@ struct mtdswap_oobdata { #define MTDSWAP_ERASE_RETRIES 3 /* Before marking erase block bad */ #define MTDSWAP_IO_RETRIES 3 -#ifdef CONFIG_MTD_SWAP_STRICT -#define MTDSWAP_STRICT 1 -#else -#define MTDSWAP_STRICT 0 -#endif - enum { MTDSWAP_SCANNED_CLEAN, MTDSWAP_SCANNED_DIRTY, @@ -575,7 +569,7 @@ retry: ret = mtd->erase(mtd, &erase); if (ret) { - if (retries++ < MTDSWAP_ERASE_RETRIES && !MTDSWAP_STRICT) { + if (retries++ < MTDSWAP_ERASE_RETRIES) { dev_warn(d->dev, "erase of erase block %#llx on %s failed", erase.addr, mtd->name); --- mtd-2.6-fc2ff59.orig/drivers/mtd/Kconfig 2011-03-12 01:49:31.000000000 +0800 +++ mtd-2.6-fc2ff59/drivers/mtd/Kconfig 2011-03-14 09:36:45.269995898 +0800 @@ -335,14 +335,6 @@ config MTD_SWAP The driver provides wear leveling by storing erase counter into the OOB. -config MTD_SWAP_STRICT - bool "Strict erase error handling" - depends on MTD_SWAP - help - Enables strict tolerance on failed erasures, marking erase blocks bad - right after the first failed operation. With non-strict mode the - erase operation is retried. - source "drivers/mtd/chips/Kconfig" source "drivers/mtd/maps/Kconfig"