[U-Boot] [PATCH 2/2 v2] zlib: Add further watchdog reset calls

[U-Boot] [PATCH 2/2 v2] zlib: Add further watchdog reset calls

[Stefan Roese]

Patch 253cb831 [zlib: add watchdog reset call] added already a few
watchdog reset calls to the new zlib U-Boot port. But on some boards
this is not enough. Additional calls are needed on boards with
short watchdog timeouts.

This was detected and tested on the lwmon5 board with a very short
watchdog timeout. Without this patch, the board resets during Linux
kernel decompression. With it, the decompression succeeds.

Signed-off-by: Stefan Roese <sr@denx.de>
Cc: Detlev Zundel <dzu@denx.de>
---
v2:
- Changed to use WATCHDOG_RESET macro instead of function pointer

 lib/zlib.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/lib/zlib.c b/lib/zlib.c
index 2b31dba..e19484a 100644
--- a/lib/zlib.c
+++ b/lib/zlib.c
@@ -1599,6 +1599,7 @@ int flush;
             strm->adler = state->check = adler32(0L, Z_NULL, 0);
             state->mode = TYPE;
         case TYPE:
+	    WATCHDOG_RESET();
             if (flush == Z_BLOCK) goto inf_leave;
         case TYPEDO:
             if (state->last) {
-- 
1.7.2.3

[U-Boot] [PATCH 2/2 v2] zlib: Add further watchdog reset calls

[Detlev Zundel]

Hi Stefan,

> Patch 253cb831 [zlib: add watchdog reset call] added already a few
> watchdog reset calls to the new zlib U-Boot port. But on some boards
> this is not enough. Additional calls are needed on boards with
> short watchdog timeouts.
>
> This was detected and tested on the lwmon5 board with a very short
> watchdog timeout. Without this patch, the board resets during Linux
> kernel decompression. With it, the decompression succeeds.
>
> Signed-off-by: Stefan Roese <sr@denx.de>
> Cc: Detlev Zundel <dzu@denx.de>

Acked-by: Detlev Zundel <dzu@denx.de>

Cheers
  Detlev

-- 
The 82558 B-step and later generation devices do not maintain a link
in D3 if PME is disabled or if the device does not have power.
                                        -- Intel documentation
--
DENX Software Engineering GmbH,      MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich,  Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-40 Fax: (+49)-8142-66989-80 Email: dzu at denx.de

[U-Boot] [PATCH 2/2 v2] zlib: Add further watchdog reset calls

[Wolfgang Denk]

Dear Stefan Roese,

In message <1283952931-4406-1-git-send-email-sr@denx.de> you wrote:
> Patch 253cb831 [zlib: add watchdog reset call] added already a few
> watchdog reset calls to the new zlib U-Boot port. But on some boards
> this is not enough. Additional calls are needed on boards with
> short watchdog timeouts.
> 
> This was detected and tested on the lwmon5 board with a very short
> watchdog timeout. Without this patch, the board resets during Linux
> kernel decompression. With it, the decompression succeeds.
> 
> Signed-off-by: Stefan Roese <sr@denx.de>
> Cc: Detlev Zundel <dzu@denx.de>
> ---
> v2:
> - Changed to use WATCHDOG_RESET macro instead of function pointer
> 
>  lib/zlib.c |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)

Applied, thanks.

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
If God wanted me to touch my toes, he'd have put them on my knees.