Commit 782d1967 authored by Boris Brezillon's avatar Boris Brezillon
Browse files

mtd: rawnand: Do not check FAIL bit when executing a SET_FEATURES op



The ONFI spec clearly says that FAIL bit is only valid for PROGRAM,
ERASE and READ-with-on-die-ECC operations, and should be ignored
otherwise.

It seems that checking it after sending a SET_FEATURES is a bad idea
because a previous READ, PROGRAM or ERASE op may have failed, and
depending on the implementation, the FAIL bit is not cleared until a
new READ, PROGRAM or ERASE is started.

This leads to ->set_features() returning -EIO while it actually worked,
which can sometimes stop a batch of READ/PROGRAM ops.

Note that we only fix the ->exec_op() path here, because some drivers
are abusing the NAND_STATUS_FAIL flag in their ->waitfunc()
implementation to propagate other kind of errors, like
wait-ready-timeout or controller-related errors. Let's not try to fix
those drivers since they worked fine so far.

Fixes: 8878b126 ("mtd: nand: add ->exec_op() implementation")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarBoris Brezillon <boris.brezillon@bootlin.com>
Acked-by: default avatarMiquel Raynal <miquel.raynal@bootlin.com>
parent 39138c1f
Loading
Loading
Loading
Loading
+9 −18
Original line number Diff line number Diff line
@@ -2169,7 +2169,6 @@ static int nand_set_features_op(struct nand_chip *chip, u8 feature,
	struct mtd_info *mtd = nand_to_mtd(chip);
	const u8 *params = data;
	int i, ret;
	u8 status;

	if (chip->exec_op) {
		const struct nand_sdr_timings *sdr =
@@ -2183,14 +2182,9 @@ static int nand_set_features_op(struct nand_chip *chip, u8 feature,
		};
		struct nand_operation op = NAND_OPERATION(instrs);

		ret = nand_exec_op(chip, &op);
		if (ret)
			return ret;
		return nand_exec_op(chip, &op);
	}

		ret = nand_status_op(chip, &status);
		if (ret)
			return ret;
	} else {
	chip->cmdfunc(mtd, NAND_CMD_SET_FEATURES, feature, -1);
	for (i = 0; i < ONFI_SUBFEATURE_PARAM_LEN; ++i)
		chip->write_byte(mtd, params[i]);
@@ -2199,10 +2193,7 @@ static int nand_set_features_op(struct nand_chip *chip, u8 feature,
	if (ret < 0)
		return ret;

		status = ret;
	}

	if (status & NAND_STATUS_FAIL)
	if (ret & NAND_STATUS_FAIL)
		return -EIO;

	return 0;