mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2025-01-01 05:03:20 +02:00
45 lines
1.6 KiB
Diff
45 lines
1.6 KiB
Diff
From a525f2fabe86dfd4a1acc057afcb31de319ca3e5 Mon Sep 17 00:00:00 2001
|
|
From: Xiangfu Liu <xiangfu@macbook.(none)>
|
|
Date: Fri, 19 Aug 2011 15:45:39 +0800
|
|
Subject: [PATCH 19/32] 902-NAND-Optimize-NAND_ECC_HW_OOB_FIRST-read.patch
|
|
|
|
---
|
|
drivers/mtd/nand/nand_base.c | 14 ++++++++++----
|
|
1 files changed, 10 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c
|
|
index a46e9bb..a9afe23 100644
|
|
--- a/drivers/mtd/nand/nand_base.c
|
|
+++ b/drivers/mtd/nand/nand_base.c
|
|
@@ -1305,9 +1305,15 @@ static int nand_read_page_hwecc_oob_first(struct mtd_info *mtd,
|
|
uint8_t *ecc_calc = chip->buffers->ecccalc;
|
|
|
|
/* Read the OOB area first */
|
|
- chip->cmdfunc(mtd, NAND_CMD_READOOB, 0, page);
|
|
- chip->read_buf(mtd, chip->oob_poi, mtd->oobsize);
|
|
- chip->cmdfunc(mtd, NAND_CMD_READ0, 0, page);
|
|
+ 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_RNDOUT, 0, -1);
|
|
+ } else {
|
|
+ chip->cmdfunc(mtd, NAND_CMD_READOOB, 0, page);
|
|
+ chip->read_buf(mtd, chip->oob_poi, mtd->oobsize);
|
|
+ chip->cmdfunc(mtd, NAND_CMD_READ0, 0, page);
|
|
+ }
|
|
|
|
for (i = 0; i < chip->ecc.total; i++)
|
|
ecc_code[i] = chip->oob_poi[eccpos[i]];
|
|
@@ -1477,7 +1483,7 @@ static int nand_do_read_ops(struct mtd_info *mtd, loff_t from,
|
|
if (realpage != chip->pagebuf || oob) {
|
|
bufpoi = aligned ? buf : chip->buffers->databuf;
|
|
|
|
- if (likely(sndcmd)) {
|
|
+ if (likely(sndcmd) && chip->ecc.mode != NAND_ECC_HW_OOB_FIRST) {
|
|
chip->cmdfunc(mtd, NAND_CMD_READ0, 0x00, page);
|
|
sndcmd = 0;
|
|
}
|
|
--
|
|
1.7.4.1
|
|
|