Commit c3e4b995 authored by Philip Avinash's avatar Philip Avinash Committed by Artem Bityutskiy

mtd: nand: omap2: Update nerrors using ecc.strength

Remove check of ecc bytes with 13, number of errors can directly update
from nand ecc strength. This will increase re-usability of the code.
Also add macro definitions BCH8_ERROR_MAX & BCH4_ERROR_MAX for better
readability and cleaner code.
Signed-off-by: default avatarPhilip Avinash <avinashphilip@ti.com>
Signed-off-by: default avatarArtem Bityutskiy <artem.bityutskiy@linux.intel.com>
parent a8459f21
...@@ -117,6 +117,9 @@ ...@@ -117,6 +117,9 @@
#define OMAP24XX_DMA_GPMC 4 #define OMAP24XX_DMA_GPMC 4
#define BCH8_MAX_ERROR 8 /* upto 8 bit correctable */
#define BCH4_MAX_ERROR 4 /* upto 4 bit correctable */
/* oob info generated runtime depending on ecc algorithm and layout selected */ /* oob info generated runtime depending on ecc algorithm and layout selected */
static struct nand_ecclayout omap_oobinfo; static struct nand_ecclayout omap_oobinfo;
/* Define some generic bad / good block scan pattern which are used /* Define some generic bad / good block scan pattern which are used
...@@ -1041,7 +1044,7 @@ static void omap3_enable_hwecc_bch(struct mtd_info *mtd, int mode) ...@@ -1041,7 +1044,7 @@ static void omap3_enable_hwecc_bch(struct mtd_info *mtd, int mode)
struct nand_chip *chip = mtd->priv; struct nand_chip *chip = mtd->priv;
u32 val; u32 val;
nerrors = (info->nand.ecc.bytes == 13) ? 8 : 4; nerrors = info->nand.ecc.strength;
dev_width = (chip->options & NAND_BUSWIDTH_16) ? 1 : 0; dev_width = (chip->options & NAND_BUSWIDTH_16) ? 1 : 0;
nsectors = 1; nsectors = 1;
/* /*
...@@ -1218,13 +1221,14 @@ static int omap3_init_bch(struct mtd_info *mtd, int ecc_opt) ...@@ -1218,13 +1221,14 @@ static int omap3_init_bch(struct mtd_info *mtd, int ecc_opt)
struct omap_nand_info *info = container_of(mtd, struct omap_nand_info, struct omap_nand_info *info = container_of(mtd, struct omap_nand_info,
mtd); mtd);
#ifdef CONFIG_MTD_NAND_OMAP_BCH8 #ifdef CONFIG_MTD_NAND_OMAP_BCH8
const int hw_errors = 8; const int hw_errors = BCH8_MAX_ERROR;
#else #else
const int hw_errors = 4; const int hw_errors = BCH4_MAX_ERROR;
#endif #endif
info->bch = NULL; info->bch = NULL;
max_errors = (ecc_opt == OMAP_ECC_BCH8_CODE_HW) ? 8 : 4; max_errors = (ecc_opt == OMAP_ECC_BCH8_CODE_HW) ?
BCH8_MAX_ERROR : BCH4_MAX_ERROR;
if (max_errors != hw_errors) { if (max_errors != hw_errors) {
pr_err("cannot configure %d-bit BCH ecc, only %d-bit supported", pr_err("cannot configure %d-bit BCH ecc, only %d-bit supported",
max_errors, hw_errors); max_errors, hw_errors);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment