From d522f38c7bfccdc4af71bcad133aec20096f3f6c Mon Sep 17 00:00:00 2001 From: Rob Barnes Date: Mon, 12 Sep 2022 06:31:47 -0600 Subject: timer: Change timer util functions to 64-bit Since mono_time is now 64-bit, the utility functions interfacing with mono_time should also be 64-bit so precision isn't lost. Fixed build errors related to printing the now int64_t result of stopwatch_duration_[m|u]secs in various places. BUG=b:237082996 BRANCH=All TEST=Boot dewatt Change-Id: I169588f5e14285557f2d03270f58f4c07c0154d5 Signed-off-by: Rob Barnes Reviewed-on: https://review.coreboot.org/c/coreboot/+/66170 Tested-by: build bot (Jenkins) Reviewed-by: Werner Zeh Reviewed-by: Raul Rangel Reviewed-by: Yu-Ping Wu --- src/lib/hardwaremain.c | 2 +- src/lib/thread.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/lib') diff --git a/src/lib/hardwaremain.c b/src/lib/hardwaremain.c index e45ac9fe16..714452df20 100644 --- a/src/lib/hardwaremain.c +++ b/src/lib/hardwaremain.c @@ -283,7 +283,7 @@ static void bs_call_callbacks(struct boot_state *state, bscb->callback(bscb->arg); if (CONFIG(DEBUG_BOOT_STATE)) { timer_monotonic_get(&mt_stop); - printk(BIOS_DEBUG, "BS: callback (%p) @ %s (%ld ms).\n", bscb, + printk(BIOS_DEBUG, "BS: callback (%p) @ %s (%lld ms).\n", bscb, bscb_location(bscb), mono_time_diff_microseconds(&mt_start, &mt_stop) / USECS_PER_MSEC); diff --git a/src/lib/thread.c b/src/lib/thread.c index dc83df0668..a0d43118a8 100644 --- a/src/lib/thread.c +++ b/src/lib/thread.c @@ -400,7 +400,7 @@ enum cb_err thread_join(struct thread_handle *handle) while (handle->state != THREAD_DONE) assert(thread_yield() == 0); - printk(BIOS_SPEW, "took %lu us\n", stopwatch_duration_usecs(&sw)); + printk(BIOS_SPEW, "took %lld us\n", stopwatch_duration_usecs(&sw)); return handle->error; } @@ -415,7 +415,7 @@ void thread_mutex_lock(struct thread_mutex *mutex) assert(thread_yield() == 0); mutex->locked = true; - printk(BIOS_SPEW, "took %lu us to acquire mutex\n", stopwatch_duration_usecs(&sw)); + printk(BIOS_SPEW, "took %lld us to acquire mutex\n", stopwatch_duration_usecs(&sw)); } void thread_mutex_unlock(struct thread_mutex *mutex) -- cgit v1.2.3