From ad6157ebdfddc39b95e388487e00cadd2bbf368b Mon Sep 17 00:00:00 2001 From: Jakub Czapiga Date: Tue, 15 Feb 2022 11:50:31 +0100 Subject: timestamps: Rename timestamps to make names more consistent This patch aims to make timestamps more consistent in naming, to follow one pattern. Until now there were many naming patterns: - TS_START_*/TS_END_* - TS_BEFORE_*/TS_AFTER_* - TS_*_START/TS_*_END This change also aims to indicate, that these timestamps can be used to create time-ranges, e.g. from TS_BOOTBLOCK_START to TS_BOOTBLOCK_END. Signed-off-by: Jakub Czapiga Change-Id: I533e32392224d9b67c37e6a67987b09bf1cf51c6 Reviewed-on: https://review.coreboot.org/c/coreboot/+/62019 Tested-by: build bot (Jenkins) Reviewed-by: Tim Wawrzynczak Reviewed-by: Yu-Ping Wu Reviewed-by: Raul Rangel --- .../include/commonlib/timestamp_serialized.h | 264 ++++++++++----------- 1 file changed, 132 insertions(+), 132 deletions(-) (limited to 'src/commonlib/include') diff --git a/src/commonlib/include/commonlib/timestamp_serialized.h b/src/commonlib/include/commonlib/timestamp_serialized.h index 492508ef40..a51b68f0b6 100644 --- a/src/commonlib/include/commonlib/timestamp_serialized.h +++ b/src/commonlib/include/commonlib/timestamp_serialized.h @@ -19,23 +19,23 @@ struct timestamp_table { } __packed; enum timestamp_id { - TS_START_ROMSTAGE = 1, - TS_BEFORE_INITRAM = 2, - TS_AFTER_INITRAM = 3, - TS_END_ROMSTAGE = 4, - TS_START_VBOOT = 5, - TS_END_VBOOT = 6, - TS_START_COPYRAM = 8, - TS_END_COPYRAM = 9, - TS_START_RAMSTAGE = 10, - TS_START_BOOTBLOCK = 11, - TS_END_BOOTBLOCK = 12, - TS_START_COPYROM = 13, - TS_END_COPYROM = 14, - TS_START_ULZMA = 15, - TS_END_ULZMA = 16, - TS_START_ULZ4F = 17, - TS_END_ULZ4F = 18, + TS_ROMSTAGE_START = 1, + TS_INITRAM_START = 2, + TS_INITRAM_END = 3, + TS_ROMSTAGE_END = 4, + TS_VBOOT_START = 5, + TS_VBOOT_END = 6, + TS_COPYRAM_START = 8, + TS_COPYRAM_END = 9, + TS_RAMSTAGE_START = 10, + TS_BOOTBLOCK_START = 11, + TS_BOOTBLOCK_END = 12, + TS_COPYROM_START = 13, + TS_COPYROM_END = 14, + TS_ULZMA_START = 15, + TS_ULZMA_END = 16, + TS_ULZ4F_START = 17, + TS_ULZ4F_END = 18, TS_DEVICE_ENUMERATE = 30, TS_DEVICE_CONFIGURE = 40, TS_DEVICE_ENABLE = 50, @@ -50,8 +50,8 @@ enum timestamp_id { TS_LOAD_PAYLOAD = 90, TS_ACPI_WAKE_JUMP = 98, TS_SELFBOOT_JUMP = 99, - TS_START_POSTCAR = 100, - TS_END_POSTCAR = 101, + TS_POSTCAR_START = 100, + TS_POSTCAR_END = 101, TS_DELAY_START = 110, TS_DELAY_END = 111, TS_READ_UCODE_START = 112, @@ -60,67 +60,67 @@ enum timestamp_id { TS_ELOG_INIT_END = 115, /* 500+ reserved for vendorcode extensions (500-600: google/chromeos) */ - TS_START_COPYVER = 501, - TS_END_COPYVER = 502, - TS_START_TPMINIT = 503, - TS_END_TPMINIT = 504, - TS_START_VERIFY_SLOT = 505, - TS_END_VERIFY_SLOT = 506, - TS_START_HASH_BODY = 507, - TS_DONE_LOADING = 508, - TS_DONE_HASHING = 509, - TS_END_HASH_BODY = 510, - TS_START_TPMPCR = 511, - TS_END_TPMPCR = 512, - TS_START_TPMLOCK = 513, - TS_END_TPMLOCK = 514, - TS_START_EC_SYNC = 515, + TS_COPYVER_START = 501, + TS_COPYVER_END = 502, + TS_TPMINIT_START = 503, + TS_TPMINIT_END = 504, + TS_VERIFY_SLOT_START = 505, + TS_VERIFY_SLOT_END = 506, + TS_HASH_BODY_START = 507, + TS_LOADING_END = 508, + TS_HASHING_END = 509, + TS_HASH_BODY_END = 510, + TS_TPMPCR_START = 511, + TS_TPMPCR_END = 512, + TS_TPMLOCK_START = 513, + TS_TPMLOCK_END = 514, + TS_EC_SYNC_START = 515, TS_EC_HASH_READY = 516, TS_EC_POWER_LIMIT_WAIT = 517, - TS_END_EC_SYNC = 518, - TS_START_COPYVPD = 550, - TS_END_COPYVPD_RO = 551, - TS_END_COPYVPD_RW = 552, - TS_START_TPM_ENABLE_UPDATE = 553, - TS_END_TPM_ENABLE_UPDATE = 554, + TS_EC_SYNC_END = 518, + TS_COPYVPD_START = 550, + TS_COPYVPD_RO_END = 551, + TS_COPYVPD_RW_END = 552, + TS_TPM_ENABLE_UPDATE_START = 553, + TS_TPM_ENABLE_UPDATE_END = 554, /* 900-940 reserved for vendorcode extensions (900-940: AMD) */ TS_AGESA_INIT_RESET_START = 900, - TS_AGESA_INIT_RESET_DONE = 901, + TS_AGESA_INIT_RESET_END = 901, TS_AGESA_INIT_EARLY_START = 902, - TS_AGESA_INIT_EARLY_DONE = 903, + TS_AGESA_INIT_EARLY_END = 903, TS_AGESA_INIT_POST_START = 904, - TS_AGESA_INIT_POST_DONE = 905, + TS_AGESA_INIT_POST_END = 905, TS_AGESA_INIT_ENV_START = 906, - TS_AGESA_INIT_ENV_DONE = 907, + TS_AGESA_INIT_ENV_END = 907, TS_AGESA_INIT_MID_START = 908, - TS_AGESA_INIT_MID_DONE = 909, + TS_AGESA_INIT_MID_END = 909, TS_AGESA_INIT_LATE_START = 910, - TS_AGESA_INIT_LATE_DONE = 911, + TS_AGESA_INIT_LATE_END = 911, TS_AGESA_INIT_RTB_START = 912, - TS_AGESA_INIT_RTB_DONE = 913, + TS_AGESA_INIT_RTB_END = 913, TS_AGESA_INIT_RESUME_START = 914, - TS_AGESA_INIT_RESUME_DONE = 915, + TS_AGESA_INIT_RESUME_END = 915, TS_AGESA_S3_LATE_START = 916, - TS_AGESA_S3_LATE_DONE = 917, + TS_AGESA_S3_LATE_END = 917, TS_AGESA_S3_FINAL_START = 918, - TS_AGESA_S3_FINAL_DONE = 919, + TS_AGESA_S3_FINAL_END = 919, TS_AMD_APOB_READ_START = 920, TS_AMD_APOB_ERASE_START = 921, TS_AMD_APOB_WRITE_START = 922, - TS_AMD_APOB_DONE = 923, + TS_AMD_APOB_END = 923, /* 940-950 reserved for vendorcode extensions (940-950: Intel ME) */ - TS_ME_INFORM_DRAM_WAIT = 940, - TS_ME_INFORM_DRAM_DONE = 941, - TS_ME_BEFORE_END_OF_POST = 942, - TS_ME_AFTER_END_OF_POST = 943, - TS_ME_BOOT_STALL_DONE = 944, + TS_ME_INFORM_DRAM_START = 940, + TS_ME_INFORM_DRAM_END = 941, + TS_ME_END_OF_POST_START = 942, + TS_ME_END_OF_POST_END = 943, + TS_ME_BOOT_STALL_END = 944, TS_ME_ICC_CONFIG_START = 945, - TS_ME_HOST_BOOT_PREP_DONE = 946, + TS_ME_HOST_BOOT_PREP_END = 946, TS_ME_RECEIVED_CRDA_FROM_PMC = 947, - TS_START_CSE_FW_SYNC = 948, - TS_END_CSE_FW_SYNC = 949, + TS_CSE_FW_SYNC_START = 948, + TS_CSE_FW_SYNC_END = 949, /* 950+ reserved for vendorcode extensions (950-989: intel/fsp) */ TS_FSP_MEMORY_INIT_START = 950, @@ -129,12 +129,12 @@ enum timestamp_id { TS_FSP_TEMP_RAM_EXIT_END = 953, TS_FSP_SILICON_INIT_START = 954, TS_FSP_SILICON_INIT_END = 955, - TS_FSP_BEFORE_ENUMERATE = 956, - TS_FSP_AFTER_ENUMERATE = 957, - TS_FSP_BEFORE_FINALIZE = 958, - TS_FSP_AFTER_FINALIZE = 959, - TS_FSP_BEFORE_END_OF_FIRMWARE = 960, - TS_FSP_AFTER_END_OF_FIRMWARE = 961, + TS_FSP_ENUMERATE_START = 956, + TS_FSP_ENUMERATE_END = 957, + TS_FSP_FINALIZE_START = 958, + TS_FSP_FINALIZE_END = 959, + TS_FSP_END_OF_FIRMWARE_START = 960, + TS_FSP_END_OF_FIRMWARE_END = 961, TS_FSP_MULTI_PHASE_SI_INIT_START = 962, TS_FSP_MULTI_PHASE_SI_INIT_END = 963, TS_FSP_MEMORY_INIT_LOAD = 970, @@ -161,7 +161,7 @@ enum timestamp_id { TS_VB_READ_KERNEL_DONE = 1050, TS_VB_VBOOT_DONE = 1100, - TS_START_KERNEL = 1101, + TS_KERNEL_START = 1101, TS_KERNEL_DECOMPRESSION = 1102, }; @@ -171,23 +171,23 @@ static const struct timestamp_id_to_name { } timestamp_ids[] = { /* Marker to report base_time. */ { 0, "1st timestamp" }, - { TS_START_ROMSTAGE, "start of romstage" }, - { TS_BEFORE_INITRAM, "before RAM initialization" }, - { TS_AFTER_INITRAM, "after RAM initialization" }, - { TS_END_ROMSTAGE, "end of romstage" }, - { TS_START_VBOOT, "start of verified boot" }, - { TS_END_VBOOT, "end of verified boot" }, - { TS_START_COPYRAM, "starting to load ramstage" }, - { TS_END_COPYRAM, "finished loading ramstage" }, - { TS_START_RAMSTAGE, "start of ramstage" }, - { TS_START_BOOTBLOCK, "start of bootblock" }, - { TS_END_BOOTBLOCK, "end of bootblock" }, - { TS_START_COPYROM, "starting to load romstage" }, - { TS_END_COPYROM, "finished loading romstage" }, - { TS_START_ULZMA, "starting LZMA decompress (ignore for x86)" }, - { TS_END_ULZMA, "finished LZMA decompress (ignore for x86)" }, - { TS_START_ULZ4F, "starting LZ4 decompress (ignore for x86)" }, - { TS_END_ULZ4F, "finished LZ4 decompress (ignore for x86)" }, + { TS_ROMSTAGE_START, "start of romstage" }, + { TS_INITRAM_START, "before RAM initialization" }, + { TS_INITRAM_END, "after RAM initialization" }, + { TS_ROMSTAGE_END, "end of romstage" }, + { TS_VBOOT_START, "start of verified boot" }, + { TS_VBOOT_END, "end of verified boot" }, + { TS_COPYRAM_START, "starting to load ramstage" }, + { TS_COPYRAM_END, "finished loading ramstage" }, + { TS_RAMSTAGE_START, "start of ramstage" }, + { TS_BOOTBLOCK_START, "start of bootblock" }, + { TS_BOOTBLOCK_END, "end of bootblock" }, + { TS_COPYROM_START, "starting to load romstage" }, + { TS_COPYROM_END, "finished loading romstage" }, + { TS_ULZMA_START, "starting LZMA decompress (ignore for x86)" }, + { TS_ULZMA_END, "finished LZMA decompress (ignore for x86)" }, + { TS_ULZ4F_START, "starting LZ4 decompress (ignore for x86)" }, + { TS_ULZ4F_END, "finished LZ4 decompress (ignore for x86)" }, { TS_DEVICE_ENUMERATE, "device enumeration" }, { TS_DEVICE_CONFIGURE, "device configuration" }, { TS_DEVICE_ENABLE, "device enable" }, @@ -209,31 +209,31 @@ static const struct timestamp_id_to_name { { TS_ELOG_INIT_START, "started elog init" }, { TS_ELOG_INIT_END, "finished elog init" }, - { TS_START_COPYVER, "starting to load verstage" }, - { TS_END_COPYVER, "finished loading verstage" }, - { TS_START_TPMINIT, "starting to initialize TPM" }, - { TS_END_TPMINIT, "finished TPM initialization" }, - { TS_START_VERIFY_SLOT, "starting to verify keyblock/preamble (RSA)" }, - { TS_END_VERIFY_SLOT, "finished verifying keyblock/preamble (RSA)" }, - { TS_START_HASH_BODY, "starting to verify body (load+SHA2+RSA) " }, - { TS_DONE_LOADING, "finished loading body" }, - { TS_DONE_HASHING, "finished calculating body hash (SHA2)" }, - { TS_END_HASH_BODY, "finished verifying body signature (RSA)" }, - { TS_START_TPMPCR, "starting TPM PCR extend" }, - { TS_END_TPMPCR, "finished TPM PCR extend" }, - { TS_START_TPMLOCK, "starting locking TPM" }, - { TS_END_TPMLOCK, "finished locking TPM" }, - { TS_START_TPM_ENABLE_UPDATE, "started TPM enable update" }, - { TS_END_TPM_ENABLE_UPDATE, "finished TPM enable update" }, + { TS_COPYVER_START, "starting to load verstage" }, + { TS_COPYVER_END, "finished loading verstage" }, + { TS_TPMINIT_START, "starting to initialize TPM" }, + { TS_TPMINIT_END, "finished TPM initialization" }, + { TS_VERIFY_SLOT_START, "starting to verify keyblock/preamble (RSA)" }, + { TS_VERIFY_SLOT_END, "finished verifying keyblock/preamble (RSA)" }, + { TS_HASH_BODY_START, "starting to verify body (load+SHA2+RSA) " }, + { TS_LOADING_END, "finished loading body" }, + { TS_HASHING_END, "finished calculating body hash (SHA2)" }, + { TS_HASH_BODY_END, "finished verifying body signature (RSA)" }, + { TS_TPMPCR_START, "starting TPM PCR extend" }, + { TS_TPMPCR_END, "finished TPM PCR extend" }, + { TS_TPMLOCK_START, "starting locking TPM" }, + { TS_TPMLOCK_END, "finished locking TPM" }, + { TS_TPM_ENABLE_UPDATE_START, "started TPM enable update" }, + { TS_TPM_ENABLE_UPDATE_END, "finished TPM enable update" }, - { TS_START_COPYVPD, "starting to load Chrome OS VPD" }, - { TS_END_COPYVPD_RO, "finished loading Chrome OS VPD (RO)" }, - { TS_END_COPYVPD_RW, "finished loading Chrome OS VPD (RW)" }, + { TS_COPYVPD_START, "starting to load Chrome OS VPD" }, + { TS_COPYVPD_RO_END, "finished loading Chrome OS VPD (RO)" }, + { TS_COPYVPD_RW_END, "finished loading Chrome OS VPD (RW)" }, - { TS_START_EC_SYNC, "starting EC software sync" }, + { TS_EC_SYNC_START, "starting EC software sync" }, { TS_EC_HASH_READY, "EC vboot hash ready" }, { TS_EC_POWER_LIMIT_WAIT, "waiting for EC to allow higher power draw" }, - { TS_END_EC_SYNC, "finished EC software sync" }, + { TS_EC_SYNC_END, "finished EC software sync" }, { TS_DC_START, "depthcharge start" }, { TS_RO_PARAMS_INIT, "RO parameter init" }, @@ -247,45 +247,45 @@ static const struct timestamp_id_to_name { { TS_VB_READ_KERNEL_DONE, "finished reading kernel from disk" }, { TS_VB_VBOOT_DONE, "finished vboot kernel verification" }, { TS_KERNEL_DECOMPRESSION, "starting kernel decompression/relocation" }, - { TS_START_KERNEL, "jumping to kernel" }, + { TS_KERNEL_START, "jumping to kernel" }, /* AMD related timestamps */ { TS_AGESA_INIT_RESET_START, "calling AmdInitReset" }, - { TS_AGESA_INIT_RESET_DONE, "back from AmdInitReset" }, + { TS_AGESA_INIT_RESET_END, "back from AmdInitReset" }, { TS_AGESA_INIT_EARLY_START, "calling AmdInitEarly" }, - { TS_AGESA_INIT_EARLY_DONE, "back from AmdInitEarly" }, + { TS_AGESA_INIT_EARLY_END, "back from AmdInitEarly" }, { TS_AGESA_INIT_POST_START, "calling AmdInitPost" }, - { TS_AGESA_INIT_POST_DONE, "back from AmdInitPost" }, + { TS_AGESA_INIT_POST_END, "back from AmdInitPost" }, { TS_AGESA_INIT_ENV_START, "calling AmdInitEnv" }, - { TS_AGESA_INIT_ENV_DONE, "back from AmdInitEnv" }, + { TS_AGESA_INIT_ENV_END, "back from AmdInitEnv" }, { TS_AGESA_INIT_MID_START, "calling AmdInitMid" }, - { TS_AGESA_INIT_MID_DONE, "back from AmdInitMid" }, + { TS_AGESA_INIT_MID_END, "back from AmdInitMid" }, { TS_AGESA_INIT_LATE_START, "calling AmdInitLate" }, - { TS_AGESA_INIT_LATE_DONE, "back from AmdInitLate" }, + { TS_AGESA_INIT_LATE_END, "back from AmdInitLate" }, { TS_AGESA_INIT_RTB_START, "calling AmdInitRtb/AmdS3Save" }, - { TS_AGESA_INIT_RTB_DONE, "back from AmdInitRtb/AmdS3Save" }, + { TS_AGESA_INIT_RTB_END, "back from AmdInitRtb/AmdS3Save" }, { TS_AGESA_INIT_RESUME_START, "calling AmdInitResume" }, - { TS_AGESA_INIT_RESUME_DONE, "back from AmdInitResume" }, + { TS_AGESA_INIT_RESUME_END, "back from AmdInitResume" }, { TS_AGESA_S3_LATE_START, "calling AmdS3LateRestore" }, - { TS_AGESA_S3_LATE_DONE, "back from AmdS3LateRestore" }, + { TS_AGESA_S3_LATE_END, "back from AmdS3LateRestore" }, { TS_AGESA_S3_FINAL_START, "calling AmdS3FinalRestore" }, - { TS_AGESA_S3_FINAL_DONE, "back from AmdS3FinalRestore" }, + { TS_AGESA_S3_FINAL_END, "back from AmdS3FinalRestore" }, { TS_AMD_APOB_READ_START, "starting APOB read" }, { TS_AMD_APOB_ERASE_START, "starting APOB erase" }, { TS_AMD_APOB_WRITE_START, "starting APOB write" }, - { TS_AMD_APOB_DONE, "finished APOB" }, + { TS_AMD_APOB_END, "finished APOB" }, /* Intel ME related timestamps */ - { TS_ME_INFORM_DRAM_WAIT, "waiting for ME acknowledgement of raminit"}, - { TS_ME_INFORM_DRAM_DONE, "finished waiting for ME response"}, - { TS_ME_BEFORE_END_OF_POST, "before sending EOP to ME"}, - { TS_ME_AFTER_END_OF_POST, "after sending EOP to ME"}, - { TS_ME_BOOT_STALL_DONE, "CSE sent 'Boot Stall Done' to PMC"}, + { TS_ME_INFORM_DRAM_START, "waiting for ME acknowledgement of raminit"}, + { TS_ME_INFORM_DRAM_END, "finished waiting for ME response"}, + { TS_ME_END_OF_POST_START, "before sending EOP to ME"}, + { TS_ME_END_OF_POST_END, "after sending EOP to ME"}, + { TS_ME_BOOT_STALL_END, "CSE sent 'Boot Stall Done' to PMC"}, { TS_ME_ICC_CONFIG_START, "CSE started to handle ICC configuration"}, - { TS_ME_HOST_BOOT_PREP_DONE, "CSE sent 'Host BIOS Prep Done' to PMC"}, + { TS_ME_HOST_BOOT_PREP_END, "CSE sent 'Host BIOS Prep Done' to PMC"}, { TS_ME_RECEIVED_CRDA_FROM_PMC, "CSE received 'CPU Reset Done Ack sent' from PMC"}, - { TS_START_CSE_FW_SYNC, "starting CSE firmware sync"}, - { TS_END_CSE_FW_SYNC, "finished CSE firmware sync"}, + { TS_CSE_FW_SYNC_START, "starting CSE firmware sync"}, + { TS_CSE_FW_SYNC_END, "finished CSE firmware sync"}, { TS_ME_ROM_START, "CSME ROM started execution"}, /* FSP related timestamps */ @@ -297,20 +297,20 @@ static const struct timestamp_id_to_name { { TS_FSP_SILICON_INIT_END, "returning from FspSiliconInit" }, { TS_FSP_MULTI_PHASE_SI_INIT_START, "calling FspMultiPhaseSiInit" }, { TS_FSP_MULTI_PHASE_SI_INIT_END, "returning from FspMultiPhaseSiInit" }, - { TS_FSP_BEFORE_ENUMERATE, "calling FspNotify(AfterPciEnumeration)" }, - { TS_FSP_AFTER_ENUMERATE, + { TS_FSP_ENUMERATE_START, "calling FspNotify(AfterPciEnumeration)" }, + { TS_FSP_ENUMERATE_END, "returning from FspNotify(AfterPciEnumeration)" }, - { TS_FSP_BEFORE_FINALIZE, "calling FspNotify(ReadyToBoot)" }, - { TS_FSP_AFTER_FINALIZE, "returning from FspNotify(ReadyToBoot)" }, - { TS_FSP_BEFORE_END_OF_FIRMWARE, "calling FspNotify(EndOfFirmware)" }, - { TS_FSP_AFTER_END_OF_FIRMWARE, + { TS_FSP_FINALIZE_START, "calling FspNotify(ReadyToBoot)" }, + { TS_FSP_FINALIZE_END, "returning from FspNotify(ReadyToBoot)" }, + { TS_FSP_END_OF_FIRMWARE_START, "calling FspNotify(EndOfFirmware)" }, + { TS_FSP_END_OF_FIRMWARE_END, "returning from FspNotify(EndOfFirmware)" }, { TS_FSP_MEMORY_INIT_LOAD, "loading FSP-M" }, { TS_FSP_SILICON_INIT_LOAD, "loading FSP-S" }, - { TS_START_POSTCAR, "start of postcar" }, - { TS_END_POSTCAR, "end of postcar" }, + { TS_POSTCAR_START, "start of postcar" }, + { TS_POSTCAR_END, "end of postcar" }, }; #endif -- cgit v1.2.3