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/soc/mediatek/common/mcu.c | 2 +- src/soc/mediatek/common/memory.c | 8 ++++---- src/soc/mediatek/common/mt6359p.c | 2 +- src/soc/mediatek/common/spm.c | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) (limited to 'src/soc/mediatek/common') diff --git a/src/soc/mediatek/common/mcu.c b/src/soc/mediatek/common/mcu.c index d0a1107548..42b312449f 100644 --- a/src/soc/mediatek/common/mcu.c +++ b/src/soc/mediatek/common/mcu.c @@ -31,7 +31,7 @@ int mtk_init_mcu(struct mtk_mcu *mcu) if (mcu->reset) mcu->reset(mcu); - printk(BIOS_DEBUG, "%s: Loaded (and reset) %s in %ld msecs (%zd bytes)\n", + printk(BIOS_DEBUG, "%s: Loaded (and reset) %s in %lld msecs (%zd bytes)\n", __func__, mcu->firmware_name, stopwatch_duration_msecs(&sw), mcu->run_size); return CB_SUCCESS; diff --git a/src/soc/mediatek/common/memory.c b/src/soc/mediatek/common/memory.c index f3f784e121..e4207222b0 100644 --- a/src/soc/mediatek/common/memory.c +++ b/src/soc/mediatek/common/memory.c @@ -265,7 +265,7 @@ static void mt_mem_init_run(struct dramc_param *dparam, ret = dram_run_fast_calibration(dparam); if (ret != 0) { printk(BIOS_ERR, "DRAM-K: Failed to run fast calibration " - "in %ld msecs, error: %d\n", + "in %lld msecs, error: %d\n", stopwatch_duration_msecs(&sw), ret); /* Erase flash data after fast calibration failed */ @@ -274,7 +274,7 @@ static void mt_mem_init_run(struct dramc_param *dparam, DRAMC_PARAM_HEADER_VERSION, dparam, mrc_cache_size); } else { - printk(BIOS_INFO, "DRAM-K: Fast calibration passed in %ld msecs\n", + printk(BIOS_INFO, "DRAM-K: Fast calibration passed in %lld msecs\n", stopwatch_duration_msecs(&sw)); return; } @@ -290,13 +290,13 @@ static void mt_mem_init_run(struct dramc_param *dparam, stopwatch_init(&sw); int err = dram_run_full_calibration(dparam); if (err == 0) { - printk(BIOS_INFO, "DRAM-K: Full calibration passed in %ld msecs\n", + printk(BIOS_INFO, "DRAM-K: Full calibration passed in %lld msecs\n", stopwatch_duration_msecs(&sw)); mrc_cache_stash_data(MRC_TRAINING_DATA, DRAMC_PARAM_HEADER_VERSION, dparam, mrc_cache_size); } else { - printk(BIOS_ERR, "DRAM-K: Full calibration failed in %ld msecs\n", + printk(BIOS_ERR, "DRAM-K: Full calibration failed in %lld msecs\n", stopwatch_duration_msecs(&sw)); } } diff --git a/src/soc/mediatek/common/mt6359p.c b/src/soc/mediatek/common/mt6359p.c index 580079ef47..de22b3e85d 100644 --- a/src/soc/mediatek/common/mt6359p.c +++ b/src/soc/mediatek/common/mt6359p.c @@ -141,7 +141,7 @@ static void pmic_efuse_setting(void) mt6359p_write(PMIC_BUCK_VPA_DLC_CON1, 0x800); } - printk(BIOS_DEBUG, "%s: Set efuses in %ld msecs\n", + printk(BIOS_DEBUG, "%s: Set efuses in %lld msecs\n", __func__, stopwatch_duration_msecs(&sw)); } diff --git a/src/soc/mediatek/common/spm.c b/src/soc/mediatek/common/spm.c index 71cad48d19..e39f3da56c 100644 --- a/src/soc/mediatek/common/spm.c +++ b/src/soc/mediatek/common/spm.c @@ -209,7 +209,7 @@ int spm_init(void) return -1; } - printk(BIOS_INFO, "SPM: %s done in %ld msecs, spm pc = %#x\n", + printk(BIOS_INFO, "SPM: %s done in %lld msecs, spm pc = %#x\n", __func__, stopwatch_duration_msecs(&sw), read32(&mtk_spm->md32pcm_pc)); -- cgit v1.2.3