diff options
Diffstat (limited to 'src/drivers')
-rw-r--r-- | src/drivers/amd/agesa/eventlog.c | 22 | ||||
-rw-r--r-- | src/drivers/amd/agesa/romstage.c | 6 | ||||
-rw-r--r-- | src/drivers/intel/fsp1_1/fsp_util.c | 6 | ||||
-rw-r--r-- | src/drivers/intel/fsp1_1/romstage.c | 6 | ||||
-rw-r--r-- | src/drivers/intel/fsp2_0/memory_init.c | 4 | ||||
-rw-r--r-- | src/drivers/intel/fsp2_0/notify.c | 12 | ||||
-rw-r--r-- | src/drivers/vpd/vpd.c | 6 |
7 files changed, 31 insertions, 31 deletions
diff --git a/src/drivers/amd/agesa/eventlog.c b/src/drivers/amd/agesa/eventlog.c index 126a2ee1e1..7154c95155 100644 --- a/src/drivers/amd/agesa/eventlog.c +++ b/src/drivers/amd/agesa/eventlog.c @@ -28,69 +28,69 @@ static const struct agesa_mapping entrypoint[] = { .func = AMD_INIT_RESET, .name = "AmdInitReset", .entry_id = TS_AGESA_INIT_RESET_START, - .exit_id = TS_AGESA_INIT_RESET_DONE, + .exit_id = TS_AGESA_INIT_RESET_END, }, { .func = AMD_INIT_EARLY, .name = "AmdInitEarly", .entry_id = TS_AGESA_INIT_EARLY_START, - .exit_id = TS_AGESA_INIT_EARLY_DONE, + .exit_id = TS_AGESA_INIT_EARLY_END, }, { .func = AMD_INIT_POST, .name = "AmdInitPost", .entry_id = TS_AGESA_INIT_POST_START, - .exit_id = TS_AGESA_INIT_POST_DONE, + .exit_id = TS_AGESA_INIT_POST_END, }, { .func = AMD_INIT_RESUME, .name = "AmdInitResume", .entry_id = TS_AGESA_INIT_RESUME_START, - .exit_id = TS_AGESA_INIT_RESUME_DONE, + .exit_id = TS_AGESA_INIT_RESUME_END, }, { .func = AMD_INIT_ENV, .name = "AmdInitEnv", .entry_id = TS_AGESA_INIT_ENV_START, - .exit_id = TS_AGESA_INIT_ENV_DONE, + .exit_id = TS_AGESA_INIT_ENV_END, }, { .func = AMD_INIT_MID, .name = "AmdInitMid", .entry_id = TS_AGESA_INIT_MID_START, - .exit_id = TS_AGESA_INIT_MID_DONE, + .exit_id = TS_AGESA_INIT_MID_END, }, { .func = AMD_INIT_LATE, .name = "AmdInitLate", .entry_id = TS_AGESA_INIT_LATE_START, - .exit_id = TS_AGESA_INIT_LATE_DONE, + .exit_id = TS_AGESA_INIT_LATE_END, }, { .func = AMD_S3LATE_RESTORE, .name = "AmdS3LateRestore", .entry_id = TS_AGESA_S3_LATE_START, - .exit_id = TS_AGESA_S3_LATE_DONE, + .exit_id = TS_AGESA_S3_LATE_END, }, #if !defined(AMD_S3_SAVE_REMOVED) { .func = AMD_S3_SAVE, .name = "AmdS3Save", .entry_id = TS_AGESA_INIT_RTB_START, - .exit_id = TS_AGESA_INIT_RTB_DONE, + .exit_id = TS_AGESA_INIT_RTB_END, }, #endif { .func = AMD_S3FINAL_RESTORE, .name = "AmdS3FinalRestore", .entry_id = TS_AGESA_S3_FINAL_START, - .exit_id = TS_AGESA_S3_FINAL_DONE, + .exit_id = TS_AGESA_S3_FINAL_END, }, { .func = AMD_INIT_RTB, .name = "AmdInitRtb", .entry_id = TS_AGESA_INIT_RTB_START, - .exit_id = TS_AGESA_INIT_RTB_DONE, + .exit_id = TS_AGESA_INIT_RTB_END, }, }; diff --git a/src/drivers/amd/agesa/romstage.c b/src/drivers/amd/agesa/romstage.c index 871054b92c..5968f7379f 100644 --- a/src/drivers/amd/agesa/romstage.c +++ b/src/drivers/amd/agesa/romstage.c @@ -40,7 +40,7 @@ static void romstage_main(void) fill_sysinfo(cb); - timestamp_add_now(TS_START_ROMSTAGE); + timestamp_add_now(TS_ROMSTAGE_START); board_BeforeAgesa(cb); @@ -55,14 +55,14 @@ static void romstage_main(void) agesa_execute_state(cb, AMD_INIT_EARLY); - timestamp_add_now(TS_BEFORE_INITRAM); + timestamp_add_now(TS_INITRAM_START); if (!cb->s3resume) agesa_execute_state(cb, AMD_INIT_POST); else agesa_execute_state(cb, AMD_INIT_RESUME); - timestamp_add_now(TS_AFTER_INITRAM); + timestamp_add_now(TS_INITRAM_END); /* Work around AGESA setting all memory as WB on normal * boot path. diff --git a/src/drivers/intel/fsp1_1/fsp_util.c b/src/drivers/intel/fsp1_1/fsp_util.c index 570648c373..7dc16c3896 100644 --- a/src/drivers/intel/fsp1_1/fsp_util.c +++ b/src/drivers/intel/fsp1_1/fsp_util.c @@ -134,17 +134,17 @@ void fsp_notify(u32 phase) notify_phase_params.Phase = phase; if (phase == EnumInitPhaseReadyToBoot) { - timestamp_add_now(TS_FSP_BEFORE_FINALIZE); + timestamp_add_now(TS_FSP_FINALIZE_START); post_code(POST_FSP_NOTIFY_BEFORE_FINALIZE); } else { - timestamp_add_now(TS_FSP_BEFORE_ENUMERATE); + timestamp_add_now(TS_FSP_ENUMERATE_START); post_code(POST_FSP_NOTIFY_BEFORE_ENUMERATE); } status = notify_phase_proc(¬ify_phase_params); timestamp_add_now(phase == EnumInitPhaseReadyToBoot ? - TS_FSP_AFTER_FINALIZE : TS_FSP_AFTER_ENUMERATE); + TS_FSP_FINALIZE_END : TS_FSP_ENUMERATE_END); if (status != 0) printk(BIOS_ERR, "FSP API NotifyPhase failed for phase 0x%x with status: 0x%x\n", diff --git a/src/drivers/intel/fsp1_1/romstage.c b/src/drivers/intel/fsp1_1/romstage.c index 3ed73d32c9..7fd1cf50c8 100644 --- a/src/drivers/intel/fsp1_1/romstage.c +++ b/src/drivers/intel/fsp1_1/romstage.c @@ -26,7 +26,7 @@ static void raminit_common(struct romstage_params *params) post_code(0x32); - timestamp_add_now(TS_BEFORE_INITRAM); + timestamp_add_now(TS_INITRAM_START); s3wake = params->power_state->prev_sleep_state == ACPI_S3; @@ -66,7 +66,7 @@ static void raminit_common(struct romstage_params *params) /* Initialize RAM */ raminit(params); - timestamp_add_now(TS_AFTER_INITRAM); + timestamp_add_now(TS_INITRAM_END); /* Save MRC output */ if (CONFIG(CACHE_MRC_SETTINGS)) { @@ -100,7 +100,7 @@ void cache_as_ram_stage_main(FSP_INFO_HEADER *fih) post_code(0x30); - timestamp_add_now(TS_START_ROMSTAGE); + timestamp_add_now(TS_ROMSTAGE_START); /* Display parameters */ if (!CONFIG(NO_ECAM_MMCONF_SUPPORT)) diff --git a/src/drivers/intel/fsp2_0/memory_init.c b/src/drivers/intel/fsp2_0/memory_init.c index b7e81f0915..1612089b95 100644 --- a/src/drivers/intel/fsp2_0/memory_init.c +++ b/src/drivers/intel/fsp2_0/memory_init.c @@ -380,9 +380,9 @@ void fsp_memory_init(bool s3wake) die("FSPM XIP base does not match: %p vs %p\n", (void *)(uintptr_t)hdr->image_base, prog_start(&fspld.fsp_prog)); - timestamp_add_now(TS_BEFORE_INITRAM); + timestamp_add_now(TS_INITRAM_START); do_fsp_memory_init(&context, s3wake); - timestamp_add_now(TS_AFTER_INITRAM); + timestamp_add_now(TS_INITRAM_END); } diff --git a/src/drivers/intel/fsp2_0/notify.c b/src/drivers/intel/fsp2_0/notify.c index 30d61c971d..5cd63d8ec0 100644 --- a/src/drivers/intel/fsp2_0/notify.c +++ b/src/drivers/intel/fsp2_0/notify.c @@ -23,24 +23,24 @@ static const struct fsp_notify_phase_data notify_data[] = { .skip = !CONFIG(USE_FSP_NOTIFY_PHASE_POST_PCI_ENUM), .post_code_before = POST_FSP_NOTIFY_BEFORE_ENUMERATE, .post_code_after = POST_FSP_NOTIFY_AFTER_ENUMERATE, - .timestamp_before = TS_FSP_BEFORE_ENUMERATE, - .timestamp_after = TS_FSP_AFTER_ENUMERATE, + .timestamp_before = TS_FSP_ENUMERATE_START, + .timestamp_after = TS_FSP_ENUMERATE_END, }, { .notify_phase = READY_TO_BOOT, .skip = !CONFIG(USE_FSP_NOTIFY_PHASE_READY_TO_BOOT), .post_code_before = POST_FSP_NOTIFY_BEFORE_FINALIZE, .post_code_after = POST_FSP_NOTIFY_AFTER_FINALIZE, - .timestamp_before = TS_FSP_BEFORE_FINALIZE, - .timestamp_after = TS_FSP_AFTER_FINALIZE, + .timestamp_before = TS_FSP_FINALIZE_START, + .timestamp_after = TS_FSP_FINALIZE_END, }, { .notify_phase = END_OF_FIRMWARE, .skip = !CONFIG(USE_FSP_NOTIFY_PHASE_END_OF_FIRMWARE), .post_code_before = POST_FSP_NOTIFY_BEFORE_END_OF_FIRMWARE, .post_code_after = POST_FSP_NOTIFY_AFTER_END_OF_FIRMWARE, - .timestamp_before = TS_FSP_BEFORE_END_OF_FIRMWARE, - .timestamp_after = TS_FSP_AFTER_END_OF_FIRMWARE, + .timestamp_before = TS_FSP_END_OF_FIRMWARE_START, + .timestamp_after = TS_FSP_END_OF_FIRMWARE_END, }, }; diff --git a/src/drivers/vpd/vpd.c b/src/drivers/vpd/vpd.c index 396097c9d9..32ec0a04e3 100644 --- a/src/drivers/vpd/vpd.c +++ b/src/drivers/vpd/vpd.c @@ -126,7 +126,7 @@ static void cbmem_add_cros_vpd(int is_recovery) { struct vpd_cbmem *cbmem; - timestamp_add_now(TS_START_COPYVPD); + timestamp_add_now(TS_COPYVPD_START); init_vpd_rdevs(); @@ -154,7 +154,7 @@ static void cbmem_add_cros_vpd(int is_recovery) printk(BIOS_ERR, "Couldn't read RO VPD\n"); cbmem->ro_size = ro_size = 0; } - timestamp_add_now(TS_END_COPYVPD_RO); + timestamp_add_now(TS_COPYVPD_RO_END); } if (rw_size) { @@ -163,7 +163,7 @@ static void cbmem_add_cros_vpd(int is_recovery) printk(BIOS_ERR, "Couldn't read RW VPD\n"); cbmem->rw_size = rw_size = 0; } - timestamp_add_now(TS_END_COPYVPD_RW); + timestamp_add_now(TS_COPYVPD_RW_END); } init_vpd_rdevs_from_cbmem(); |