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

Commit 45aaeff9 authored by Boris Brezillon's avatar Boris Brezillon Committed by Brian Norris
Browse files

mtd: nand: pass page number to ecc->write_xxx() methods 



The ->read_xxx() methods are all passed the page number the NAND controller
is supposed to read, but ->write_xxx() do not have such a parameter.

This is a problem if we want to properly implement data
scrambling/randomization in order to mitigate MLC sensibility to repeated
pattern: to prevent bitflips in adjacent pages in the same block we need
to avoid repeating the same pattern at the same offset in those pages,
hence the randomizer/scrambler engine need to be passed the page value
in order to adapt its seed accordingly.

Moreover, adding the page parameter to the ->write_xxx() methods add some
consistency to the current API.

Signed-off-by: default avatarBoris Brezillon <boris.brezillon@free-electrons.com>
CC: Josh Wu <josh.wu@atmel.com>
CC: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
CC: Maxime Ripard <maxime.ripard@free-electrons.com>
CC: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
CC: Huang Shijie <shijie.huang@arm.com>
CC: Stefan Agner <stefan@agner.ch>
CC: devel@driverdev.osuosl.org
CC: linux-arm-kernel@lists.infradead.org
CC: linux-kernel@vger.kernel.org
Signed-off-by: default avatarBrian Norris <computersforpeace@gmail.com>
parent 693ad872

drivers/mtd/nand/atmel_nand.c

+4 −2
Original line number Diff line number Diff line
@@ -954,7 +954,8 @@ static int atmel_nand_pmecc_read_page(struct mtd_info *mtd, 
}



static int atmel_nand_pmecc_write_page(struct mtd_info *mtd,

		struct nand_chip *chip, const uint8_t *buf, int oob_required)

		struct nand_chip *chip, const uint8_t *buf, int oob_required,

		int page)

{

	struct atmel_nand_host *host = chip->priv;

	uint32_t *eccpos = chip->ecc.layout->eccpos;
@@ -2005,7 +2006,8 @@ static int nfc_sram_write_page(struct mtd_info *mtd, struct nand_chip *chip, 


	if (likely(!raw))

		/* Need to write ecc into oob */

		status = chip->ecc.write_page(mtd, chip, buf, oob_required);

		status = chip->ecc.write_page(mtd, chip, buf, oob_required,

					      page);



	if (status < 0)

		return status;

drivers/mtd/nand/bf5xx_nand.c

+2 −1
Original line number Diff line number Diff line
@@ -566,7 +566,8 @@ static int bf5xx_nand_read_page_raw(struct mtd_info *mtd, struct nand_chip *chip 
}



static int bf5xx_nand_write_page_raw(struct mtd_info *mtd,

		struct nand_chip *chip,	const uint8_t *buf, int oob_required)

		struct nand_chip *chip,	const uint8_t *buf, int oob_required,

		int page)

{

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

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

drivers/mtd/nand/brcmnand/brcmnand.c

+2 −2
Original line number Diff line number Diff line
@@ -1606,7 +1606,7 @@ static int brcmnand_write(struct mtd_info *mtd, struct nand_chip *chip, 
}



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

			       const uint8_t *buf, int oob_required)

			       const uint8_t *buf, int oob_required, int page)

{

	struct brcmnand_host *host = chip->priv;

	void *oob = oob_required ? chip->oob_poi : NULL;
@@ -1617,7 +1617,7 @@ static int brcmnand_write_page(struct mtd_info *mtd, struct nand_chip *chip, 


static int brcmnand_write_page_raw(struct mtd_info *mtd,

				   struct nand_chip *chip, const uint8_t *buf,

				   int oob_required)

				   int oob_required, int page)

{

	struct brcmnand_host *host = chip->priv;

	void *oob = oob_required ? chip->oob_poi : NULL;

drivers/mtd/nand/cafe_nand.c

+2 −1
Original line number Diff line number Diff line
@@ -516,7 +516,8 @@ static struct nand_bbt_descr cafe_bbt_mirror_descr_512 = { 


static int cafe_nand_write_page_lowlevel(struct mtd_info *mtd,

					  struct nand_chip *chip,

					  const uint8_t *buf, int oob_required)

					  const uint8_t *buf, int oob_required,

					  int page)

{

	struct cafe_priv *cafe = mtd->priv;

drivers/mtd/nand/denali.c

+3 −2
Original line number Diff line number Diff line
@@ -1114,7 +1114,7 @@ static int write_page(struct mtd_info *mtd, struct nand_chip *chip, 
 * by write_page above.

 */

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

				const uint8_t *buf, int oob_required)

				const uint8_t *buf, int oob_required, int page)

{

	/*

	 * for regular page writes, we let HW handle all the ECC
@@ -1129,7 +1129,8 @@ static int denali_write_page(struct mtd_info *mtd, struct nand_chip *chip, 
 * write_page() function above.

 */

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

					const uint8_t *buf, int oob_required)

				 const uint8_t *buf, int oob_required,

				 int page)

{

	/*

	 * for raw page writes, we want to disable ECC and simply write