diff options
| author | Julius Werner <jwerner@chromium.org> | 2024-02-06 22:52:06 -0800 |
|---|---|---|
| committer | Julius Werner <jwerner@chromium.org> | 2024-02-08 21:07:13 +0000 |
| commit | 5ec3deac6b3bd8f8cc16730f2017a7316da816c9 (patch) | |
| tree | aed991aa77d35323fd6b01f7e4182cb8616e9fa4 /payloads/libpayload/libc | |
| parent | ddc5260e3b4a5fa8a1ff3d8838f8f188fb673786 (diff) | |
libpayload: timer: Revert timer_hz() return type to 64-bits
It seems that reducing the return type of timer_hz() to uint32_t in
CB:78888 was a bad idea... some Intel platforms actually use their raw
CPU clock for the timestamp counter which can be higher than 4GHz. This
patch reverts it back to uint64_t.
Also remove the redundant assertion in timer/generic.c since timer_us()
itself already does that check.
Cq-Depend: chromium:5274555
Change-Id: I471c7de7a28aec5bb965b23525ed579481ac8361
Signed-off-by: Julius Werner <jwerner@chromium.org>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/80320
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Nico Huber <nico.h@gmx.de>
Reviewed-by: Yidi Lin <yidilin@google.com>
Diffstat (limited to 'payloads/libpayload/libc')
| -rw-r--r-- | payloads/libpayload/libc/time.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/payloads/libpayload/libc/time.c b/payloads/libpayload/libc/time.c index 28f2b3e2a9..64de80049c 100644 --- a/payloads/libpayload/libc/time.c +++ b/payloads/libpayload/libc/time.c @@ -171,14 +171,15 @@ void arch_ndelay(uint64_t ns) u64 timer_us(u64 base) { - static u32 hz, mult = USECS_PER_SEC; + static u64 hz; + static u32 mult = USECS_PER_SEC; u32 div; // Only check timer_hz once. Assume it doesn't change. if (hz == 0) { hz = timer_hz(); if (hz < mult) { - printf("Timer frequency %" PRIu32 " is too low, " + printf("Timer frequency %" PRIu64 " is too low, " "must be at least 1MHz.\n", hz); halt(); } |