From: David Woodhouse <dwmw2@infradead.org>
Date: Mon, 23 Oct 2006 13:29:04 +0000 (+0100)
Subject: [MTD] NAND: Disable ECC checking on CAFÉ since it's broken for now
X-Git-Tag: v2.6.20-rc6~47^2~37^2~9
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=470b0a90d6a21cb72b671215f12ec7ec8a0db2c0;p=linux-2.6

[MTD] NAND: Disable ECC checking on CAFÉ since it's broken for now

Signed-off-by: David Woodhouse <dwmw2@infradead.org>
---

diff --git a/drivers/mtd/nand/cafe.c b/drivers/mtd/nand/cafe.c
index 10132efd05..6bcb430b95 100644
--- a/drivers/mtd/nand/cafe.c
+++ b/drivers/mtd/nand/cafe.c
@@ -67,6 +67,9 @@ module_param(skipbbt, int, 0644);
 static int debug = 0;
 module_param(debug, int, 0644);
 
+static int checkecc = 0;
+module_param(checkecc, int, 0644);
+
 /* Hrm. Why isn't this already conditional on something in the struct device? */
 #define cafe_dev_dbg(dev, args...) do { if (debug) dev_dbg(dev, ##args); } while(0)
 
@@ -214,7 +217,7 @@ static void cafe_nand_cmdfunc(struct mtd_info *mtd, unsigned command,
 		writel(cafe->ctl2 | 0x100 | NAND_CMD_READSTART, cafe->mmio + CAFE_NAND_CTRL2);
 
  do_command:
-#if 1
+#if 0
 	/* http://dev.laptop.org/ticket/200
 	   ECC on read only works if we read precisely 0x80e bytes */
 	if (cafe->datalen == 2112)
@@ -382,7 +385,7 @@ static int cafe_nand_read_page(struct mtd_info *mtd, struct nand_chip *chip,
 	chip->read_buf(mtd, buf, mtd->writesize);
 	chip->read_buf(mtd, chip->oob_poi, mtd->oobsize);
 
-	if (readl(cafe->mmio + CAFE_NAND_ECC_RESULT) & (1<<18)) {
+	if (checkecc && readl(cafe->mmio + CAFE_NAND_ECC_RESULT) & (1<<18)) {
 		unsigned short syn[8];
 		int i;