leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mtd: nand: atmel: use mtd_ooblayout_xxx() helpers where appropriate

Browse Source 
The mtd_ooblayout_xxx() helper functions have been added to avoid direct
accesses to the ecclayout field, and thus ease for future reworks.
Use these helpers in all places where the oobfree[] and eccpos[] arrays
where directly accessed.

Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Reviewed-by: Nicolas Ferre <nicolas.ferre@atmel.com>
This commit is contained in:
Boris Brezillon 2016-02-03 20:11:14 +01:00
parent 846031d3e1
commit 78d28e8ec4
1 changed files with 31 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
drivers/mtd/nand/atmel_nand.c
View File

@ -833,13 +833,16 @@ static void pmecc_correct_data(struct mtd_info *mtd, uint8_t *buf, uint8_t *ecc,
dev_dbg(host->dev, "Bit flip in data area, byte_pos: %d, bit_pos: %d, 0x%02x -> 0x%02x\n", dev_dbg(host->dev, "Bit flip in data area, byte_pos: %d, bit_pos: %d, 0x%02x -> 0x%02x\n",
pos, bit_pos, err_byte, *(buf + byte_pos)); pos, bit_pos, err_byte, *(buf + byte_pos));
} else { } else {
struct mtd_oob_region oobregion;
/* Bit flip in OOB area */ /* Bit flip in OOB area */
tmp = sector_num * nand_chip->ecc.bytes tmp = sector_num * nand_chip->ecc.bytes
+ (byte_pos - sector_size); + (byte_pos - sector_size);
err_byte = ecc[tmp]; err_byte = ecc[tmp];
ecc[tmp] ^= (1 << bit_pos); ecc[tmp] ^= (1 << bit_pos);
pos = tmp + nand_chip->ecc.layout->eccpos[0]; mtd_ooblayout_ecc(mtd, 0, &oobregion);
pos = tmp + oobregion.offset;
dev_dbg(host->dev, "Bit flip in OOB, oob_byte_pos: %d, bit_pos: %d, 0x%02x -> 0x%02x\n", dev_dbg(host->dev, "Bit flip in OOB, oob_byte_pos: %d, bit_pos: %d, 0x%02x -> 0x%02x\n",
pos, bit_pos, err_byte, ecc[tmp]); pos, bit_pos, err_byte, ecc[tmp]);
} }
@ -931,7 +934,6 @@ static int atmel_nand_pmecc_read_page(struct mtd_info *mtd,
struct atmel_nand_host *host = nand_get_controller_data(chip); struct atmel_nand_host *host = nand_get_controller_data(chip);
int eccsize = chip->ecc.size * chip->ecc.steps; int eccsize = chip->ecc.size * chip->ecc.steps;
uint8_t *oob = chip->oob_poi; uint8_t *oob = chip->oob_poi;
uint32_t *eccpos = chip->ecc.layout->eccpos;
uint32_t stat; uint32_t stat;
unsigned long end_time; unsigned long end_time;
int bitflips = 0; int bitflips = 0;
@ -953,7 +955,11 @@ static int atmel_nand_pmecc_read_page(struct mtd_info *mtd,
stat = pmecc_readl_relaxed(host->ecc, ISR); stat = pmecc_readl_relaxed(host->ecc, ISR);
if (stat != 0) { if (stat != 0) {
bitflips = pmecc_correction(mtd, stat, buf, &oob[eccpos[0]]); struct mtd_oob_region oobregion;
mtd_ooblayout_ecc(mtd, 0, &oobregion);
bitflips = pmecc_correction(mtd, stat, buf,
&oob[oobregion.offset]);
if (bitflips < 0) if (bitflips < 0)
/* uncorrectable errors */ /* uncorrectable errors */
return 0; return 0;
@ -967,8 +973,8 @@ static int atmel_nand_pmecc_write_page(struct mtd_info *mtd,
int page) int page)
{ {
struct atmel_nand_host *host = nand_get_controller_data(chip); struct atmel_nand_host *host = nand_get_controller_data(chip);
uint32_t *eccpos = chip->ecc.layout->eccpos; struct mtd_oob_region oobregion = { };
int i, j; int i, j, section = 0;
unsigned long end_time; unsigned long end_time;
if (!host->nfc || !host->nfc->write_by_sram) { if (!host->nfc || !host->nfc->write_by_sram) {
@ -987,11 +993,14 @@ static int atmel_nand_pmecc_write_page(struct mtd_info *mtd,
for (i = 0; i < chip->ecc.steps; i++) { for (i = 0; i < chip->ecc.steps; i++) {
for (j = 0; j < chip->ecc.bytes; j++) { for (j = 0; j < chip->ecc.bytes; j++) {
int pos; if (!oobregion.length)
mtd_ooblayout_ecc(mtd, section, &oobregion);
pos = i * chip->ecc.bytes + j; chip->oob_poi[oobregion.offset] =
chip->oob_poi[eccpos[pos]] =
pmecc_readb_ecc_relaxed(host->ecc, i, j); pmecc_readb_ecc_relaxed(host->ecc, i, j);
oobregion.length--;
oobregion.offset++;
section++;
} }
} }
chip->write_buf(mtd, chip->oob_poi, mtd->oobsize); chip->write_buf(mtd, chip->oob_poi, mtd->oobsize);
@ -1005,6 +1014,7 @@ static void atmel_pmecc_core_init(struct mtd_info *mtd)
struct atmel_nand_host *host = nand_get_controller_data(nand_chip); struct atmel_nand_host *host = nand_get_controller_data(nand_chip);
uint32_t val = 0; uint32_t val = 0;
struct nand_ecclayout *ecc_layout; struct nand_ecclayout *ecc_layout;
struct mtd_oob_region oobregion;
pmecc_writel(host->ecc, CTRL, PMECC_CTRL_RST); pmecc_writel(host->ecc, CTRL, PMECC_CTRL_RST);
pmecc_writel(host->ecc, CTRL, PMECC_CTRL_DISABLE); pmecc_writel(host->ecc, CTRL, PMECC_CTRL_DISABLE);
@ -1056,9 +1066,10 @@ static void atmel_pmecc_core_init(struct mtd_info *mtd)
ecc_layout = nand_chip->ecc.layout; ecc_layout = nand_chip->ecc.layout;
pmecc_writel(host->ecc, SAREA, mtd->oobsize - 1); pmecc_writel(host->ecc, SAREA, mtd->oobsize - 1);
pmecc_writel(host->ecc, SADDR, ecc_layout->eccpos[0]); mtd_ooblayout_ecc(mtd, 0, &oobregion);
pmecc_writel(host->ecc, SADDR, oobregion.offset);
pmecc_writel(host->ecc, EADDR, pmecc_writel(host->ecc, EADDR,
ecc_layout->eccpos[ecc_layout->eccbytes - 1]); oobregion.offset + ecc_layout->eccbytes - 1);
/* See datasheet about PMECC Clock Control Register */ /* See datasheet about PMECC Clock Control Register */
pmecc_writel(host->ecc, CLK, 2); pmecc_writel(host->ecc, CLK, 2);
pmecc_writel(host->ecc, IDR, 0xff); pmecc_writel(host->ecc, IDR, 0xff);
@ -1359,12 +1370,12 @@ static int atmel_nand_read_page(struct mtd_info *mtd, struct nand_chip *chip,
{ {
int eccsize = chip->ecc.size; int eccsize = chip->ecc.size;
int eccbytes = chip->ecc.bytes; int eccbytes = chip->ecc.bytes;
uint32_t *eccpos = chip->ecc.layout->eccpos;
uint8_t *p = buf; uint8_t *p = buf;
uint8_t *oob = chip->oob_poi; uint8_t *oob = chip->oob_poi;
uint8_t *ecc_pos; uint8_t *ecc_pos;
int stat; int stat;
unsigned int max_bitflips = 0; unsigned int max_bitflips = 0;
struct mtd_oob_region oobregion = {};
/* /*
* Errata: ALE is incorrectly wired up to the ECC controller * Errata: ALE is incorrectly wired up to the ECC controller
@ -1382,19 +1393,20 @@ static int atmel_nand_read_page(struct mtd_info *mtd, struct nand_chip *chip,
chip->read_buf(mtd, p, eccsize); chip->read_buf(mtd, p, eccsize);
/* move to ECC position if needed */ /* move to ECC position if needed */
if (eccpos[0] != 0) { mtd_ooblayout_ecc(mtd, 0, &oobregion);
/* This only works on large pages if (oobregion.offset != 0) {
* because the ECC controller waits for /*
* NAND_CMD_RNDOUTSTART after the * This only works on large pages because the ECC controller
* NAND_CMD_RNDOUT. * waits for NAND_CMD_RNDOUTSTART after the NAND_CMD_RNDOUT.
* anyway, for small pages, the eccpos[0] == 0 * Anyway, for small pages, the first ECC byte is at offset
* 0 in the OOB area.
*/ */
chip->cmdfunc(mtd, NAND_CMD_RNDOUT, chip->cmdfunc(mtd, NAND_CMD_RNDOUT,
mtd->writesize + eccpos[0], -1); mtd->writesize + oobregion.offset, -1);
} }
/* the ECC controller needs to read the ECC just after the data */ /* the ECC controller needs to read the ECC just after the data */
ecc_pos = oob + eccpos[0]; ecc_pos = oob + oobregion.offset;
chip->read_buf(mtd, ecc_pos, eccbytes); chip->read_buf(mtd, ecc_pos, eccbytes);
/* check if there's an error */ /* check if there's an error */