| Message ID | 1327652993-16667-1-git-send-email-esw@bus-elektronik.de |
|---|---|
| State | Accepted |
| Commit | a9f5faba6e2c5819fc1ebeef02fad1726721f849 |
| Delegated to: | Stefan Roese |
| Headers | show |
On Friday 27 January 2012 09:29:53 Jens Scharsig (BuS Elektronik) wrote: > The current implementation of cfi_flash uses udelay to reset watchdog. > If several blocks are blank (0xff filled) the watchdog timed out. > The reason is, udelay is never called, if flash device is ready to fast. > > e.g. > mw.w $(copy_addr) FFFF 10000;cp.b $(copy_addr) 10880000 20000 > > -> watchdog timed out > > mw.w $(copy_addr) 0000 10000;cp.b $(copy_addr) 10880000 20000 > > -> watchdog not timed out > > This patch adds an extra watchdog reset in front of flash ready check. > > Signed-off-by: Jens Scharsig (BuS Elektronik) <esw@bus-elektronik.de> Applied to u-boot-cfi-flash. Thanks. Best regards, Stefan -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-0 Fax: (+49)-8142-66989-80 Email: office@denx.de
diff --git a/drivers/mtd/cfi_flash.c b/drivers/mtd/cfi_flash.c index 5494bcf..722c3fc 100644 --- a/drivers/mtd/cfi_flash.c +++ b/drivers/mtd/cfi_flash.c @@ -40,6 +40,7 @@ #include <asm/byteorder.h> #include <environment.h> #include <mtd/cfi_flash.h> +#include <watchdog.h> /* * This file implements a Common Flash Interface (CFI) driver for @@ -577,6 +578,7 @@ static int flash_status_check (flash_info_t * info, flash_sect_t sector, reset_timer(); #endif start = get_timer (0); + WATCHDOG_RESET(); while (flash_is_busy (info, sector)) { if (get_timer (start) > tout) { printf ("Flash %s timeout at address %lx data %lx\n", @@ -668,6 +670,7 @@ static int flash_status_poll(flash_info_t *info, void *src, void *dst, reset_timer(); #endif start = get_timer(0); + WATCHDOG_RESET(); while (1) { switch (info->portwidth) { case FLASH_CFI_8BIT:
The current implementation of cfi_flash uses udelay to reset watchdog. If several blocks are blank (0xff filled) the watchdog timed out. The reason is, udelay is never called, if flash device is ready to fast. e.g. mw.w $(copy_addr) FFFF 10000;cp.b $(copy_addr) 10880000 20000 -> watchdog timed out mw.w $(copy_addr) 0000 10000;cp.b $(copy_addr) 10880000 20000 -> watchdog not timed out This patch adds an extra watchdog reset in front of flash ready check. Signed-off-by: Jens Scharsig (BuS Elektronik) <esw@bus-elektronik.de> --- drivers/mtd/cfi_flash.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-)