diff options
| author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2016-07-08 09:25:43 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2016-07-11 07:48:42 +0200 |
| commit | 034c16f54e8fbfb9d1688c5dda51a587a1f31dc7 (patch) | |
| tree | b3b3dffae8398dcfc143b263eb596d6ff7aa3ee9 /drivers/mtd | |
| parent | 9d7abf2792c5bb7d091f3f171a8e3a2fcaad1ea7 (diff) | |
| download | barebox-034c16f54e8fbfb9d1688c5dda51a587a1f31dc7.tar.gz barebox-034c16f54e8fbfb9d1688c5dda51a587a1f31dc7.tar.xz | |
mtd: nand: imx-bbm: use raw reading when checking for factory BBM
This is necessary to prevent the imx_nand_bbm command to bail out
on ECC errors which leaves the device without BBT.
Also simplify buffer management: Use on-stack buffer instead of malloc.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/mtd')
| -rw-r--r-- | drivers/mtd/nand/nand_imx_bbm.c | 33 |
1 files changed, 16 insertions, 17 deletions
diff --git a/drivers/mtd/nand/nand_imx_bbm.c b/drivers/mtd/nand/nand_imx_bbm.c index 251dfe5d3f..23722a9064 100644 --- a/drivers/mtd/nand/nand_imx_bbm.c +++ b/drivers/mtd/nand/nand_imx_bbm.c @@ -52,12 +52,20 @@ * on the flash BBT. * */ -static int checkbad(struct mtd_info *mtd, loff_t ofs, void *__buf) +static int checkbad(struct mtd_info *mtd, loff_t ofs) { - int ret, retlen; - uint8_t *buf = __buf; - - ret = mtd->read(mtd, ofs, mtd->writesize, &retlen, buf); + int ret; + uint8_t buf[mtd->writesize + mtd->oobsize]; + struct mtd_oob_ops ops; + + ops.mode = MTD_OPS_RAW; + ops.ooboffs = 0; + ops.datbuf = buf; + ops.len = mtd->writesize; + ops.oobbuf = buf + mtd->writesize; + ops.ooblen = mtd->oobsize; + + ret = mtd_read_oob(mtd, ofs, &ops); if (ret < 0) return ret; @@ -72,7 +80,6 @@ static void *create_bbt(struct mtd_info *mtd) struct nand_chip *chip = mtd->priv; int len, i, numblocks, ret; loff_t from = 0; - void *buf; uint8_t *bbt; if ((chip->bbt_td && chip->bbt_td->pages[0] != -1) || @@ -88,18 +95,12 @@ static void *create_bbt(struct mtd_info *mtd) if (!bbt) return ERR_PTR(-ENOMEM); - buf = malloc(mtd->writesize); - if (!buf) { - ret = -ENOMEM; - goto out2; - } - numblocks = mtd->size >> (chip->bbt_erase_shift - 1); for (i = 0; i < numblocks;) { - ret = checkbad(mtd, from, buf); + ret = checkbad(mtd, from); if (ret < 0) - goto out1; + goto out; if (ret) { bbt[i >> 3] |= 0x03 << (i & 0x6); @@ -113,9 +114,7 @@ static void *create_bbt(struct mtd_info *mtd) return bbt; -out1: - free(buf); -out2: +out: free(bbt); return ERR_PTR(ret); |