mtd: rawnand: marvell: fix command xtype in BCH write hook

[Linux-MTD Mailing List]

Gitweb:     http://git.infradead.org/?p=mtd-2.6.git;a=commit;h=a2ee41fd953e7c3ff6c55a3038c80354d191a318
Commit:     a2ee41fd953e7c3ff6c55a3038c80354d191a318
Parent:     b76401fc4ba720f0f38f7b1f9d54d5c2308bc18d
Author:     Miquel Raynal <miquel.raynal at bootlin.com>
AuthorDate: Thu May 3 12:00:27 2018 +0200
Committer:  Boris Brezillon <boris.brezillon at bootlin.com>
CommitDate: Fri May 4 10:35:04 2018 +0200

    mtd: rawnand: marvell: fix command xtype in BCH write hook
    
    One layout supported by the Marvell NAND controller supports NAND pages
    of 2048 bytes, all handled in one single chunk when using BCH with a
    strength of 4-bit per 512 bytes. In this case, instead of the generic
    XTYPE_WRITE_DISPATCH/XTYPE_LAST_NAKED_RW couple, the controller expects
    to receive XTYPE_MONOLITHIC_RW.
    
    This fixes problems at boot like:
    
    [    1.315475] Scanning device for bad blocks
    [    3.203108] marvell-nfc f10d0000.flash: Timeout waiting for RB signal
    [    3.209564] nand_bbt: error while writing BBT block -110
    [    4.243106] marvell-nfc f10d0000.flash: Timeout waiting for RB signal
    [    5.283106] marvell-nfc f10d0000.flash: Timeout waiting for RB signal
    [    5.289562] nand_bbt: error -110 while marking block 2047 bad
    [    6.323106] marvell-nfc f10d0000.flash: Timeout waiting for RB signal
    [    6.329559] nand_bbt: error while writing BBT block -110
    [    7.363106] marvell-nfc f10d0000.flash: Timeout waiting for RB signal
    [    8.403105] marvell-nfc f10d0000.flash: Timeout waiting for RB signal
    [    8.409559] nand_bbt: error -110 while marking block 2046 bad
    ...
    
    Fixes: 02f26ecf8c772 ("mtd: nand: add reworked Marvell NAND controller driver")
    Cc: stable at vger.kernel.org
    Signed-off-by: Miquel Raynal <miquel.raynal at bootlin.com>
    Tested-by: Chris Packham <chris.packham at alliedtelesis.co.nz>
    Signed-off-by: Boris Brezillon <boris.brezillon at bootlin.com>
---
 drivers/mtd/nand/raw/marvell_nand.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/drivers/mtd/nand/raw/marvell_nand.c b/drivers/mtd/nand/raw/marvell_nand.c
index e4b964fd40d8..db5ec4e8bde9 100644
--- a/drivers/mtd/nand/raw/marvell_nand.c
+++ b/drivers/mtd/nand/raw/marvell_nand.c
@@ -1408,6 +1408,7 @@ marvell_nfc_hw_ecc_bch_write_chunk(struct nand_chip *chip, int chunk,
 	struct marvell_nand_chip *marvell_nand = to_marvell_nand(chip);
 	struct marvell_nfc *nfc = to_marvell_nfc(chip->controller);
 	const struct marvell_hw_ecc_layout *lt = to_marvell_nand(chip)->layout;
+	u32 xtype;
 	int ret;
 	struct marvell_nfc_op nfc_op = {
 		.ndcb[0] = NDCB0_CMD_TYPE(TYPE_WRITE) | NDCB0_LEN_OVRD,
@@ -1423,7 +1424,12 @@ marvell_nfc_hw_ecc_bch_write_chunk(struct nand_chip *chip, int chunk,
 	 * last naked write.
 	 */
 	if (chunk == 0) {
-		nfc_op.ndcb[0] |= NDCB0_CMD_XTYPE(XTYPE_WRITE_DISPATCH) |
+		if (lt->nchunks == 1)
+			xtype = XTYPE_MONOLITHIC_RW;
+		else
+			xtype = XTYPE_WRITE_DISPATCH;
+
+		nfc_op.ndcb[0] |= NDCB0_CMD_XTYPE(xtype) |
 				  NDCB0_ADDR_CYC(marvell_nand->addr_cyc) |
 				  NDCB0_CMD1(NAND_CMD_SEQIN);
 		nfc_op.ndcb[1] |= NDCB1_ADDRS_PAGE(page);