diff options
Diffstat (limited to 'payloads/libpayload/drivers/timer')
| -rw-r--r-- | payloads/libpayload/drivers/timer/arm64_arch_timer.c | 2 | ||||
| -rw-r--r-- | payloads/libpayload/drivers/timer/generic.c | 4 | ||||
| -rw-r--r-- | payloads/libpayload/drivers/timer/rdtsc.c | 5 |
3 files changed, 4 insertions, 7 deletions
diff --git a/payloads/libpayload/drivers/timer/arm64_arch_timer.c b/payloads/libpayload/drivers/timer/arm64_arch_timer.c index b4d2b865ae..087d9e7565 100644 --- a/payloads/libpayload/drivers/timer/arm64_arch_timer.c +++ b/payloads/libpayload/drivers/timer/arm64_arch_timer.c @@ -32,7 +32,7 @@ #include <arch/lib_helpers.h> #include <libpayload.h> -uint32_t timer_hz(void) +uint64_t timer_hz(void) { return raw_read_cntfrq_el0(); } diff --git a/payloads/libpayload/drivers/timer/generic.c b/payloads/libpayload/drivers/timer/generic.c index bd5674be8c..46bc291c13 100644 --- a/payloads/libpayload/drivers/timer/generic.c +++ b/payloads/libpayload/drivers/timer/generic.c @@ -33,10 +33,8 @@ #include <assert.h> #include <libpayload.h> -uint32_t timer_hz(void) +uint64_t timer_hz(void) { - /* libc/time.c currently requires all timers to be at least 1MHz. */ - assert(CONFIG_LP_TIMER_GENERIC_HZ >= 1000000); return CONFIG_LP_TIMER_GENERIC_HZ; } diff --git a/payloads/libpayload/drivers/timer/rdtsc.c b/payloads/libpayload/drivers/timer/rdtsc.c index 952bc0bb13..d5bf1d2057 100644 --- a/payloads/libpayload/drivers/timer/rdtsc.c +++ b/payloads/libpayload/drivers/timer/rdtsc.c @@ -35,10 +35,9 @@ #include <arch/rdtsc.h> #include <assert.h> -uint32_t timer_hz(void) +uint64_t timer_hz(void) { - assert(UINT32_MAX / 1000 >= lib_sysinfo.cpu_khz); - return lib_sysinfo.cpu_khz * 1000; + return (uint64_t)lib_sysinfo.cpu_khz * 1000; } uint64_t timer_raw_value(void) |