mtd: mxc_nand: Fix crash after MTD resync

The driver triggered a BUG() in nand_base.c:3214/nand_scan_tail() because the ecc.strength was not set in NAND_ECC_HW_SYNDROME ECC mode.

Signed-off-by Marek Vasut <[email protected]>

Cc Benoit Thebaudeau <[email protected]>

Cc Fabio Estevam <[email protected]>

Cc Scott Wood <[email protected]>

Cc Stefano Babic <[email protected]>

---
 drivers/mtd/nand/mxc_nand.c |   10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

V2: Set ecc.strength for both NAND_ECC_HW and NAND_ECC_HW_SYNDROME mode

drivers/mtd/nand/mxc_nand.c +0 -2

index ac435f2..40b0741 100644
@@ -1242,12 +1242,10 @@ int board_nand_init(struct nand_chip *this)
 		this->ecc.mode = NAND_ECC_HW;
 	}
 
-	if (this->ecc.mode == NAND_ECC_HW) {
-		if (is_mxc_nfc_1())

Hi,

Tom/Stefano, can you pick this for .07? Otherwise all mxc with NAND are broken.

Thanks

Quoted 9 lines

The driver triggered a BUG() in nand_base.c:3214/nand_scan_tail() because the ecc.strength was not set in NAND_ECC_HW_SYNDROME ECC mode.

Signed-off-by Marek Vasut <[email protected]>

Cc Benoit Thebaudeau <[email protected]>

Cc Fabio Estevam <[email protected]>

Cc Scott Wood <[email protected]>

Cc Stefano Babic <[email protected]>

Quoted 5 lines

---
 drivers/mtd/nand/mxc_nand.c |   10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

V2: Set ecc.strength for both NAND_ECC_HW and NAND_ECC_HW_SYNDROME

mode

Review

Quoted 2 lines

(quoted diff) +0 -0

b/drivers/mtd/nand/mxc_nand.c

Quoted 9 lines

index ac435f2..40b0741 100644

drivers/mtd/nand/mxc_nand.c +0 -2

@@ -1242,12 +1242,10 @@ int board_nand_init(struct nand_chip *this)
 		this->ecc.mode = NAND_ECC_HW;
 	}
 
-	if (this->ecc.mode == NAND_ECC_HW) {
-		if (is_mxc_nfc_1())

drivers/mtd/nand/mxc_nand.c int board_nand_init(struct nand_chip *this) · line 1250

Quoted 10 lines

drivers/mtd/nand/mxc_nand.c +4 -4

-			this->ecc.strength = 1;
-		else
-			this->ecc.strength = 4;
-	}
+	if (is_mxc_nfc_1())
+		this->ecc.strength = 1;
+	else
+		this->ecc.strength = 4;
 
 	host->pagesize_2k = 0;

Best regards,
Marek Vasut

Oh, sorry... didn't realize the release was in three days. :-(

I'll send a pull request.

-Scott