* [PATCH 12/12] mtd: mtd: drop NAND_ECC_SOFT_BCH enum value [not found] <1460750052-16285-1-git-send-email-zajec5@gmail.com> @ 2016-04-15 19:54 ` Rafał Miłecki 2016-04-17 17:05 ` Boris Brezillon [not found] ` <1460913104-27388-1-git-send-email-zajec5@gmail.com> 1 sibling, 1 reply; 6+ messages in thread From: Rafał Miłecki @ 2016-04-15 19:54 UTC (permalink / raw) To: linux-arm-kernel This value should not be part of nand_ecc_modes_t as it specifies algorithm not a mode. We successfully managed to introduce new "algo" field which is respected now. Signed-off-by: Rafa? Mi?ecki <zajec5@gmail.com> --- drivers/mtd/nand/fsmc_nand.c | 3 +-- drivers/mtd/nand/jz4780_nand.c | 1 - drivers/mtd/nand/nand_base.c | 2 -- drivers/mtd/nand/nandsim.c | 2 +- drivers/mtd/nand/sunxi_nand.c | 2 -- include/linux/mtd/nand.h | 1 - 6 files changed, 2 insertions(+), 9 deletions(-) diff --git a/drivers/mtd/nand/fsmc_nand.c b/drivers/mtd/nand/fsmc_nand.c index 0f8c63f..d4f454a 100644 --- a/drivers/mtd/nand/fsmc_nand.c +++ b/drivers/mtd/nand/fsmc_nand.c @@ -959,7 +959,6 @@ static int __init fsmc_nand_probe(struct platform_device *pdev) break; case NAND_ECC_SOFT: - case NAND_ECC_SOFT_BCH: if (nand->ecc.algo == NAND_ECC_BCH) { dev_info(&pdev->dev, "Using 4-bit SW BCH ECC scheme\n"); break; @@ -974,7 +973,7 @@ static int __init fsmc_nand_probe(struct platform_device *pdev) * Don't set layout for BCH4 SW ECC. This will be * generated later in nand_bch_init() later. */ - if (nand->ecc.mode != NAND_ECC_SOFT_BCH) { + if (nand->ecc.mode == NAND_ECC_HW) { switch (mtd->oobsize) { case 16: case 64: diff --git a/drivers/mtd/nand/jz4780_nand.c b/drivers/mtd/nand/jz4780_nand.c index 10f249a..daf3c42 100644 --- a/drivers/mtd/nand/jz4780_nand.c +++ b/drivers/mtd/nand/jz4780_nand.c @@ -179,7 +179,6 @@ static int jz4780_nand_init_ecc(struct jz4780_nand_chip *nand, struct device *de chip->ecc.correct = jz4780_nand_ecc_correct; /* fall through */ case NAND_ECC_SOFT: - case NAND_ECC_SOFT_BCH: dev_info(dev, "using %s (strength %d, size %d, bytes %d)\n", (nfc->bch) ? "hardware BCH" : "software ECC", chip->ecc.strength, chip->ecc.size, chip->ecc.bytes); diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c index ffd1b32..186d5b5 100644 --- a/drivers/mtd/nand/nand_base.c +++ b/drivers/mtd/nand/nand_base.c @@ -4248,7 +4248,6 @@ int nand_scan_tail(struct mtd_info *mtd) ecc->algo = NAND_ECC_HAMMING; case NAND_ECC_SOFT: - case NAND_ECC_SOFT_BCH: switch (ecc->algo) { case NAND_ECC_HAMMING: ecc->calculate = nand_calculate_ecc; @@ -4386,7 +4385,6 @@ int nand_scan_tail(struct mtd_info *mtd) /* Large page NAND with SOFT_ECC should support subpage reads */ switch (ecc->mode) { case NAND_ECC_SOFT: - case NAND_ECC_SOFT_BCH: if (chip->page_shift > 9) chip->options |= NAND_SUBPAGE_READ; break; diff --git a/drivers/mtd/nand/nandsim.c b/drivers/mtd/nand/nandsim.c index 6ff1d8d..b0074c2 100644 --- a/drivers/mtd/nand/nandsim.c +++ b/drivers/mtd/nand/nandsim.c @@ -2339,7 +2339,7 @@ static int __init ns_init_module(void) retval = -EINVAL; goto error; } - chip->ecc.mode = NAND_ECC_SOFT_BCH; + chip->ecc.mode = NAND_ECC_SOFT; chip->ecc.algo = NAND_ECC_BCH; chip->ecc.size = 512; chip->ecc.strength = bch; diff --git a/drivers/mtd/nand/sunxi_nand.c b/drivers/mtd/nand/sunxi_nand.c index 1baf8983..a83a690 100644 --- a/drivers/mtd/nand/sunxi_nand.c +++ b/drivers/mtd/nand/sunxi_nand.c @@ -1612,8 +1612,6 @@ static int sunxi_nand_ecc_init(struct mtd_info *mtd, struct nand_ecc_ctrl *ecc, return -EINVAL; switch (ecc->mode) { - case NAND_ECC_SOFT_BCH: - break; case NAND_ECC_HW: ret = sunxi_nand_hw_ecc_ctrl_init(mtd, ecc, np); if (ret) diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h index e851839..fbe8e16 100644 --- a/include/linux/mtd/nand.h +++ b/include/linux/mtd/nand.h @@ -116,7 +116,6 @@ typedef enum { NAND_ECC_HW, NAND_ECC_HW_SYNDROME, NAND_ECC_HW_OOB_FIRST, - NAND_ECC_SOFT_BCH, } nand_ecc_modes_t; enum nand_ecc_algo { -- 1.8.4.5 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 12/12] mtd: mtd: drop NAND_ECC_SOFT_BCH enum value 2016-04-15 19:54 ` [PATCH 12/12] mtd: mtd: drop NAND_ECC_SOFT_BCH enum value Rafał Miłecki @ 2016-04-17 17:05 ` Boris Brezillon 2016-04-17 17:10 ` Rafał Miłecki 0 siblings, 1 reply; 6+ messages in thread From: Boris Brezillon @ 2016-04-17 17:05 UTC (permalink / raw) To: linux-arm-kernel On Fri, 15 Apr 2016 21:54:12 +0200 Rafa? Mi?ecki <zajec5@gmail.com> wrote: > This value should not be part of nand_ecc_modes_t as it specifies > algorithm not a mode. We successfully managed to introduce new "algo" > field which is respected now. > > Signed-off-by: Rafa? Mi?ecki <zajec5@gmail.com> > --- > drivers/mtd/nand/fsmc_nand.c | 3 +-- > drivers/mtd/nand/jz4780_nand.c | 1 - > drivers/mtd/nand/nand_base.c | 2 -- > drivers/mtd/nand/nandsim.c | 2 +- > drivers/mtd/nand/sunxi_nand.c | 2 -- > include/linux/mtd/nand.h | 1 - > 6 files changed, 2 insertions(+), 9 deletions(-) > > diff --git a/drivers/mtd/nand/fsmc_nand.c b/drivers/mtd/nand/fsmc_nand.c > index 0f8c63f..d4f454a 100644 > --- a/drivers/mtd/nand/fsmc_nand.c > +++ b/drivers/mtd/nand/fsmc_nand.c > @@ -959,7 +959,6 @@ static int __init fsmc_nand_probe(struct platform_device *pdev) > break; > > case NAND_ECC_SOFT: > - case NAND_ECC_SOFT_BCH: > if (nand->ecc.algo == NAND_ECC_BCH) { > dev_info(&pdev->dev, "Using 4-bit SW BCH ECC scheme\n"); > break; > @@ -974,7 +973,7 @@ static int __init fsmc_nand_probe(struct platform_device *pdev) > * Don't set layout for BCH4 SW ECC. This will be > * generated later in nand_bch_init() later. > */ > - if (nand->ecc.mode != NAND_ECC_SOFT_BCH) { > + if (nand->ecc.mode == NAND_ECC_HW) { This test is wrong, it should be if (nand->ecc.mode != NAND_ECC_SOFT || nand->ecc.algo != NAND_ECC_BCH) or if (!(nand->ecc.mode == NAND_ECC_SOFT && nand->ecc.algo == NAND_ECC_BCH) > switch (mtd->oobsize) { > case 16: > case 64: > diff --git a/drivers/mtd/nand/jz4780_nand.c b/drivers/mtd/nand/jz4780_nand.c > index 10f249a..daf3c42 100644 > --- a/drivers/mtd/nand/jz4780_nand.c > +++ b/drivers/mtd/nand/jz4780_nand.c > @@ -179,7 +179,6 @@ static int jz4780_nand_init_ecc(struct jz4780_nand_chip *nand, struct device *de > chip->ecc.correct = jz4780_nand_ecc_correct; > /* fall through */ > case NAND_ECC_SOFT: > - case NAND_ECC_SOFT_BCH: > dev_info(dev, "using %s (strength %d, size %d, bytes %d)\n", > (nfc->bch) ? "hardware BCH" : "software ECC", > chip->ecc.strength, chip->ecc.size, chip->ecc.bytes); > diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c > index ffd1b32..186d5b5 100644 > --- a/drivers/mtd/nand/nand_base.c > +++ b/drivers/mtd/nand/nand_base.c > @@ -4248,7 +4248,6 @@ int nand_scan_tail(struct mtd_info *mtd) > ecc->algo = NAND_ECC_HAMMING; > > case NAND_ECC_SOFT: > - case NAND_ECC_SOFT_BCH: > switch (ecc->algo) { > case NAND_ECC_HAMMING: > ecc->calculate = nand_calculate_ecc; > @@ -4386,7 +4385,6 @@ int nand_scan_tail(struct mtd_info *mtd) > /* Large page NAND with SOFT_ECC should support subpage reads */ > switch (ecc->mode) { > case NAND_ECC_SOFT: > - case NAND_ECC_SOFT_BCH: > if (chip->page_shift > 9) > chip->options |= NAND_SUBPAGE_READ; > break; > diff --git a/drivers/mtd/nand/nandsim.c b/drivers/mtd/nand/nandsim.c > index 6ff1d8d..b0074c2 100644 > --- a/drivers/mtd/nand/nandsim.c > +++ b/drivers/mtd/nand/nandsim.c > @@ -2339,7 +2339,7 @@ static int __init ns_init_module(void) > retval = -EINVAL; > goto error; > } > - chip->ecc.mode = NAND_ECC_SOFT_BCH; > + chip->ecc.mode = NAND_ECC_SOFT; > chip->ecc.algo = NAND_ECC_BCH; > chip->ecc.size = 512; > chip->ecc.strength = bch; > diff --git a/drivers/mtd/nand/sunxi_nand.c b/drivers/mtd/nand/sunxi_nand.c > index 1baf8983..a83a690 100644 > --- a/drivers/mtd/nand/sunxi_nand.c > +++ b/drivers/mtd/nand/sunxi_nand.c > @@ -1612,8 +1612,6 @@ static int sunxi_nand_ecc_init(struct mtd_info *mtd, struct nand_ecc_ctrl *ecc, > return -EINVAL; > > switch (ecc->mode) { > - case NAND_ECC_SOFT_BCH: > - break; > case NAND_ECC_HW: > ret = sunxi_nand_hw_ecc_ctrl_init(mtd, ecc, np); > if (ret) > diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h > index e851839..fbe8e16 100644 > --- a/include/linux/mtd/nand.h > +++ b/include/linux/mtd/nand.h > @@ -116,7 +116,6 @@ typedef enum { > NAND_ECC_HW, > NAND_ECC_HW_SYNDROME, > NAND_ECC_HW_OOB_FIRST, > - NAND_ECC_SOFT_BCH, > } nand_ecc_modes_t; > > enum nand_ecc_algo { -- Boris Brezillon, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 12/12] mtd: mtd: drop NAND_ECC_SOFT_BCH enum value 2016-04-17 17:05 ` Boris Brezillon @ 2016-04-17 17:10 ` Rafał Miłecki 2016-04-17 19:01 ` Boris Brezillon 0 siblings, 1 reply; 6+ messages in thread From: Rafał Miłecki @ 2016-04-17 17:10 UTC (permalink / raw) To: linux-arm-kernel On 17 April 2016 at 19:05, Boris Brezillon <boris.brezillon@free-electrons.com> wrote: > On Fri, 15 Apr 2016 21:54:12 +0200 > Rafa? Mi?ecki <zajec5@gmail.com> wrote: > >> This value should not be part of nand_ecc_modes_t as it specifies >> algorithm not a mode. We successfully managed to introduce new "algo" >> field which is respected now. >> >> Signed-off-by: Rafa? Mi?ecki <zajec5@gmail.com> >> --- >> drivers/mtd/nand/fsmc_nand.c | 3 +-- >> drivers/mtd/nand/jz4780_nand.c | 1 - >> drivers/mtd/nand/nand_base.c | 2 -- >> drivers/mtd/nand/nandsim.c | 2 +- >> drivers/mtd/nand/sunxi_nand.c | 2 -- >> include/linux/mtd/nand.h | 1 - >> 6 files changed, 2 insertions(+), 9 deletions(-) >> >> diff --git a/drivers/mtd/nand/fsmc_nand.c b/drivers/mtd/nand/fsmc_nand.c >> index 0f8c63f..d4f454a 100644 >> --- a/drivers/mtd/nand/fsmc_nand.c >> +++ b/drivers/mtd/nand/fsmc_nand.c >> @@ -959,7 +959,6 @@ static int __init fsmc_nand_probe(struct platform_device *pdev) >> break; >> >> case NAND_ECC_SOFT: >> - case NAND_ECC_SOFT_BCH: >> if (nand->ecc.algo == NAND_ECC_BCH) { >> dev_info(&pdev->dev, "Using 4-bit SW BCH ECC scheme\n"); >> break; >> @@ -974,7 +973,7 @@ static int __init fsmc_nand_probe(struct platform_device *pdev) >> * Don't set layout for BCH4 SW ECC. This will be >> * generated later in nand_bch_init() later. >> */ >> - if (nand->ecc.mode != NAND_ECC_SOFT_BCH) { >> + if (nand->ecc.mode == NAND_ECC_HW) { > > This test is wrong, it should be > > if (nand->ecc.mode != NAND_ECC_SOFT || > nand->ecc.algo != NAND_ECC_BCH) > > or > if (!(nand->ecc.mode == NAND_ECC_SOFT && > nand->ecc.algo == NAND_ECC_BCH) This driver supports only 2 modes (see switch above). ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 12/12] mtd: mtd: drop NAND_ECC_SOFT_BCH enum value 2016-04-17 17:10 ` Rafał Miłecki @ 2016-04-17 19:01 ` Boris Brezillon 0 siblings, 0 replies; 6+ messages in thread From: Boris Brezillon @ 2016-04-17 19:01 UTC (permalink / raw) To: linux-arm-kernel On Sun, 17 Apr 2016 19:10:11 +0200 Rafa? Mi?ecki <zajec5@gmail.com> wrote: > On 17 April 2016 at 19:05, Boris Brezillon > <boris.brezillon@free-electrons.com> wrote: > > On Fri, 15 Apr 2016 21:54:12 +0200 > > Rafa? Mi?ecki <zajec5@gmail.com> wrote: > > > >> This value should not be part of nand_ecc_modes_t as it specifies > >> algorithm not a mode. We successfully managed to introduce new "algo" > >> field which is respected now. > >> > >> Signed-off-by: Rafa? Mi?ecki <zajec5@gmail.com> > >> --- > >> drivers/mtd/nand/fsmc_nand.c | 3 +-- > >> drivers/mtd/nand/jz4780_nand.c | 1 - > >> drivers/mtd/nand/nand_base.c | 2 -- > >> drivers/mtd/nand/nandsim.c | 2 +- > >> drivers/mtd/nand/sunxi_nand.c | 2 -- > >> include/linux/mtd/nand.h | 1 - > >> 6 files changed, 2 insertions(+), 9 deletions(-) > >> > >> diff --git a/drivers/mtd/nand/fsmc_nand.c b/drivers/mtd/nand/fsmc_nand.c > >> index 0f8c63f..d4f454a 100644 > >> --- a/drivers/mtd/nand/fsmc_nand.c > >> +++ b/drivers/mtd/nand/fsmc_nand.c > >> @@ -959,7 +959,6 @@ static int __init fsmc_nand_probe(struct platform_device *pdev) > >> break; > >> > >> case NAND_ECC_SOFT: > >> - case NAND_ECC_SOFT_BCH: > >> if (nand->ecc.algo == NAND_ECC_BCH) { > >> dev_info(&pdev->dev, "Using 4-bit SW BCH ECC scheme\n"); > >> break; > >> @@ -974,7 +973,7 @@ static int __init fsmc_nand_probe(struct platform_device *pdev) > >> * Don't set layout for BCH4 SW ECC. This will be > >> * generated later in nand_bch_init() later. > >> */ > >> - if (nand->ecc.mode != NAND_ECC_SOFT_BCH) { > >> + if (nand->ecc.mode == NAND_ECC_HW) { > > > > This test is wrong, it should be > > > > if (nand->ecc.mode != NAND_ECC_SOFT || > > nand->ecc.algo != NAND_ECC_BCH) > > > > or > > if (!(nand->ecc.mode == NAND_ECC_SOFT && > > nand->ecc.algo == NAND_ECC_BCH) > > This driver supports only 2 modes (see switch above). Indeed. Sorry, I didn't read the full context. Thanks for the clarification. Boris -- Boris Brezillon, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com ^ permalink raw reply [flat|nested] 6+ messages in thread
[parent not found: <1460913104-27388-1-git-send-email-zajec5@gmail.com>]
* [PATCH V2 11/11] mtd: mtd: drop NAND_ECC_SOFT_BCH enum value [not found] ` <1460913104-27388-1-git-send-email-zajec5@gmail.com> @ 2016-04-17 17:11 ` Rafał Miłecki [not found] ` <1460926387-9563-1-git-send-email-zajec5@gmail.com> 1 sibling, 0 replies; 6+ messages in thread From: Rafał Miłecki @ 2016-04-17 17:11 UTC (permalink / raw) To: linux-arm-kernel This value should not be part of nand_ecc_modes_t as it specifies algorithm not a mode. We successfully managed to introduce new "algo" field which is respected now. Signed-off-by: Rafa? Mi?ecki <zajec5@gmail.com> --- drivers/mtd/nand/fsmc_nand.c | 3 +-- drivers/mtd/nand/jz4780_nand.c | 1 - drivers/mtd/nand/nand_base.c | 11 +++-------- drivers/mtd/nand/nandsim.c | 2 +- drivers/mtd/nand/sunxi_nand.c | 2 -- include/linux/mtd/nand.h | 1 - 6 files changed, 5 insertions(+), 15 deletions(-) diff --git a/drivers/mtd/nand/fsmc_nand.c b/drivers/mtd/nand/fsmc_nand.c index 0f8c63f..d4f454a 100644 --- a/drivers/mtd/nand/fsmc_nand.c +++ b/drivers/mtd/nand/fsmc_nand.c @@ -959,7 +959,6 @@ static int __init fsmc_nand_probe(struct platform_device *pdev) break; case NAND_ECC_SOFT: - case NAND_ECC_SOFT_BCH: if (nand->ecc.algo == NAND_ECC_BCH) { dev_info(&pdev->dev, "Using 4-bit SW BCH ECC scheme\n"); break; @@ -974,7 +973,7 @@ static int __init fsmc_nand_probe(struct platform_device *pdev) * Don't set layout for BCH4 SW ECC. This will be * generated later in nand_bch_init() later. */ - if (nand->ecc.mode != NAND_ECC_SOFT_BCH) { + if (nand->ecc.mode == NAND_ECC_HW) { switch (mtd->oobsize) { case 16: case 64: diff --git a/drivers/mtd/nand/jz4780_nand.c b/drivers/mtd/nand/jz4780_nand.c index 10f249a..daf3c42 100644 --- a/drivers/mtd/nand/jz4780_nand.c +++ b/drivers/mtd/nand/jz4780_nand.c @@ -179,7 +179,6 @@ static int jz4780_nand_init_ecc(struct jz4780_nand_chip *nand, struct device *de chip->ecc.correct = jz4780_nand_ecc_correct; /* fall through */ case NAND_ECC_SOFT: - case NAND_ECC_SOFT_BCH: dev_info(dev, "using %s (strength %d, size %d, bytes %d)\n", (nfc->bch) ? "hardware BCH" : "software ECC", chip->ecc.strength, chip->ecc.size, chip->ecc.bytes); diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c index d092375..bc029d0 100644 --- a/drivers/mtd/nand/nand_base.c +++ b/drivers/mtd/nand/nand_base.c @@ -4084,8 +4084,7 @@ static int nand_set_ecc_soft_ops(struct mtd_info *mtd) struct nand_chip *chip = mtd_to_nand(mtd); struct nand_ecc_ctrl *ecc = &chip->ecc; - if (WARN_ON(ecc->mode != NAND_ECC_SOFT && - ecc->mode != NAND_ECC_SOFT_BCH)) + if (WARN_ON(ecc->mode != NAND_ECC_SOFT)) return -EINVAL; switch (ecc->algo) { @@ -4218,7 +4217,7 @@ int nand_scan_tail(struct mtd_info *mtd) * If no default placement scheme is given, select an appropriate one. */ if (!mtd->ooblayout && - (ecc->mode == NAND_ECC_SOFT || ecc->mode == NAND_ECC_SOFT_BCH) && + ecc->mode == NAND_ECC_SOFT && ecc->algo != NAND_ECC_BCH) { switch (mtd->oobsize) { case 8: @@ -4313,13 +4312,11 @@ int nand_scan_tail(struct mtd_info *mtd) ecc->algo = NAND_ECC_HAMMING; case NAND_ECC_SOFT: - case NAND_ECC_SOFT_BCH: ret = nand_set_ecc_soft_ops(mtd); if (ret) { ret = -EINVAL; goto err_free; } - break; case NAND_ECC_NONE: @@ -4402,7 +4399,6 @@ int nand_scan_tail(struct mtd_info *mtd) /* Large page NAND with SOFT_ECC should support subpage reads */ switch (ecc->mode) { case NAND_ECC_SOFT: - case NAND_ECC_SOFT_BCH: if (chip->page_shift > 9) chip->options |= NAND_SUBPAGE_READ; break; @@ -4502,8 +4498,7 @@ void nand_release(struct mtd_info *mtd) { struct nand_chip *chip = mtd_to_nand(mtd); - if ((chip->ecc.mode == NAND_ECC_SOFT || - chip->ecc.mode == NAND_ECC_SOFT_BCH) && + if (chip->ecc.mode == NAND_ECC_SOFT && chip->ecc.algo == NAND_ECC_BCH) nand_bch_free((struct nand_bch_control *)chip->ecc.priv); diff --git a/drivers/mtd/nand/nandsim.c b/drivers/mtd/nand/nandsim.c index 6ff1d8d..b0074c2 100644 --- a/drivers/mtd/nand/nandsim.c +++ b/drivers/mtd/nand/nandsim.c @@ -2339,7 +2339,7 @@ static int __init ns_init_module(void) retval = -EINVAL; goto error; } - chip->ecc.mode = NAND_ECC_SOFT_BCH; + chip->ecc.mode = NAND_ECC_SOFT; chip->ecc.algo = NAND_ECC_BCH; chip->ecc.size = 512; chip->ecc.strength = bch; diff --git a/drivers/mtd/nand/sunxi_nand.c b/drivers/mtd/nand/sunxi_nand.c index 1baf8983..a83a690 100644 --- a/drivers/mtd/nand/sunxi_nand.c +++ b/drivers/mtd/nand/sunxi_nand.c @@ -1612,8 +1612,6 @@ static int sunxi_nand_ecc_init(struct mtd_info *mtd, struct nand_ecc_ctrl *ecc, return -EINVAL; switch (ecc->mode) { - case NAND_ECC_SOFT_BCH: - break; case NAND_ECC_HW: ret = sunxi_nand_hw_ecc_ctrl_init(mtd, ecc, np); if (ret) diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h index e851839..fbe8e16 100644 --- a/include/linux/mtd/nand.h +++ b/include/linux/mtd/nand.h @@ -116,7 +116,6 @@ typedef enum { NAND_ECC_HW, NAND_ECC_HW_SYNDROME, NAND_ECC_HW_OOB_FIRST, - NAND_ECC_SOFT_BCH, } nand_ecc_modes_t; enum nand_ecc_algo { -- 1.8.4.5 ^ permalink raw reply related [flat|nested] 6+ messages in thread
[parent not found: <1460926387-9563-1-git-send-email-zajec5@gmail.com>]
* [PATCH V3 11/11] mtd: mtd: drop NAND_ECC_SOFT_BCH enum value [not found] ` <1460926387-9563-1-git-send-email-zajec5@gmail.com> @ 2016-04-17 20:53 ` Rafał Miłecki 0 siblings, 0 replies; 6+ messages in thread From: Rafał Miłecki @ 2016-04-17 20:53 UTC (permalink / raw) To: linux-arm-kernel This value should not be part of nand_ecc_modes_t as it specifies algorithm not a mode. We successfully managed to introduce new "algo" field which is respected now. Signed-off-by: Rafa? Mi?ecki <zajec5@gmail.com> --- drivers/mtd/nand/fsmc_nand.c | 3 +-- drivers/mtd/nand/jz4780_nand.c | 1 - drivers/mtd/nand/nand_base.c | 12 +++--------- drivers/mtd/nand/nandsim.c | 2 +- drivers/mtd/nand/sunxi_nand.c | 2 -- include/linux/mtd/nand.h | 1 - 6 files changed, 5 insertions(+), 16 deletions(-) diff --git a/drivers/mtd/nand/fsmc_nand.c b/drivers/mtd/nand/fsmc_nand.c index 0f8c63f..d4f454a 100644 --- a/drivers/mtd/nand/fsmc_nand.c +++ b/drivers/mtd/nand/fsmc_nand.c @@ -959,7 +959,6 @@ static int __init fsmc_nand_probe(struct platform_device *pdev) break; case NAND_ECC_SOFT: - case NAND_ECC_SOFT_BCH: if (nand->ecc.algo == NAND_ECC_BCH) { dev_info(&pdev->dev, "Using 4-bit SW BCH ECC scheme\n"); break; @@ -974,7 +973,7 @@ static int __init fsmc_nand_probe(struct platform_device *pdev) * Don't set layout for BCH4 SW ECC. This will be * generated later in nand_bch_init() later. */ - if (nand->ecc.mode != NAND_ECC_SOFT_BCH) { + if (nand->ecc.mode == NAND_ECC_HW) { switch (mtd->oobsize) { case 16: case 64: diff --git a/drivers/mtd/nand/jz4780_nand.c b/drivers/mtd/nand/jz4780_nand.c index 10f249a..daf3c42 100644 --- a/drivers/mtd/nand/jz4780_nand.c +++ b/drivers/mtd/nand/jz4780_nand.c @@ -179,7 +179,6 @@ static int jz4780_nand_init_ecc(struct jz4780_nand_chip *nand, struct device *de chip->ecc.correct = jz4780_nand_ecc_correct; /* fall through */ case NAND_ECC_SOFT: - case NAND_ECC_SOFT_BCH: dev_info(dev, "using %s (strength %d, size %d, bytes %d)\n", (nfc->bch) ? "hardware BCH" : "software ECC", chip->ecc.strength, chip->ecc.size, chip->ecc.bytes); diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c index e51d927..e40832d 100644 --- a/drivers/mtd/nand/nand_base.c +++ b/drivers/mtd/nand/nand_base.c @@ -4084,8 +4084,7 @@ static int nand_set_ecc_soft_ops(struct mtd_info *mtd) struct nand_chip *chip = mtd_to_nand(mtd); struct nand_ecc_ctrl *ecc = &chip->ecc; - if (WARN_ON(ecc->mode != NAND_ECC_SOFT && - ecc->mode != NAND_ECC_SOFT_BCH)) + if (WARN_ON(ecc->mode != NAND_ECC_SOFT)) return -EINVAL; switch (ecc->algo) { @@ -4218,8 +4217,7 @@ int nand_scan_tail(struct mtd_info *mtd) * If no default placement scheme is given, select an appropriate one. */ if (!mtd->ooblayout && - !((ecc->mode == NAND_ECC_SOFT || ecc->mode == NAND_ECC_SOFT_BCH) && - ecc->algo == NAND_ECC_BCH)) { + !(ecc->mode == NAND_ECC_SOFT && ecc->algo == NAND_ECC_BCH)) { switch (mtd->oobsize) { case 8: case 16: @@ -4313,13 +4311,11 @@ int nand_scan_tail(struct mtd_info *mtd) ecc->algo = NAND_ECC_HAMMING; case NAND_ECC_SOFT: - case NAND_ECC_SOFT_BCH: ret = nand_set_ecc_soft_ops(mtd); if (ret) { ret = -EINVAL; goto err_free; } - break; case NAND_ECC_NONE: @@ -4402,7 +4398,6 @@ int nand_scan_tail(struct mtd_info *mtd) /* Large page NAND with SOFT_ECC should support subpage reads */ switch (ecc->mode) { case NAND_ECC_SOFT: - case NAND_ECC_SOFT_BCH: if (chip->page_shift > 9) chip->options |= NAND_SUBPAGE_READ; break; @@ -4502,8 +4497,7 @@ void nand_release(struct mtd_info *mtd) { struct nand_chip *chip = mtd_to_nand(mtd); - if ((chip->ecc.mode == NAND_ECC_SOFT || - chip->ecc.mode == NAND_ECC_SOFT_BCH) && + if (chip->ecc.mode == NAND_ECC_SOFT && chip->ecc.algo == NAND_ECC_BCH) nand_bch_free((struct nand_bch_control *)chip->ecc.priv); diff --git a/drivers/mtd/nand/nandsim.c b/drivers/mtd/nand/nandsim.c index 6ff1d8d..b0074c2 100644 --- a/drivers/mtd/nand/nandsim.c +++ b/drivers/mtd/nand/nandsim.c @@ -2339,7 +2339,7 @@ static int __init ns_init_module(void) retval = -EINVAL; goto error; } - chip->ecc.mode = NAND_ECC_SOFT_BCH; + chip->ecc.mode = NAND_ECC_SOFT; chip->ecc.algo = NAND_ECC_BCH; chip->ecc.size = 512; chip->ecc.strength = bch; diff --git a/drivers/mtd/nand/sunxi_nand.c b/drivers/mtd/nand/sunxi_nand.c index 1baf8983..a83a690 100644 --- a/drivers/mtd/nand/sunxi_nand.c +++ b/drivers/mtd/nand/sunxi_nand.c @@ -1612,8 +1612,6 @@ static int sunxi_nand_ecc_init(struct mtd_info *mtd, struct nand_ecc_ctrl *ecc, return -EINVAL; switch (ecc->mode) { - case NAND_ECC_SOFT_BCH: - break; case NAND_ECC_HW: ret = sunxi_nand_hw_ecc_ctrl_init(mtd, ecc, np); if (ret) diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h index e851839..fbe8e16 100644 --- a/include/linux/mtd/nand.h +++ b/include/linux/mtd/nand.h @@ -116,7 +116,6 @@ typedef enum { NAND_ECC_HW, NAND_ECC_HW_SYNDROME, NAND_ECC_HW_OOB_FIRST, - NAND_ECC_SOFT_BCH, } nand_ecc_modes_t; enum nand_ecc_algo { -- 1.8.4.5 ^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2016-04-17 20:53 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <1460750052-16285-1-git-send-email-zajec5@gmail.com>
2016-04-15 19:54 ` [PATCH 12/12] mtd: mtd: drop NAND_ECC_SOFT_BCH enum value Rafał Miłecki
2016-04-17 17:05 ` Boris Brezillon
2016-04-17 17:10 ` Rafał Miłecki
2016-04-17 19:01 ` Boris Brezillon
[not found] ` <1460913104-27388-1-git-send-email-zajec5@gmail.com>
2016-04-17 17:11 ` [PATCH V2 11/11] " Rafał Miłecki
[not found] ` <1460926387-9563-1-git-send-email-zajec5@gmail.com>
2016-04-17 20:53 ` [PATCH V3 " Rafał Miłecki
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).