Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f034d87d authored by Pekon Gupta's avatar Pekon Gupta Committed by Brian Norris
Browse files

mtd: eLBC NAND: fix subpage write support 



As subpage write is enabled by default for all drivers, nand_write_subpage_hwecc
causes a crash if the driver did not register ecc->hwctl or ecc->calculate.
This behavior was introduced in
   commit 837a6ba4
   "mtd: nand: subpage write support for hardware based ECC schemes".

This fixes a crash by emulating subpage write support by padding sub-page data
with 0xff on either sides to make it full page compatible.

Reported-by: default avatarHelmut Schaa <helmut.schaa@googlemail.com>
Tested-by: default avatarHelmut Schaa <helmut.schaa@googlemail.com>
Signed-off-by: default avatarPekon Gupta <pekon@ti.com>
Reviewed-by: default avatarScott Wood <scottwood@freescale.com>
Cc: <stable@vger.kernel.org> # 3.10.x+
Signed-off-by: default avatarBrian Norris <computersforpeace@gmail.com>
parent 81d46c59

drivers/mtd/nand/fsl_elbc_nand.c

+14 −0
Original line number Diff line number Diff line
@@ -723,6 +723,19 @@ static int fsl_elbc_write_page(struct mtd_info *mtd, struct nand_chip *chip, 
	return 0;

}



/* ECC will be calculated automatically, and errors will be detected in

 * waitfunc.

 */

static int fsl_elbc_write_subpage(struct mtd_info *mtd, struct nand_chip *chip,

				uint32_t offset, uint32_t data_len,

				const uint8_t *buf, int oob_required)

{

	fsl_elbc_write_buf(mtd, buf, mtd->writesize);

	fsl_elbc_write_buf(mtd, chip->oob_poi, mtd->oobsize);



	return 0;

}



static int fsl_elbc_chip_init(struct fsl_elbc_mtd *priv)

{

	struct fsl_lbc_ctrl *ctrl = priv->ctrl;
@@ -761,6 +774,7 @@ static int fsl_elbc_chip_init(struct fsl_elbc_mtd *priv) 


	chip->ecc.read_page = fsl_elbc_read_page;

	chip->ecc.write_page = fsl_elbc_write_page;

	chip->ecc.write_subpage = fsl_elbc_write_subpage;



	/* If CS Base Register selects full hardware ECC then use it */

	if ((in_be32(&lbc->bank[priv->bank].br) & BR_DECC) ==