task_wdt: fix overflow in current_ticks making wdt get stuck

martinjaeger · nashif · commit 98d2d2feda51 · 2021-11-22T20:22:11.000-05:00
The task_wdt was getting stuck after approx. 36 hours on e.g. nRF52840, which has a SysTick with 32768 Hz. This corresponds to an overflow of the uint32_t current_ticks in schedule_next_timeout. This commit fixes the accidentally introduced narrowing conversion. Fixes #40152 Signed-off-by: Martin Jäger <martin@libre.solar>
diff --git a/subsys/task_wdt/task_wdt.c b/subsys/task_wdt/task_wdt.c
@@ -50,7 +50,7 @@ static int hw_wdt_channel;
 static bool hw_wdt_started;
 #endif
 
-static void schedule_next_timeout(uint32_t current_ticks)
+static void schedule_next_timeout(int64_t current_ticks)
 {
 	int next_channel_id;	/* channel which will time out next */
 	int64_t next_timeout;   /* timeout in absolute ticks of this channel */

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ static int hw_wdt_channel;`
`50`	`50`	`static bool hw_wdt_started;`
`51`	`51`	`#endif`
`52`	`52`
`53`		`-static void schedule_next_timeout(uint32_t current_ticks)`
	`53`	`+static void schedule_next_timeout(int64_t current_ticks)`
`54`	`54`	`{`
`55`	`55`	`int next_channel_id; /* channel which will time out next */`
`56`	`56`	`int64_t next_timeout; /* timeout in absolute ticks of this channel */`