Commit e7049f29 authored by Boris Brezillon's avatar Boris Brezillon

mtd: nand: sh_flctl: switch to mtd_ooblayout_ops

Implementing the mtd_ooblayout_ops interface is the new way of exposing
ECC/OOB layout to MTD users.
Signed-off-by: default avatarBoris Brezillon <boris.brezillon@free-electrons.com>
parent bf01e06b
...@@ -43,26 +43,73 @@ ...@@ -43,26 +43,73 @@
#include <linux/mtd/partitions.h> #include <linux/mtd/partitions.h>
#include <linux/mtd/sh_flctl.h> #include <linux/mtd/sh_flctl.h>
static struct nand_ecclayout flctl_4secc_oob_16 = { static int flctl_4secc_ooblayout_sp_ecc(struct mtd_info *mtd, int section,
.eccbytes = 10, struct mtd_oob_region *oobregion)
.eccpos = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9}, {
.oobfree = { struct nand_chip *chip = mtd_to_nand(mtd);
{.offset = 12,
. length = 4} }, if (section)
return -ERANGE;
oobregion->offset = 0;
oobregion->length = chip->ecc.bytes;
return 0;
}
static int flctl_4secc_ooblayout_sp_free(struct mtd_info *mtd, int section,
struct mtd_oob_region *oobregion)
{
if (section)
return -ERANGE;
oobregion->offset = 12;
oobregion->length = 4;
return 0;
}
static const struct mtd_ooblayout_ops flctl_4secc_oob_smallpage_ops = {
.ecc = flctl_4secc_ooblayout_sp_ecc,
.free = flctl_4secc_ooblayout_sp_free,
}; };
static struct nand_ecclayout flctl_4secc_oob_64 = { static int flctl_4secc_ooblayout_lp_ecc(struct mtd_info *mtd, int section,
.eccbytes = 4 * 10, struct mtd_oob_region *oobregion)
.eccpos = { {
6, 7, 8, 9, 10, 11, 12, 13, 14, 15, struct nand_chip *chip = mtd_to_nand(mtd);
22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
38, 39, 40, 41, 42, 43, 44, 45, 46, 47, if (section >= chip->ecc.steps)
54, 55, 56, 57, 58, 59, 60, 61, 62, 63 }, return -ERANGE;
.oobfree = {
{.offset = 2, .length = 4}, oobregion->offset = (section * 16) + 6;
{.offset = 16, .length = 6}, oobregion->length = chip->ecc.bytes;
{.offset = 32, .length = 6},
{.offset = 48, .length = 6} }, return 0;
}
static int flctl_4secc_ooblayout_lp_free(struct mtd_info *mtd, int section,
struct mtd_oob_region *oobregion)
{
struct nand_chip *chip = mtd_to_nand(mtd);
if (section >= chip->ecc.steps)
return -ERANGE;
oobregion->offset = section * 16;
oobregion->length = 6;
if (!section) {
oobregion->offset += 2;
oobregion->length -= 2;
}
return 0;
}
static const struct mtd_ooblayout_ops flctl_4secc_oob_largepage_ops = {
.ecc = flctl_4secc_ooblayout_lp_ecc,
.free = flctl_4secc_ooblayout_lp_free,
}; };
static uint8_t scan_ff_pattern[] = { 0xff, 0xff }; static uint8_t scan_ff_pattern[] = { 0xff, 0xff };
...@@ -987,10 +1034,10 @@ static int flctl_chip_init_tail(struct mtd_info *mtd) ...@@ -987,10 +1034,10 @@ static int flctl_chip_init_tail(struct mtd_info *mtd)
if (flctl->hwecc) { if (flctl->hwecc) {
if (mtd->writesize == 512) { if (mtd->writesize == 512) {
chip->ecc.layout = &flctl_4secc_oob_16; mtd_set_ooblayout(mtd, &flctl_4secc_oob_smallpage_ops);
chip->badblock_pattern = &flctl_4secc_smallpage; chip->badblock_pattern = &flctl_4secc_smallpage;
} else { } else {
chip->ecc.layout = &flctl_4secc_oob_64; mtd_set_ooblayout(mtd, &flctl_4secc_oob_largepage_ops);
chip->badblock_pattern = &flctl_4secc_largepage; chip->badblock_pattern = &flctl_4secc_largepage;
} }
......
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