diff options
| author | Boris BREZILLON <boris.brezillon@free-electrons.com> | 2015-09-30 23:45:27 +0200 |
|---|---|---|
| committer | Brian Norris <computersforpeace@gmail.com> | 2015-10-02 11:09:51 -0700 |
| commit | f363e0faa8bd5adb00739086db75713c669b4d9e (patch) | |
| tree | c72618cf71cb9e1f8a53187aad631530395ebf07 /drivers/mtd | |
| parent | 35d0e24f09d00e27eae3484784feee24effc23c5 (diff) | |
mtd: nand: sunxi: retrieve corrected OOB bytes
The ECC engine is protecting a few OOB bytes. Retrieve them from the
USER_DATA register instead of reading them in raw mode (ie without the ECC
protection).
Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Diffstat (limited to 'drivers/mtd')
| -rw-r--r-- | drivers/mtd/nand/sunxi_nand.c | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/drivers/mtd/nand/sunxi_nand.c b/drivers/mtd/nand/sunxi_nand.c index 45b74fc8204a..a9061a0372e3 100644 --- a/drivers/mtd/nand/sunxi_nand.c +++ b/drivers/mtd/nand/sunxi_nand.c @@ -567,6 +567,14 @@ static void sunxi_nfc_hw_ecc_disable(struct mtd_info *mtd) nfc->regs + NFC_REG_ECC_CTL); } +static inline void sunxi_nfc_user_data_to_buf(u32 user_data, u8 *buf) +{ + buf[0] = user_data; + buf[1] = user_data >> 8; + buf[2] = user_data >> 16; + buf[3] = user_data >> 24; +} + static int sunxi_nfc_hw_ecc_read_chunk(struct mtd_info *mtd, u8 *data, int data_off, u8 *oob, int oob_off, @@ -606,8 +614,16 @@ static int sunxi_nfc_hw_ecc_read_chunk(struct mtd_info *mtd, nand->cmdfunc(mtd, NAND_CMD_RNDOUT, oob_off, -1); sunxi_nfc_read_buf(mtd, oob, ecc->bytes + 4); - if (status & NFC_ECC_ERR(0)) + if (status & NFC_ECC_ERR(0)) { ret = -EIO; + } else { + /* + * The engine protects 4 bytes of OOB data per chunk. + * Retrieve the corrected OOB bytes. + */ + sunxi_nfc_user_data_to_buf(readl(nfc->regs + NFC_REG_USER_DATA(0)), + oob); + } if (ret < 0) { mtd->ecc_stats.failed++; |