mtd: nand: omap: ecc.hwctl: refactor omap_enable_hwecc_bch for ECC related GPMC configs
Lots of if..then..else conditions in omap_enable_hwecc_bch() can be avoided if code is refactored based on ecc-scheme. Signed-off-by: Pekon Gupta <pekon@ti.com> Signed-off-by: Brian Norris <computersforpeace@gmail.com>
This commit is contained in:
parent
7c977c3eb2
commit
c5957a3201
@ -1057,20 +1057,11 @@ static void __maybe_unused omap_enable_hwecc_bch(struct mtd_info *mtd, int mode)
|
|||||||
unsigned int dev_width, nsectors;
|
unsigned int dev_width, nsectors;
|
||||||
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);
|
||||||
|
enum omap_ecc ecc_opt = info->ecc_opt;
|
||||||
struct nand_chip *chip = mtd->priv;
|
struct nand_chip *chip = mtd->priv;
|
||||||
u32 val, wr_mode;
|
u32 val, wr_mode;
|
||||||
unsigned int ecc_size1, ecc_size0;
|
unsigned int ecc_size1, ecc_size0;
|
||||||
|
|
||||||
/* Using wrapping mode 6 for writing */
|
|
||||||
wr_mode = BCH_WRAPMODE_6;
|
|
||||||
|
|
||||||
/*
|
|
||||||
* ECC engine enabled for valid ecc_size0 nibbles
|
|
||||||
* and disabled for ecc_size1 nibbles.
|
|
||||||
*/
|
|
||||||
ecc_size0 = BCH_ECC_SIZE0;
|
|
||||||
ecc_size1 = BCH_ECC_SIZE1;
|
|
||||||
|
|
||||||
/* Perform ecc calculation on 512-byte sector */
|
/* Perform ecc calculation on 512-byte sector */
|
||||||
nsectors = 1;
|
nsectors = 1;
|
||||||
|
|
||||||
@ -1079,23 +1070,58 @@ static void __maybe_unused omap_enable_hwecc_bch(struct mtd_info *mtd, int mode)
|
|||||||
|
|
||||||
/* Multi sector reading/writing for NAND flash with page size < 4096 */
|
/* Multi sector reading/writing for NAND flash with page size < 4096 */
|
||||||
if (info->is_elm_used && (mtd->writesize <= 4096)) {
|
if (info->is_elm_used && (mtd->writesize <= 4096)) {
|
||||||
if (mode == NAND_ECC_READ) {
|
|
||||||
/* Using wrapping mode 1 for reading */
|
|
||||||
wr_mode = BCH_WRAPMODE_1;
|
|
||||||
|
|
||||||
/*
|
|
||||||
* ECC engine enabled for ecc_size0 nibbles
|
|
||||||
* and disabled for ecc_size1 nibbles.
|
|
||||||
*/
|
|
||||||
ecc_size0 = (nerrors == 8) ?
|
|
||||||
BCH8R_ECC_SIZE0 : BCH4R_ECC_SIZE0;
|
|
||||||
ecc_size1 = (nerrors == 8) ?
|
|
||||||
BCH8R_ECC_SIZE1 : BCH4R_ECC_SIZE1;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Perform ecc calculation for one page (< 4096) */
|
/* Perform ecc calculation for one page (< 4096) */
|
||||||
nsectors = info->nand.ecc.steps;
|
nsectors = info->nand.ecc.steps;
|
||||||
}
|
}
|
||||||
|
/* GPMC configurations for calculating ECC */
|
||||||
|
switch (ecc_opt) {
|
||||||
|
case OMAP_ECC_BCH4_CODE_HW_DETECTION_SW:
|
||||||
|
if (mode == NAND_ECC_READ) {
|
||||||
|
wr_mode = BCH_WRAPMODE_6;
|
||||||
|
ecc_size0 = BCH_ECC_SIZE0;
|
||||||
|
ecc_size1 = BCH_ECC_SIZE1;
|
||||||
|
} else {
|
||||||
|
wr_mode = BCH_WRAPMODE_6;
|
||||||
|
ecc_size0 = BCH_ECC_SIZE0;
|
||||||
|
ecc_size1 = BCH_ECC_SIZE1;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case OMAP_ECC_BCH4_CODE_HW:
|
||||||
|
if (mode == NAND_ECC_READ) {
|
||||||
|
wr_mode = BCH_WRAPMODE_1;
|
||||||
|
ecc_size0 = BCH4R_ECC_SIZE0;
|
||||||
|
ecc_size1 = BCH4R_ECC_SIZE1;
|
||||||
|
} else {
|
||||||
|
wr_mode = BCH_WRAPMODE_6;
|
||||||
|
ecc_size0 = BCH_ECC_SIZE0;
|
||||||
|
ecc_size1 = BCH_ECC_SIZE1;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case OMAP_ECC_BCH8_CODE_HW_DETECTION_SW:
|
||||||
|
if (mode == NAND_ECC_READ) {
|
||||||
|
wr_mode = BCH_WRAPMODE_6;
|
||||||
|
ecc_size0 = BCH_ECC_SIZE0;
|
||||||
|
ecc_size1 = BCH_ECC_SIZE1;
|
||||||
|
} else {
|
||||||
|
wr_mode = BCH_WRAPMODE_6;
|
||||||
|
ecc_size0 = BCH_ECC_SIZE0;
|
||||||
|
ecc_size1 = BCH_ECC_SIZE1;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case OMAP_ECC_BCH8_CODE_HW:
|
||||||
|
if (mode == NAND_ECC_READ) {
|
||||||
|
wr_mode = BCH_WRAPMODE_1;
|
||||||
|
ecc_size0 = BCH8R_ECC_SIZE0;
|
||||||
|
ecc_size1 = BCH8R_ECC_SIZE1;
|
||||||
|
} else {
|
||||||
|
wr_mode = BCH_WRAPMODE_6;
|
||||||
|
ecc_size0 = BCH_ECC_SIZE0;
|
||||||
|
ecc_size1 = BCH_ECC_SIZE1;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
writel(ECC1, info->reg.gpmc_ecc_control);
|
writel(ECC1, info->reg.gpmc_ecc_control);
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user