From 6d7b8c5ccff961ab4ebd980a972b5b42d9f1505e Mon Sep 17 00:00:00 2001 From: Sudhakar Rajashekhara Date: Tue, 20 Jul 2010 15:24:01 -0700 Subject: [PATCH] --- yaml --- r: 207767 b: refs/heads/master c: 1c3275b656045aff9a75bb2c9f3251af1043ebb3 h: refs/heads/master i: 207765: a1f435ece069536aa4b982e464ee2fd60851eb98 207763: 082451574236d2c3d27ddf00c19577724c3a0d69 207759: 657388a27c68e6095945e69d66748d45f5f24fae v: v3 --- [refs] | 2 +- trunk/drivers/mtd/nand/davinci_nand.c | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 410a954e76c3..66dd28a73d7a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 58373ff0afff4cc8ac40608872995f4d87eb72ec +refs/heads/master: 1c3275b656045aff9a75bb2c9f3251af1043ebb3 diff --git a/trunk/drivers/mtd/nand/davinci_nand.c b/trunk/drivers/mtd/nand/davinci_nand.c index 9c9d893affeb..2ac7367afe77 100644 --- a/trunk/drivers/mtd/nand/davinci_nand.c +++ b/trunk/drivers/mtd/nand/davinci_nand.c @@ -311,7 +311,9 @@ static int nand_davinci_correct_4bit(struct mtd_info *mtd, unsigned short ecc10[8]; unsigned short *ecc16; u32 syndrome[4]; + u32 ecc_state; unsigned num_errors, corrected; + unsigned long timeo = jiffies + msecs_to_jiffies(100); /* All bytes 0xff? It's an erased page; ignore its ECC. */ for (i = 0; i < 10; i++) { @@ -361,6 +363,21 @@ static int nand_davinci_correct_4bit(struct mtd_info *mtd, */ davinci_nand_writel(info, NANDFCR_OFFSET, davinci_nand_readl(info, NANDFCR_OFFSET) | BIT(13)); + + /* + * ECC_STATE field reads 0x3 (Error correction complete) immediately + * after setting the 4BITECC_ADD_CALC_START bit. So if you immediately + * begin trying to poll for the state, you may fall right out of your + * loop without any of the correction calculations having taken place. + * The recommendation from the hardware team is to wait till ECC_STATE + * reads less than 4, which means ECC HW has entered correction state. + */ + do { + ecc_state = (davinci_nand_readl(info, + NANDFSR_OFFSET) >> 8) & 0x0f; + cpu_relax(); + } while ((ecc_state < 4) && time_before(jiffies, timeo)); + for (;;) { u32 fsr = davinci_nand_readl(info, NANDFSR_OFFSET);