diff options
| author | Tom Rini <trini@konsulko.com> | 2022-10-26 07:45:55 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-10-26 07:45:55 -0400 |
| commit | c2c485db455696850f17a874f8b5a11d13b31b5c (patch) | |
| tree | 291e7cd1007f6cdf6e514c21edd5c2e5fa9a0a2e /common | |
| parent | f9d16f2c0daf68dcb963c08c927f5f0a07cf75e4 (diff) | |
| parent | 5e112c7ca8ee45860e27f23059d9a319ba8eb6d3 (diff) | |
| download | u-boot-c2c485db455696850f17a874f8b5a11d13b31b5c.tar.gz | |
Merge https://source.denx.de/u-boot/custodians/u-boot-watchdog
- nuvoton: add expire function for generic reset (Jim)
- handle watchdogs during keyed autoboot (Rasmus)
- cyclic: Don't disable cylic function upon exceeding CPU time (Stefan)
- ulp wdog: Updates to support iMX93 and DM (Alice)
Diffstat (limited to 'common')
| -rw-r--r-- | common/cyclic.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/common/cyclic.c b/common/cyclic.c index b3c180bd1a..7abb82c16a 100644 --- a/common/cyclic.c +++ b/common/cyclic.c @@ -85,13 +85,17 @@ void cyclic_run(void) cyclic->cpu_time_us += cpu_time; /* Check if cpu-time exceeds max allowed time */ - if (cpu_time > CONFIG_CYCLIC_MAX_CPU_TIME_US) { - pr_err("cyclic function %s took too long: %lldus vs %dus max, disabling\n", + if ((cpu_time > CONFIG_CYCLIC_MAX_CPU_TIME_US) && + (!cyclic->already_warned)) { + pr_err("cyclic function %s took too long: %lldus vs %dus max\n", cyclic->name, cpu_time, CONFIG_CYCLIC_MAX_CPU_TIME_US); - /* Unregister this cyclic function */ - cyclic_unregister(cyclic); + /* + * Don't disable this function, just warn once + * about this exceeding CPU time usage + */ + cyclic->already_warned = true; } } } |