Message ID | 546C8B7F.6030600@ti.com |
---|---|
State | Accepted |
Commit | 775a9134f4398ca98a10af8cc3cf9b664017267f |
Headers | show |
On Wed, Nov 19, 2014 at 02:22:23PM +0200, Roger Quadros wrote: > 3430LDP has NAND flash with 32 bytes OOB size which is sufficient to hold > BCH8 codes but the small page check introduced in > commit b491da7233d5 ("mtd: nand: omap: clean-up ecc layout for BCH ecc schemes") > considers anything below 64 bytes unsuitable for BCH4/8/16. There is another > bug in that code where it doesn't skip the check for OMAP_ECC_HAM1_CODE_SW. > > Get rid of that small page check code as it is insufficient and redundant > because we are checking for OOB available bytes vs ecc layout before calling > nand_scan_tail(). > > Fixes: b491da7233d5 ("mtd: nand: omap: clean-up ecc layout for BCH ecc schemes") > > Reported-by: Tony Lindgren <tony@atomide.com> > Signed-off-by: Roger Quadros <rogerq@ti.com> Applied to l2-mtd.git. Brian
diff --git a/drivers/mtd/nand/omap2.c b/drivers/mtd/nand/omap2.c index 3b357e9..10d07dd 100644 --- a/drivers/mtd/nand/omap2.c +++ b/drivers/mtd/nand/omap2.c @@ -1741,13 +1741,6 @@ static int omap_nand_probe(struct platform_device *pdev) goto return_error; } - /* check for small page devices */ - if ((mtd->oobsize < 64) && (pdata->ecc_opt != OMAP_ECC_HAM1_CODE_HW)) { - dev_err(&info->pdev->dev, "small page devices are not supported\n"); - err = -EINVAL; - goto return_error; - } - /* re-populate low-level callbacks based on xfer modes */ switch (pdata->xfer_type) { case NAND_OMAP_PREFETCH_POLLED:
3430LDP has NAND flash with 32 bytes OOB size which is sufficient to hold BCH8 codes but the small page check introduced in commit b491da7233d5 ("mtd: nand: omap: clean-up ecc layout for BCH ecc schemes") considers anything below 64 bytes unsuitable for BCH4/8/16. There is another bug in that code where it doesn't skip the check for OMAP_ECC_HAM1_CODE_SW. Get rid of that small page check code as it is insufficient and redundant because we are checking for OOB available bytes vs ecc layout before calling nand_scan_tail(). Fixes: b491da7233d5 ("mtd: nand: omap: clean-up ecc layout for BCH ecc schemes") Reported-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Roger Quadros <rogerq@ti.com> --- drivers/mtd/nand/omap2.c | 7 ------- 1 file changed, 7 deletions(-)