| Message ID | 20190417092205.20508-1-gregory.clement@bootlin.com |
|---|---|
| State | Accepted |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | [U-Boot,v2] mtd: nand: raw: Fix CONFIG_SYS_NAND_DRIVER_ECC_LAYOUT behavior | expand |
On 17.04.2019 12:22, Gregory CLEMENT wrote: > The purpose of "mtd: nand: raw: allow to disable unneeded ECC layouts" > was to allow disabling the default ECC layouts if a driver is known to > provide its own ECC layout. However, this commit did the opposite and > disabled the default layout when it was _not_ selected. > > It breaks all the NAND drivers not providing their own ECC layout this > patch fix this situation. > > It was tested with the lpc32xx_nand_slc driver. > > Fixes: a38c3af868 ("mtd: nand: raw: allow to disable unneeded ECC layouts") > Reviewed-by: Miquel Raynal <miquel.raynal@bootlin.com> > Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com> > --- Tested on sama5d3_xplained: Tested-by: Eugen Hristev <eugen.hristev@microchip.com> This fixes the issue which we found on this board: NAND: BUG at drivers/mtd/nand/raw/nand_base.c:4361/nand_scan_tail()!
On Wed, Apr 17, 2019 at 11:22:05AM +0200, Gregory CLEMENT wrote: > The purpose of "mtd: nand: raw: allow to disable unneeded ECC layouts" > was to allow disabling the default ECC layouts if a driver is known to > provide its own ECC layout. However, this commit did the opposite and > disabled the default layout when it was _not_ selected. > > It breaks all the NAND drivers not providing their own ECC layout this > patch fix this situation. > > It was tested with the lpc32xx_nand_slc driver. > > Fixes: a38c3af868 ("mtd: nand: raw: allow to disable unneeded ECC layouts") > Reviewed-by: Miquel Raynal <miquel.raynal@bootlin.com> > Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com> > Tested-by: Eugen Hristev <eugen.hristev@microchip.com> Applied to u-boot/master, thanks!
diff --git a/drivers/mtd/nand/raw/nand_base.c b/drivers/mtd/nand/raw/nand_base.c index 6d2ff58d86..dc4576a3a1 100644 --- a/drivers/mtd/nand/raw/nand_base.c +++ b/drivers/mtd/nand/raw/nand_base.c @@ -47,7 +47,7 @@ #include <linux/errno.h> /* Define default oob placement schemes for large and small page devices */ -#ifdef CONFIG_SYS_NAND_DRIVER_ECC_LAYOUT +#ifndef CONFIG_SYS_NAND_DRIVER_ECC_LAYOUT static struct nand_ecclayout nand_oob_8 = { .eccbytes = 3, .eccpos = {0, 1, 2}, @@ -4341,7 +4341,7 @@ int nand_scan_tail(struct mtd_info *mtd) */ if (!ecc->layout && (ecc->mode != NAND_ECC_SOFT_BCH)) { switch (mtd->oobsize) { -#ifdef CONFIG_SYS_NAND_DRIVER_ECC_LAYOUT +#ifndef CONFIG_SYS_NAND_DRIVER_ECC_LAYOUT case 8: ecc->layout = &nand_oob_8; break;
The purpose of "mtd: nand: raw: allow to disable unneeded ECC layouts" was to allow disabling the default ECC layouts if a driver is known to provide its own ECC layout. However, this commit did the opposite and disabled the default layout when it was _not_ selected. It breaks all the NAND drivers not providing their own ECC layout this patch fix this situation. It was tested with the lpc32xx_nand_slc driver. Fixes: a38c3af868 ("mtd: nand: raw: allow to disable unneeded ECC layouts") Reviewed-by: Miquel Raynal <miquel.raynal@bootlin.com> Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com> --- Changelog: v1 -> v2 - Fix typos in the commit log - Improve wording as suggested by Miquel - Add Reviewed-by tag from Miquel drivers/mtd/nand/raw/nand_base.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)