summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Zhang <[email protected]>2024-09-16 11:58:44 +0200
committerTom Rini <[email protected]>2024-10-05 11:19:24 -0600
commit29777ec3740d032098b4484f4b2398fabe42869a (patch)
tree3ce71f60262495cf7f75009696f8b5075b772249
parent16101726e85bf111eae6c364b710051d94d5e24f (diff)
mtd: rawnand: brcmnand: Fix potential false time out warning
Backport from the Linux kernel: commit 9cc0a598b944816f2968baf2631757f22721b996 "mtd: rawnand: brcmnand: Fix potential false time out warning" If system is busy during the command status polling function, the driver may not get the chance to poll the status register till the end of time out and return the premature status. Do a final check after time out happens to ensure reading the correct status. Signed-off-by: William Zhang <[email protected]> Reviewed-by: Florian Fainelli <[email protected]> Signed-off-by: Miquel Raynal <[email protected]> Link: https://lore.kernel.org/linux-mtd/[email protected] Signed-off-by: Linus Walleij <[email protected]> Reviewed-by: William Zhang <[email protected]>
-rw-r--r--drivers/mtd/nand/raw/brcmnand/brcmnand.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/mtd/nand/raw/brcmnand/brcmnand.c b/drivers/mtd/nand/raw/brcmnand/brcmnand.c
index 700d1122639..46a4107a83a 100644
--- a/drivers/mtd/nand/raw/brcmnand/brcmnand.c
+++ b/drivers/mtd/nand/raw/brcmnand/brcmnand.c
@@ -1011,6 +1011,14 @@ static int bcmnand_ctrl_poll_status(struct brcmnand_controller *ctrl,
} while (get_timer(base) < limit);
#endif /* __UBOOT__ */
+ /*
+ * do a final check after time out in case the CPU was busy and the driver
+ * did not get enough time to perform the polling to avoid false alarms
+ */
+ val = brcmnand_read_reg(ctrl, BRCMNAND_INTFC_STATUS);
+ if ((val & mask) == expected_val)
+ return 0;
+
dev_warn(ctrl->dev, "timeout on status poll (expected %x got %x)\n",
expected_val, val & mask);