Commit 46a8cf2d authored by Sneha Narnakaje's avatar Sneha Narnakaje Committed by David Woodhouse
Browse files

mtd: nand: add "page" parameter to all read_page/read_page_raw APIs 



This patch adds a new "page" parameter to all NAND read_page/read_page_raw
APIs.  The read_page API for the new mode ECC_HW_OOB_FIRST requires the
page information to send the READOOB command and read the OOB area before
the data area.

Reviewed-by: default avatarDavid Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: default avatarSneha Narnakaje <nsnehaprabha@ti.com>
Signed-off-by: default avatarSandeep Paulraj <s-paulraj@ti.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent 778dbcc1

drivers/mtd/nand/atmel_nand.c

+1 −1
Original line number Diff line number Diff line
@@ -218,7 +218,7 @@ static int atmel_nand_calculate(struct mtd_info *mtd, 
 * buf:        buffer to store read data

 */

static int atmel_nand_read_page(struct mtd_info *mtd,

		struct nand_chip *chip, uint8_t *buf)

		struct nand_chip *chip, uint8_t *buf, int page)

{

	int eccsize = chip->ecc.size;

	int eccbytes = chip->ecc.bytes;

drivers/mtd/nand/cafe_nand.c

+1 −1
Original line number Diff line number Diff line
@@ -381,7 +381,7 @@ static int cafe_nand_read_oob(struct mtd_info *mtd, struct nand_chip *chip, 
 * we need a special oob layout and handling.

 */

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

			       uint8_t *buf)

			       uint8_t *buf, int page)

{

	struct cafe_priv *cafe = mtd->priv;

drivers/mtd/nand/fsl_elbc_nand.c

+2 −1
Original line number Diff line number Diff line
@@ -739,7 +739,8 @@ static int fsl_elbc_chip_init_tail(struct mtd_info *mtd) 


static int fsl_elbc_read_page(struct mtd_info *mtd,

                              struct nand_chip *chip,

                              uint8_t *buf)

			      uint8_t *buf,

			      int page)

{

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

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

drivers/mtd/nand/nand_base.c

+10 −8
Original line number Diff line number Diff line
@@ -765,7 +765,7 @@ static int nand_wait(struct mtd_info *mtd, struct nand_chip *chip) 
 * Not for syndrome calculating ecc controllers, which use a special oob layout

 */

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

			      uint8_t *buf)

			      uint8_t *buf, int page)

{

	chip->read_buf(mtd, buf, mtd->writesize);

	chip->read_buf(mtd, chip->oob_poi, mtd->oobsize);
@@ -781,7 +781,7 @@ static int nand_read_page_raw(struct mtd_info *mtd, struct nand_chip *chip, 
 * We need a special oob layout and handling even when OOB isn't used.

 */

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

			      uint8_t *buf)

			      uint8_t *buf, int page)

{

	int eccsize = chip->ecc.size;

	int eccbytes = chip->ecc.bytes;
@@ -820,7 +820,7 @@ static int nand_read_page_raw_syndrome(struct mtd_info *mtd, struct nand_chip *c 
 * @buf:	buffer to store read data

 */

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

				uint8_t *buf)

				uint8_t *buf, int page)

{

	int i, eccsize = chip->ecc.size;

	int eccbytes = chip->ecc.bytes;
@@ -830,7 +830,7 @@ static int nand_read_page_swecc(struct mtd_info *mtd, struct nand_chip *chip, 
	uint8_t *ecc_code = chip->buffers->ecccode;

	uint32_t *eccpos = chip->ecc.layout->eccpos;



	chip->ecc.read_page_raw(mtd, chip, buf);

	chip->ecc.read_page_raw(mtd, chip, buf, page);



	for (i = 0; eccsteps; eccsteps--, i += eccbytes, p += eccsize)

		chip->ecc.calculate(mtd, p, &ecc_calc[i]);
@@ -943,7 +943,7 @@ static int nand_read_subpage(struct mtd_info *mtd, struct nand_chip *chip, uint3 
 * Not for syndrome calculating ecc controllers which need a special oob layout

 */

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

				uint8_t *buf)

				uint8_t *buf, int page)

{

	int i, eccsize = chip->ecc.size;

	int eccbytes = chip->ecc.bytes;
@@ -988,7 +988,7 @@ static int nand_read_page_hwecc(struct mtd_info *mtd, struct nand_chip *chip, 
 * we need a special oob layout and handling.

 */

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

				   uint8_t *buf)

				   uint8_t *buf, int page)

{

	int i, eccsize = chip->ecc.size;

	int eccbytes = chip->ecc.bytes;
@@ -1130,11 +1130,13 @@ static int nand_do_read_ops(struct mtd_info *mtd, loff_t from, 


			/* Now read the page into the buffer */

			if (unlikely(ops->mode == MTD_OOB_RAW))

				ret = chip->ecc.read_page_raw(mtd, chip, bufpoi);

				ret = chip->ecc.read_page_raw(mtd, chip,

							      bufpoi, page);

			else if (!aligned && NAND_SUBPAGE_READ(chip) && !oob)

				ret = chip->ecc.read_subpage(mtd, chip, col, bytes, bufpoi);

			else

				ret = chip->ecc.read_page(mtd, chip, bufpoi);

				ret = chip->ecc.read_page(mtd, chip, bufpoi,

							  page);

			if (ret < 0)

				break;

drivers/mtd/nand/sh_flctl.c

+1 −1
Original line number Diff line number Diff line
@@ -329,7 +329,7 @@ static void set_cmd_regs(struct mtd_info *mtd, uint32_t cmd, uint32_t flcmcdr_va 
}



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

				uint8_t *buf)

				uint8_t *buf, int page)

{

	int i, eccsize = chip->ecc.size;

	int eccbytes = chip->ecc.bytes;

CRA Git | Maintained and supported by SUSTech CRA and CCSE