Commit da9ba4dc authored by Kamal Dasu's avatar Kamal Dasu Committed by Miquel Raynal
Browse files

mtd: rawnand: brcmnand: skip DMA during panic write 



When oops_panic_write is set, the driver disables interrupts and
switches to PIO polling mode but still falls through into the DMA
path. DMA cannot be used reliably in panic context, so make the
DMA path an else branch to ensure only PIO is used during panic
writes.

Fixes: c1ac2dc3 ("mtd: rawnand: brcmnand: When oops in progress use pio and interrupt polling")
Signed-off-by: default avatarKamal Dasu <kamal.dasu@broadcom.com>
Reviewed-by: default avatarWilliam Zhang <william.zhang@broadcom.com>
Reviewed-by: default avatarFlorian Fainelli <florian.fainelli@broadcom.com>
Signed-off-by: default avatarMiquel Raynal <miquel.raynal@bootlin.com>
parent bab2bc6e

drivers/mtd/nand/raw/brcmnand/brcmnand.c

+2 −4
Original line number Diff line number Diff line
@@ -2350,14 +2350,12 @@ static int brcmnand_write(struct mtd_info *mtd, struct nand_chip *chip, 
	for (i = 0; i < ctrl->max_oob; i += 4)

		oob_reg_write(ctrl, i, 0xffffffff);



	if (mtd->oops_panic_write)

	if (mtd->oops_panic_write) {

		/* switch to interrupt polling and PIO mode */

		disable_ctrl_irqs(ctrl);



	if (use_dma(ctrl) && (has_edu(ctrl) || !oob) && flash_dma_buf_ok(buf)) {

	} else if (use_dma(ctrl) && (has_edu(ctrl) || !oob) && flash_dma_buf_ok(buf)) {

		if (ctrl->dma_trans(host, addr, (u32 *)buf, oob, mtd->writesize,

				    CMD_PROGRAM_PAGE))



			ret = -EIO;



		goto out;