]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
mtd: spi-nor: Add WATCHDOG_RESET() in spi_nor_core callbacks
authorPatrice Chotard <patrice.chotard@foss.st.com>
Wed, 20 Jan 2021 13:42:01 +0000 (14:42 +0100)
committerPatrice Chotard <patrice.chotard@foss.st.com>
Thu, 11 Mar 2021 15:36:32 +0000 (16:36 +0100)
In case of big area write/erase on spi nor, watchdog timeout may occurs.
Issue reproduced on stm32mp157c-ev1 with following commands:

sf write 0xC0000000 0 0x3000000
or
sf erase 0 0x1000000

Signed-off-by: Patrice Chotard <patrice.chotard@foss.st.com>
Reviewed-by: Patrick Delaunay <patrick.delaunay@foss.st.com>
drivers/mtd/spi/spi-nor-core.c

index ef426dac02b1daa6ba657c17e51dbe9edc2319e0..e0efebc355579e191bd2e0c102e3f2a5d1612f0c 100644 (file)
@@ -11,6 +11,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <watchdog.h>
 #include <dm.h>
 #include <dm/device_compat.h>
 #include <dm/devres.h>
@@ -566,6 +567,7 @@ static int spi_nor_erase(struct mtd_info *mtd, struct erase_info *instr)
        len = instr->len;
 
        while (len) {
+               WATCHDOG_RESET();
 #ifdef CONFIG_SPI_FLASH_BAR
                ret = write_bar(nor, addr);
                if (ret < 0)
@@ -1250,6 +1252,7 @@ static int spi_nor_write(struct mtd_info *mtd, loff_t to, size_t len,
        for (i = 0; i < len; ) {
                ssize_t written;
                loff_t addr = to + i;
+               WATCHDOG_RESET();
 
                /*
                 * If page_size is a power of two, the offset can be quickly