[PATCH] watchdog: Correct watchdog timeout print message

[PATCH] watchdog: Correct watchdog timeout print message

[Chanho Park]

The wdt_start function takes timeout_ms as a parameter and starts the
watchdog with this value. However, when you output the message, it shows
the default timeout value for the watchdog device.
So this patch fixes that part to output the correct timeout value.

Before -->
StarFive # wdt start 3000
WDT:   Started watchdog@13070000 without servicing  (60s timeout)

After -->
StarFive # wdt start 3000
WDT:   Started watchdog@13070000 without servicing  (3s timeout)

Fixes: c2fd0ca1a822 ("watchdog: Integrate watchdog triggering into the cyclic framework")
Signed-off-by: Chanho Park <chanho61.park@samsung.com>
---
 drivers/watchdog/wdt-uclass.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/watchdog/wdt-uclass.c b/drivers/watchdog/wdt-uclass.c
index ed329284decb..65a4bc1f90ed 100644
--- a/drivers/watchdog/wdt-uclass.c
+++ b/drivers/watchdog/wdt-uclass.c
@@ -141,7 +141,7 @@ int wdt_start(struct udevice *dev, u64 timeout_ms, ulong flags)
 
 		printf("WDT:   Started %s with%s servicing %s (%ds timeout)\n",
 		       dev->name, IS_ENABLED(CONFIG_WATCHDOG) ? "" : "out",
-		       str, priv->timeout);
+		       str, (u32)(timeout_ms / 1000));
 	}
 
 	return ret;
-- 
2.39.2

Re: [PATCH] watchdog: Correct watchdog timeout print message

[Simon Glass]

On Sun, 26 Nov 2023 at 18:06, Chanho Park <chanho61.park@samsung.com> wrote:
>
> The wdt_start function takes timeout_ms as a parameter and starts the
> watchdog with this value. However, when you output the message, it shows
> the default timeout value for the watchdog device.
> So this patch fixes that part to output the correct timeout value.
>
> Before -->
> StarFive # wdt start 3000
> WDT:   Started watchdog@13070000 without servicing  (60s timeout)
>
> After -->
> StarFive # wdt start 3000
> WDT:   Started watchdog@13070000 without servicing  (3s timeout)
>
> Fixes: c2fd0ca1a822 ("watchdog: Integrate watchdog triggering into the cyclic framework")
> Signed-off-by: Chanho Park <chanho61.park@samsung.com>
> ---
>  drivers/watchdog/wdt-uclass.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>

Reviewed-by: Simon Glass <sjg@chromium.org>

Re: [PATCH] watchdog: Correct watchdog timeout print message

[Stefan Roese]

On 11/27/23 02:05, Chanho Park wrote:
> The wdt_start function takes timeout_ms as a parameter and starts the
> watchdog with this value. However, when you output the message, it shows
> the default timeout value for the watchdog device.
> So this patch fixes that part to output the correct timeout value.
> 
> Before -->
> StarFive # wdt start 3000
> WDT:   Started watchdog@13070000 without servicing  (60s timeout)
> 
> After -->
> StarFive # wdt start 3000
> WDT:   Started watchdog@13070000 without servicing  (3s timeout)
> 
> Fixes: c2fd0ca1a822 ("watchdog: Integrate watchdog triggering into the cyclic framework")
> Signed-off-by: Chanho Park <chanho61.park@samsung.com>

Reviewed-by: Stefan Roese <sr@denx.de>

Thanks,
Stefan

> ---
>   drivers/watchdog/wdt-uclass.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/watchdog/wdt-uclass.c b/drivers/watchdog/wdt-uclass.c
> index ed329284decb..65a4bc1f90ed 100644
> --- a/drivers/watchdog/wdt-uclass.c
> +++ b/drivers/watchdog/wdt-uclass.c
> @@ -141,7 +141,7 @@ int wdt_start(struct udevice *dev, u64 timeout_ms, ulong flags)
>   
>   		printf("WDT:   Started %s with%s servicing %s (%ds timeout)\n",
>   		       dev->name, IS_ENABLED(CONFIG_WATCHDOG) ? "" : "out",
> -		       str, priv->timeout);
> +		       str, (u32)(timeout_ms / 1000));
>   	}
>   
>   	return ret;

Viele Grüße,
Stefan Roese

-- 
DENX Software Engineering GmbH,      Managing Director: Erika Unter
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr@denx.de

Re: [PATCH] watchdog: Correct watchdog timeout print message

[Stefan Roese]

On 12/1/23 08:37, Stefan Roese wrote:
> On 11/27/23 02:05, Chanho Park wrote:
>> The wdt_start function takes timeout_ms as a parameter and starts the
>> watchdog with this value. However, when you output the message, it shows
>> the default timeout value for the watchdog device.
>> So this patch fixes that part to output the correct timeout value.
>>
>> Before -->
>> StarFive # wdt start 3000
>> WDT:   Started watchdog@13070000 without servicing  (60s timeout)
>>
>> After -->
>> StarFive # wdt start 3000
>> WDT:   Started watchdog@13070000 without servicing  (3s timeout)
>>
>> Fixes: c2fd0ca1a822 ("watchdog: Integrate watchdog triggering into the 
>> cyclic framework")
>> Signed-off-by: Chanho Park <chanho61.park@samsung.com>
> 
> Reviewed-by: Stefan Roese <sr@denx.de>
> 
> Thanks,
> Stefan
> 
>> ---
>>   drivers/watchdog/wdt-uclass.c | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/drivers/watchdog/wdt-uclass.c 
>> b/drivers/watchdog/wdt-uclass.c
>> index ed329284decb..65a4bc1f90ed 100644
>> --- a/drivers/watchdog/wdt-uclass.c
>> +++ b/drivers/watchdog/wdt-uclass.c
>> @@ -141,7 +141,7 @@ int wdt_start(struct udevice *dev, u64 timeout_ms, 
>> ulong flags)
>>           printf("WDT:   Started %s with%s servicing %s (%ds timeout)\n",
>>                  dev->name, IS_ENABLED(CONFIG_WATCHDOG) ? "" : "out",
>> -               str, priv->timeout);
>> +               str, (u32)(timeout_ms / 1000));

Unfortunately this commit break CI build - I tested using Azure CI:

test.py for QEMU platforms qemu_m68k:


Successfully installed attrs-23.1.0 jsonschema-4.17.3 pyrsistent-0.20.0 
pyyaml-6.0
+ tools/buildman/buildman -o /tmp/M5208EVBE -w -E -W -e --board 
M5208EVBE -a CONFIG_M68K_QEMU=y -a '~CONFIG_MCFTMR'
Building current source for 1 boards (1 thread, 2 jobs per thread)

Starting build...


     0    0    0 /1       -1      (starting)

       m68k:  +   M5208EVBE
+m68k-linux-ld.bfd: drivers/watchdog/wdt-uclass.o: in function `wdt_start':
+drivers/watchdog/wdt-uclass.c:144:(.text.wdt_start+0xc6): undefined 
reference to `__udivdi3'
+make[1]: *** [Makefile:1765: u-boot] Error 1
+make: *** [Makefile:177: sub-make] Error 2

     0    0    1 /1              M5208EVBE
Completed: 1 total built, 1 newly), duration 0:00:21, rate 0.05
##[error]Bash exited with code '100'.
##[warning]RetryHelper encountered task failure, will retry (attempt #: 
1 out of 2) after 1000 ms
Generating script.

Could you please take a look?

Thanks,
Stefan

RE: [PATCH] watchdog: Correct watchdog timeout print message

[Chanho Park]

> -----Original Message-----
> From: Stefan Roese <sr@denx.de>
> Sent: Friday, December 1, 2023 7:39 PM
> To: Chanho Park <chanho61.park@samsung.com>; u-boot@lists.denx.de
> Subject: Re: [PATCH] watchdog: Correct watchdog timeout print message
> 
> On 12/1/23 08:37, Stefan Roese wrote:
> > On 11/27/23 02:05, Chanho Park wrote:
> >> The wdt_start function takes timeout_ms as a parameter and starts the
> >> watchdog with this value. However, when you output the message, it
> shows
> >> the default timeout value for the watchdog device.
> >> So this patch fixes that part to output the correct timeout value.
> >>
> >> Before -->
> >> StarFive # wdt start 3000
> >> WDT:   Started watchdog@13070000 without servicing  (60s timeout)
> >>
> >> After -->
> >> StarFive # wdt start 3000
> >> WDT:   Started watchdog@13070000 without servicing  (3s timeout)
> >>
> >> Fixes: c2fd0ca1a822 ("watchdog: Integrate watchdog triggering into the
> >> cyclic framework")
> >> Signed-off-by: Chanho Park <chanho61.park@samsung.com>
> >
> > Reviewed-by: Stefan Roese <sr@denx.de>
> >
> > Thanks,
> > Stefan
> >
> >> ---
> >>   drivers/watchdog/wdt-uclass.c | 2 +-
> >>   1 file changed, 1 insertion(+), 1 deletion(-)
> >>
> >> diff --git a/drivers/watchdog/wdt-uclass.c
> >> b/drivers/watchdog/wdt-uclass.c
> >> index ed329284decb..65a4bc1f90ed 100644
> >> --- a/drivers/watchdog/wdt-uclass.c
> >> +++ b/drivers/watchdog/wdt-uclass.c
> >> @@ -141,7 +141,7 @@ int wdt_start(struct udevice *dev, u64 timeout_ms,
> >> ulong flags)
> >>           printf("WDT:   Started %s with%s servicing %s (%ds
> timeout)\n",
> >>                  dev->name, IS_ENABLED(CONFIG_WATCHDOG) ? "" : "out",
> >> -               str, priv->timeout);
> >> +               str, (u32)(timeout_ms / 1000));
> 
> Unfortunately this commit break CI build - I tested using Azure CI:
> 
> test.py for QEMU platforms qemu_m68k:
> 
> 
> Successfully installed attrs-23.1.0 jsonschema-4.17.3 pyrsistent-0.20.0
> pyyaml-6.0
> + tools/buildman/buildman -o /tmp/M5208EVBE -w -E -W -e --board
> M5208EVBE -a CONFIG_M68K_QEMU=y -a '~CONFIG_MCFTMR'
> Building current source for 1 boards (1 thread, 2 jobs per thread)
> 
> Starting build...
> 
> 
>      0    0    0 /1       -1      (starting)
> 
>        m68k:  +   M5208EVBE
> +m68k-linux-ld.bfd: drivers/watchdog/wdt-uclass.o: in function `wdt_start':
> +drivers/watchdog/wdt-uclass.c:144:(.text.wdt_start+0xc6): undefined
> reference to `__udivdi3'
> +make[1]: *** [Makefile:1765: u-boot] Error 1
> +make: *** [Makefile:177: sub-make] Error 2
> 
>      0    0    1 /1              M5208EVBE
> Completed: 1 total built, 1 newly), duration 0:00:21, rate 0.05
> ##[error]Bash exited with code '100'.
> ##[warning]RetryHelper encountered task failure, will retry (attempt #:
> 1 out of 2) after 1000 ms
> Generating script.
> 
> Could you please take a look?

Sure. I'll fix it and post the v2 patch.

Best Regards,
Chanho Park