| 1 | From 5fa159fe903240a78136ba90bfefc91d899fcfe3 Mon Sep 17 00:00:00 2001 |
| 2 | From: Xiangfu Liu <xiangfu@macbook.(none)> |
| 3 | Date: Fri, 19 Aug 2011 15:46:14 +0800 |
| 4 | Subject: [PATCH 21/32] 904-NAND-Optimize-reading-the-eec-data-for-the-JZ4740-ev.patch |
| 5 | |
| 6 | --- |
| 7 | drivers/mtd/nand/nand_base.c | 14 ++++---------- |
| 8 | 1 files changed, 4 insertions(+), 10 deletions(-) |
| 9 | |
| 10 | diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c |
| 11 | index f1214af..37c0cfb 100644 |
| 12 | --- a/drivers/mtd/nand/nand_base.c |
| 13 | +++ b/drivers/mtd/nand/nand_base.c |
| 14 | @@ -1306,8 +1306,8 @@ static int nand_read_page_hwecc_oob_first(struct mtd_info *mtd, |
| 15 | |
| 16 | /* Read the OOB area first */ |
| 17 | if (mtd->writesize > 512) { |
| 18 | - chip->cmdfunc(mtd, NAND_CMD_READ0, mtd->writesize, page); |
| 19 | - chip->read_buf(mtd, chip->oob_poi, mtd->oobsize); |
| 20 | + chip->cmdfunc(mtd, NAND_CMD_READ0, mtd->writesize + eccpos[0], page); |
| 21 | + chip->read_buf(mtd, ecc_code, chip->ecc.total); |
| 22 | chip->cmdfunc(mtd, NAND_CMD_RNDOUT, 0, -1); |
| 23 | } else { |
| 24 | chip->cmdfunc(mtd, NAND_CMD_READOOB, 0, page); |
| 25 | @@ -1315,9 +1315,6 @@ static int nand_read_page_hwecc_oob_first(struct mtd_info *mtd, |
| 26 | chip->cmdfunc(mtd, NAND_CMD_READ0, 0, page); |
| 27 | } |
| 28 | |
| 29 | - for (i = 0; i < chip->ecc.total; i++) |
| 30 | - ecc_code[i] = chip->oob_poi[eccpos[i]]; |
| 31 | - |
| 32 | for (i = 0; eccsteps; eccsteps--, i += eccbytes, p += eccsize) { |
| 33 | int stat; |
| 34 | |
| 35 | @@ -1372,8 +1369,8 @@ static int nand_read_subpage_hwecc_oob_first(struct mtd_info *mtd, struct nand_c |
| 36 | |
| 37 | /* Read the OOB area first */ |
| 38 | if (mtd->writesize > 512) { |
| 39 | - chip->cmdfunc(mtd, NAND_CMD_READ0, mtd->writesize, page); |
| 40 | - chip->read_buf(mtd, chip->oob_poi, mtd->oobsize); |
| 41 | + chip->cmdfunc(mtd, NAND_CMD_READ0, mtd->writesize + eccpos[0], page); |
| 42 | + chip->read_buf(mtd, ecc_code, chip->ecc.total); |
| 43 | chip->cmdfunc(mtd, NAND_CMD_RNDOUT, data_col_addr, -1); |
| 44 | } else { |
| 45 | chip->cmdfunc(mtd, NAND_CMD_READOOB, 0, page); |
| 46 | @@ -1381,9 +1378,6 @@ static int nand_read_subpage_hwecc_oob_first(struct mtd_info *mtd, struct nand_c |
| 47 | chip->cmdfunc(mtd, NAND_CMD_READ0, data_col_addr, page); |
| 48 | } |
| 49 | |
| 50 | - for (i = 0; i < chip->ecc.total; i++) |
| 51 | - ecc_code[i] = chip->oob_poi[eccpos[i]]; |
| 52 | - |
| 53 | p = bufpoi + data_col_addr; |
| 54 | |
| 55 | for (i = eccbytes * start_step; num_steps; num_steps--, i += eccbytes, p += eccsize) { |
| 56 | -- |
| 57 | 1.7.4.1 |
| 58 | |
| 59 | |
