[PATCH v2] mtd: rawnand: propagate mode-0 fallback failures

From: James Hilliard

Date: Wed Nov 18 2026 - 12:53:12 EST


When GET_FEATURES reports a different timing mode than requested,
nand_setup_interface() tries to restore mode 0 by reconfiguring the
controller and issuing a NAND RESET. It ignores both return values and
returns success even if the fallback fails.

Return the fallback error in that case. If GET_FEATURES itself failed,
keep its error.

This also lets nand_do_write_oob() stop before programming OOB data if
nand_reset() cannot restore mode 0.

Fixes: 415ae78ffb5d ("mtd: rawnand: check ONFI timings have been acked by the chip")
Signed-off-by: James Hilliard <james.hilliard1@xxxxxxxxx>
---
Changes in v2:
- Narrow the subject and rationale to a failed mode-0 fallback.
- Link to v1: https://patch.msgid.link/20261103-submit-rawnand-timing-recovery-v1-v1-1-1cc33723e052@xxxxxxxxx
---
drivers/mtd/nand/raw/nand_base.c | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/drivers/mtd/nand/raw/nand_base.c b/drivers/mtd/nand/raw/nand_base.c
index fe8c6dcc9c07..e050b27aa578 100644
--- a/drivers/mtd/nand/raw/nand_base.c
+++ b/drivers/mtd/nand/raw/nand_base.c
@@ -840,7 +840,7 @@ static int nand_setup_interface(struct nand_chip *chip, int chipnr)
{
const struct nand_controller_ops *ops = chip->controller->ops;
u8 tmode_param[ONFI_SUBFEATURE_PARAM_LEN] = { }, request;
- int ret;
+ int ret, reset_ret;

if (!nand_controller_can_setup_interface(chip))
return 0;
@@ -909,12 +909,15 @@ static int nand_setup_interface(struct nand_chip *chip, int chipnr)
* Fallback to mode 0 if the chip explicitly did not ack the chosen
* timing mode.
*/
- nand_reset_interface(chip, chipnr);
+ reset_ret = nand_reset_interface(chip, chipnr);
+ if (reset_ret)
+ return ret ?: reset_ret;
+
nand_select_target(chip, chipnr);
- nand_reset_op(chip);
+ reset_ret = nand_reset_op(chip);
nand_deselect_target(chip);

- return ret;
+ return ret ?: reset_ret;
}

/**

---
base-commit: 292f737382d3913d0d9addf220b7170fedd7a04f
base-tree: git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git nand/next
change-id: 20261103-submit-rawnand-timing-recovery-v1-a64432f26f3c

Best regards,
--
James Hilliard <james.hilliard1@xxxxxxxxx>