hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

mtd: nand: mxc: Fix mxc_v1 ooblayout 

Commit a894cf6c5a ("mtd: nand: mxc: switch to mtd_ooblayout_ops")
introduced a bug in the OOB layout description. Even if the driver claims
that 3 ECC bytes are reserved to protect 512 bytes of data, it's actually
5 ECC bytes to protect 512+6 bytes of data (some OOB bytes are also
protected using extra ECC bytes).

Fix the mxc_v1_ooblayout_{free,ecc}() functions to reflect this behavior.

Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Fixes: a894cf6c5a ("mtd: nand: mxc: switch to mtd_ooblayout_ops")
Cc: <stable@vger.kernel.org>
Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
This commit is contained in:
Boris Brezillon 2016-11-25 11:32:32 +01:00
parent fcf59f1ff5
commit 3bff08dffe
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/mtd/nand/mxc_nand.c
View File

@ -876,6 +876,8 @@ static void mxc_do_addr_cycle(struct mtd_info *mtd, int column, int page_addr)
} }
} }
#define MXC_V1_ECCBYTES 5
static int mxc_v1_ooblayout_ecc(struct mtd_info *mtd, int section, static int mxc_v1_ooblayout_ecc(struct mtd_info *mtd, int section,
struct mtd_oob_region *oobregion) struct mtd_oob_region *oobregion)
{ {
@ -885,7 +887,7 @@ static int mxc_v1_ooblayout_ecc(struct mtd_info *mtd, int section,
return -ERANGE; return -ERANGE;
oobregion->offset = (section * 16) + 6; oobregion->offset = (section * 16) + 6;
oobregion->length = nand_chip->ecc.bytes; oobregion->length = MXC_V1_ECCBYTES;
return 0; return 0;
} }
@ -907,8 +909,7 @@ static int mxc_v1_ooblayout_free(struct mtd_info *mtd, int section,
oobregion->length = 4; oobregion->length = 4;
} }
} else { } else {
oobregion->offset = ((section - 1) * 16) + oobregion->offset = ((section - 1) * 16) + MXC_V1_ECCBYTES + 6;
nand_chip->ecc.bytes + 6;
if (section < nand_chip->ecc.steps) if (section < nand_chip->ecc.steps)
oobregion->length = (section * 16) + 6 - oobregion->length = (section * 16) + 6 -
oobregion->offset; oobregion->offset;