From 4f28237a750afd1112b6f1266d36f8b718efe89c Mon Sep 17 00:00:00 2001
From: Xiangfu Liu <xiangfu@sharism.cc>
Date: Tue, 6 Mar 2012 11:19:26 +0800
Subject: [PATCH 05/21] NAND-Optimize-reading-the-eec-data-for-the-JZ4740

---
 drivers/mtd/nand/nand_base.c |   14 ++++----------
 1 files changed, 4 insertions(+), 10 deletions(-)

--- a/drivers/mtd/nand/nand_base.c
+++ b/drivers/mtd/nand/nand_base.c
@@ -1295,8 +1295,8 @@ static int nand_read_page_hwecc_oob_firs
 
 	/* Read the OOB area first */
 	if (mtd->writesize > 512) {
-		chip->cmdfunc(mtd, NAND_CMD_READ0, mtd->writesize, page);
-		chip->read_buf(mtd, chip->oob_poi, mtd->oobsize);
+		chip->cmdfunc(mtd, NAND_CMD_READ0, mtd->writesize + eccpos[0], page);
+		chip->read_buf(mtd, ecc_code, chip->ecc.total);
 		chip->cmdfunc(mtd, NAND_CMD_RNDOUT, 0, -1);
 	} else {
 		chip->cmdfunc(mtd, NAND_CMD_READOOB, 0, page);
@@ -1304,9 +1304,6 @@ static int nand_read_page_hwecc_oob_firs
 		chip->cmdfunc(mtd, NAND_CMD_READ0, 0, page);
 	}
 
-	for (i = 0; i < chip->ecc.total; i++)
-		ecc_code[i] = chip->oob_poi[eccpos[i]];
-
 	for (i = 0; eccsteps; eccsteps--, i += eccbytes, p += eccsize) {
 		int stat;
 
@@ -1361,8 +1358,8 @@ static int nand_read_subpage_hwecc_oob_f
 
 	/* Read the OOB area first */
 	if (mtd->writesize > 512) {
-		chip->cmdfunc(mtd, NAND_CMD_READ0, mtd->writesize, page);
-		chip->read_buf(mtd, chip->oob_poi, mtd->oobsize);
+		chip->cmdfunc(mtd, NAND_CMD_READ0, mtd->writesize + eccpos[0], page);
+		chip->read_buf(mtd, ecc_code, chip->ecc.total);
 		chip->cmdfunc(mtd, NAND_CMD_RNDOUT, data_col_addr, -1);
 	} else {
 		chip->cmdfunc(mtd, NAND_CMD_READOOB, 0, page);
@@ -1370,9 +1367,6 @@ static int nand_read_subpage_hwecc_oob_f
 		chip->cmdfunc(mtd, NAND_CMD_READ0, data_col_addr, page);
 	}
 
-	for (i = 0; i < chip->ecc.total; i++)
-		ecc_code[i] = chip->oob_poi[eccpos[i]];
-
 	p = bufpoi + data_col_addr;
 
 	for (i = eccbytes * start_step; num_steps; num_steps--, i += eccbytes, p += eccsize) {
