jh163888/UEFITool
1
0
Fork 0
mirror of https://github.com/LongSoft/UEFITool.git synced 2024-11-22 07:58:22 +08:00
Code Issues Projects Releases Wiki Activity

Update Intel FIT definitions accodring to FIT specification v1.4

Browse Source
This commit is contained in:
Nikolaj Schlej 2023-01-29 15:58:43 -08:00
parent 66e9f95dc3
commit 03d71d6f9f
2 changed files with 71 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

151
common/intel_fit.h
View File

@ -23,37 +23,45 @@ WITHWARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#define INTEL_FIT_POINTER_OFFSET 0x40 #define INTEL_FIT_POINTER_OFFSET 0x40
// Entry types // Entry types
// https://www.intel.com/content/dam/develop/external/us/en/documents/firmware-interface-table-bios-specification-r1p2p1.pdf // https://cdrdv2-public.intel.com/599500/Firmware-Interface-Table-BIOS-Specification-r1p4.pdf
#define INTEL_FIT_TYPE_HEADER 0x00 #define INTEL_FIT_TYPE_HEADER 0x00
#define INTEL_FIT_TYPE_MICROCODE 0x01 #define INTEL_FIT_TYPE_MICROCODE 0x01
#define INTEL_FIT_TYPE_STARTUP_AC_MODULE 0x02 #define INTEL_FIT_TYPE_STARTUP_AC_MODULE 0x02
#define INTEL_FIT_TYPE_DIAG_AC_MODULE 0x03 #define INTEL_FIT_TYPE_DIAG_AC_MODULE 0x03
//#define INTEL_FIT_TYPE_INTEL_RESERVED_04 0x04 #define INTEL_FIT_TYPE_PLATFORM_BOOT_POLICY 0x04
//#define INTEL_FIT_TYPE_INTEL_RESERVED_05 0x05 //#define INTEL_FIT_TYPE_INTEL_RESERVED_05 0x05
//#define INTEL_FIT_TYPE_INTEL_RESERVED_06 0x06 #define INTEL_FIT_TYPE_FIT_RESET_STATE 0x06
#define INTEL_FIT_TYPE_BIOS_STARTUP_MODULE 0x07 #define INTEL_FIT_TYPE_BIOS_STARTUP_MODULE 0x07
#define INTEL_FIT_TYPE_TPM_POLICY 0x08 #define INTEL_FIT_TYPE_TPM_POLICY 0x08
#define INTEL_FIT_TYPE_BIOS_POLICY 0x09 #define INTEL_FIT_TYPE_BIOS_POLICY 0x09
#define INTEL_FIT_TYPE_TXT_POLICY 0x0A #define INTEL_FIT_TYPE_TXT_POLICY 0x0A
#define INTEL_FIT_TYPE_BOOT_GUARD_KEY_MANIFEST 0x0B #define INTEL_FIT_TYPE_BOOT_GUARD_KEY_MANIFEST 0x0B
#define INTEL_FIT_TYPE_BOOT_GUARD_BOOT_POLICY 0x0C #define INTEL_FIT_TYPE_BOOT_GUARD_BOOT_POLICY 0x0C
//#define INTEL_FIT_TYPE_INTEL_RESERVED_0D 0x0D //#define INTEL_FIT_TYPE_INTEL_RESERVED_0D 0x0D
//#define INTEL_FIT_TYPE_INTEL_RESERVED_0E 0x0E //#define INTEL_FIT_TYPE_INTEL_RESERVED_0E 0x0E
//#define INTEL_FIT_TYPE_INTEL_RESERVED_0F 0x0F //#define INTEL_FIT_TYPE_INTEL_RESERVED_0F 0x0F
#define INTEL_FIT_TYPE_CSE_SECURE_BOOT 0x10 #define INTEL_FIT_TYPE_CSE_SECURE_BOOT 0x10
//#define INTEL_FIT_TYPE_INTEL_RESERVED_11 0x11 //#define INTEL_FIT_TYPE_INTEL_RESERVED_11 0x11
//... //...
//#define INTEL_FIT_TYPE_INTEL_RESERVED_2C 0x2C //#define INTEL_FIT_TYPE_INTEL_RESERVED_19 0x19
#define INTEL_FIT_TYPE_ACM_FEATURE_POLICY 0x2D #define INTEL_FIT_TYPE_VAB_PROVISIONING_TABLE 0x1A
//#define INTEL_FIT_TYPE_INTEL_RESERVED_2E 0x2E #define INTEL_FIT_TYPE_VAB_KEY_MANIFEST 0x1B
#define INTEL_FIT_TYPE_JMP_DEBUG_POLICY 0x2F #define INTEL_FIT_TYPE_VAB_IMAGE_MANIFEST 0x1C
#define INTEL_FIT_TYPE_OEM_RESERVED_30 0x30 #define INTEL_FIT_TYPE_VAB_IMAGE_HASH_DESCRIPTORS 0x1D
//#define INTEL_FIT_TYPE_INTEL_RESERVED_1E 0x1E
//... //...
#define INTEL_FIT_TYPE_OEM_RESERVED_70 0x70 //#define INTEL_FIT_TYPE_INTEL_RESERVED_2B 0x2B
//#define INTEL_FIT_TYPE_INTEL_RESERVED_71 0x71 #define INTEL_FIT_TYPE_SACM_DEBUG_RECORD 0x2C
#define INTEL_FIT_TYPE_ACM_FEATURE_POLICY 0x2D
#define INTEL_FIT_TYPE_SCRTM_ERROR_RECORD 0x2E
#define INTEL_FIT_TYPE_JMP_DEBUG_POLICY 0x2F
#define INTEL_FIT_TYPE_OEM_RESERVED_30 0x30
//... //...
//#define INTEL_FIT_TYPE_INTEL_RESERVED_7E 0x7E #define INTEL_FIT_TYPE_OEM_RESERVED_70 0x70
#define INTEL_FIT_TYPE_EMPTY 0x7F //#define INTEL_FIT_TYPE_INTEL_RESERVED_71 0x71
//...
//#define INTEL_FIT_TYPE_INTEL_RESERVED_7E 0x7E
#define INTEL_FIT_TYPE_EMPTY 0x7F
typedef struct INTEL_FIT_ENTRY_ { typedef struct INTEL_FIT_ENTRY_ {
UINT64 Address; // Base address of the component, must be 16-byte aligned UINT64 Address; // Base address of the component, must be 16-byte aligned
@ -66,15 +74,15 @@ typedef struct INTEL_FIT_ENTRY_ {
} INTEL_FIT_ENTRY; } INTEL_FIT_ENTRY;
// //
// FIT Header // FIT Header (0x00)
// //
// Can be exactly one entry of this type, the first one. // Can be exactly one entry of this type, the first one.
// If ChecksumValid bit is set, the whole FIT table must checksum8 to zero. // If ChecksumValid bit is set, the whole FIT table must checksum8 to zero.
// Version must be 0x0100
#define INTEL_FIT_SIGNATURE 0x2020205F5449465FULL // '_FIT_ ' #define INTEL_FIT_SIGNATURE 0x2020205F5449465FULL // '_FIT_ '
#define INTEL_FIT_HEADER_VERSION 0x0100
// //
// Microcode // Microcode (0x01)
// //
// At least one entry is required, more is optional // At least one entry is required, more is optional
// Each entry must point to a valid base address // Each entry must point to a valid base address
@ -85,7 +93,7 @@ typedef struct INTEL_FIT_ENTRY_ {
// Size is not used, should be set to 0 // Size is not used, should be set to 0
// //
// Startup Authenticated Code Module // Startup Authenticated Code Module (0x02)
// //
// Optional, required for AC boot and BootGuard // Optional, required for AC boot and BootGuard
// Address must point to a valid base address // Address must point to a valid base address
@ -97,34 +105,11 @@ typedef struct INTEL_FIT_ENTRY_ {
// Authenticated Code Execution Area (ACEA) and should not contain any code or data that is not the Startup ACM itself // Authenticated Code Execution Area (ACEA) and should not contain any code or data that is not the Startup ACM itself
// ChecksumValid bit must be 0 // ChecksumValid bit must be 0
// Size is not used, should be set to 0 // Size is not used, should be set to 0
#define INTEL_FIT_STARTUP_ACM_VERSION 0x0100 // Version must be 0x0100
#define INTEL_ACM_HARDCODED_RSA_EXPONENT 0x10001 #define INTEL_ACM_HARDCODED_RSA_EXPONENT 0x10001
// //
// Diagnostic Authenticated Code Module // TPM Boot Policy (0x08)
//
// Optional
// Address must point to a valid base address
// Points to the first byte of ACM header, that must be 4Kb-aligned
// ChecksumValid bit must be 0
// Size is not used, should be set to 0
#define INTEL_FIT_DIAG_ACM_VERSION 0x0100
//
// BIOS Startup Module
//
// Optional, used for legacy TXT FIT boot
// Address must point to a valid base address
// At least one entry of this type must point to an item containing the reset vector
// At least one entry of this type must point to an item containing the FIT pointer
// No entries of this type can point to an item containing an item pointed by INTEL_FIT_TYPE_BIOS_POLICY entry
// Items pointed by entries of this type can not overlap with one another or the Startup ACM
// ChecksumValid bit must be 0
// Size is used and in 16-byte multiples
#define INTEL_FIT_BIOS_STARTUP_MODULE_VERSION 0x0100
//
// TPM Boot Policy
// //
// Optional, used for legacy TXT FIT boot, if used, can be only one // Optional, used for legacy TXT FIT boot, if used, can be only one
// Address entry is INTEL_FIT_POLICY_PTR.IndexIo if Version is 0, // Address entry is INTEL_FIT_POLICY_PTR.IndexIo if Version is 0,
@ -152,52 +137,13 @@ typedef union INTEL_FIT_POLICY_PTR_ {
#define INTEL_FIT_POLICY_ENABLED 1 #define INTEL_FIT_POLICY_ENABLED 1
// //
// BIOS Policy // CSE SecureBoot (0x10)
//
// Optional, used for legacy TXT FIT boot, if used, can be only one
// Address must point to a valid base address
// Points to the first byte of LCP_POLICY_DATA structure
// ChecksumValid bit must be 0
// Size must not be less than the size of LCP_POLICY_DATA structure
#define INTEL_FIT_BIOS_POLICY_VERSION 0x0100
//
// TXT Boot Policy
//
// Optional, if used, can be only one
// Address entry is INTEL_FIT_POLICY_PTR.IndexIo if Version is 0,
// or INTEL_FIT_INDEX_IO_ADDRESS.FlatMemoryAddress if Version is 1
// Bit 0 at the pointed address holds the TXT policy, 0 - TXT disabled, 1 - TXT enabled
// ChecksumValid bit must be 0
// Size is not used, should be set to 0
//
// BootGuard Key Manifest
//
// Optional, can be multiple, entries must be grouped together
// Address must point to a valid base address
// ChecksumValid bit must be 0
// Size must not be less than the size of INTEL_BOOT_GUARD_KEY_MANIFEST structure
#define INTEL_FIT_BOOT_GUARD_KEY_MANIFEST_VERSION 0x0100
//
// BootGuard Boot Policy Manifest
//
// Optional, can be multiple, only the first one will be used
// Address must point to a valid base address
// ChecksumValid bit must be 0
// Size must not be less than the size of INTEL_BOOT_GUARD_BOOT_POLICY structure
#define INTEL_FIT_BOOT_GUARD_KEY_MANIFEST_VERSION 0x0100
//
// CSE SecureBoot
// //
// Optional, can be multiple, order is not important // Optional, can be multiple, order is not important
// If present, BootGuardKeyManifest and BootGuardBootPolicy should also be present // If present, BootGuardKeyManifest and BootGuardBootPolicy should also be present
// Reserved field further dermines the subtype of this entry // Reserved field further determines the subtype of this entry
// ChecksumValid bit must be 0 // ChecksumValid bit must be 0
#define INTEL_FIT_CSE_SECURE_BOOT_VERSION 0x0100 // Version must be 0x0100
#define INTEL_FIT_CSE_SECURE_BOOT_RESERVED 0 #define INTEL_FIT_CSE_SECURE_BOOT_RESERVED 0
#define INTEL_FIT_CSE_SECURE_BOOT_KEY_HASH 1 #define INTEL_FIT_CSE_SECURE_BOOT_KEY_HASH 1
@ -214,13 +160,6 @@ typedef union INTEL_FIT_POLICY_PTR_ {
#define INTEL_FIT_CSE_SECURE_BOOT_FIT_PATCH_MANIFEST 12 #define INTEL_FIT_CSE_SECURE_BOOT_FIT_PATCH_MANIFEST 12
#define INTEL_FIT_CSE_SECURE_BOOT_AC_MODULE_MANIFEST 13 #define INTEL_FIT_CSE_SECURE_BOOT_AC_MODULE_MANIFEST 13
//
// ACM Feature Policy Record
//
// Optional, can be multiple
// ChecksumValid bit must be 0
#define INTEL_FIT_ACM_FEATURE_POLICY_VERSION 0x0100
#pragma pack(pop) #pragma pack(pop)
#endif // INTEL_FIT_H #endif // INTEL_FIT_H

41
common/types.cpp
View File

@ -79,7 +79,7 @@ UString itemTypeToUString(const UINT8 type)
case Types::CpdPartition: return UString("CPD partition"); case Types::CpdPartition: return UString("CPD partition");
case Types::CpdExtension: return UString("CPD extension"); case Types::CpdExtension: return UString("CPD extension");
case Types::CpdSpiEntry: return UString("CPD SPI entry"); case Types::CpdSpiEntry: return UString("CPD SPI entry");
case Types::StartupApDataEntry: return UString("Startup AP data"); case Types::StartupApDataEntry: return UString("Startup AP data");
} }
return usprintf("Unknown %02Xh", type); return usprintf("Unknown %02Xh", type);
@ -182,6 +182,9 @@ UString compressionTypeToUString(const UINT8 algorithm)
case COMPRESSION_ALGORITHM_UNDECIDED: return UString("Undecided Tiano/EFI 1.1"); case COMPRESSION_ALGORITHM_UNDECIDED: return UString("Undecided Tiano/EFI 1.1");
case COMPRESSION_ALGORITHM_LZMA: return UString("LZMA"); case COMPRESSION_ALGORITHM_LZMA: return UString("LZMA");
case COMPRESSION_ALGORITHM_LZMA_INTEL_LEGACY: return UString("Intel legacy LZMA"); case COMPRESSION_ALGORITHM_LZMA_INTEL_LEGACY: return UString("Intel legacy LZMA");
case COMPRESSION_ALGORITHM_LZMAF86: return UString("LZMAF86");
case COMPRESSION_ALGORITHM_GZIP: return UString("GZip");
case COMPRESSION_ALGORITHM_ZLIB: return UString("Zlib");
} }
return usprintf("Unknown %02Xh", algorithm); return usprintf("Unknown %02Xh", algorithm);
@ -205,20 +208,28 @@ UString actionTypeToUString(const UINT8 action)
UString fitEntryTypeToUString(const UINT8 type) UString fitEntryTypeToUString(const UINT8 type)
{ {
switch (type & 0x7F) { switch (type & 0x7F) {
case INTEL_FIT_TYPE_HEADER: return UString("FIT Header"); case INTEL_FIT_TYPE_HEADER: return UString("FIT Header");
case INTEL_FIT_TYPE_MICROCODE: return UString("Microcode"); case INTEL_FIT_TYPE_MICROCODE: return UString("Microcode");
case INTEL_FIT_TYPE_STARTUP_AC_MODULE: return UString("Startup ACM"); case INTEL_FIT_TYPE_STARTUP_AC_MODULE: return UString("Startup ACM");
case INTEL_FIT_TYPE_DIAG_AC_MODULE: return UString("Diagnostic ACM"); case INTEL_FIT_TYPE_DIAG_AC_MODULE: return UString("Diagnostic ACM");
case INTEL_FIT_TYPE_BIOS_STARTUP_MODULE: return UString("BIOS Startup Module"); case INTEL_FIT_TYPE_PLATFORM_BOOT_POLICY: return UString("Platform Boot Policy");
case INTEL_FIT_TYPE_TPM_POLICY: return UString("TPM Policy"); case INTEL_FIT_TYPE_FIT_RESET_STATE: return UString("FIT Reset State");
case INTEL_FIT_TYPE_BIOS_POLICY: return UString("BIOS Policy"); case INTEL_FIT_TYPE_BIOS_STARTUP_MODULE: return UString("BIOS Startup Module");
case INTEL_FIT_TYPE_TXT_POLICY: return UString("TXT Policy"); case INTEL_FIT_TYPE_TPM_POLICY: return UString("TPM Policy");
case INTEL_FIT_TYPE_BOOT_GUARD_KEY_MANIFEST: return UString("BootGuard Key Manifest"); case INTEL_FIT_TYPE_BIOS_POLICY: return UString("BIOS Policy");
case INTEL_FIT_TYPE_BOOT_GUARD_BOOT_POLICY: return UString("BootGuard Boot Policy"); case INTEL_FIT_TYPE_TXT_POLICY: return UString("TXT Policy");
case INTEL_FIT_TYPE_CSE_SECURE_BOOT: return UString("CSE SecureBoot Settings"); case INTEL_FIT_TYPE_BOOT_GUARD_KEY_MANIFEST: return UString("BootGuard Key Manifest");
case INTEL_FIT_TYPE_ACM_FEATURE_POLICY: return UString("ACM Feature Policy"); case INTEL_FIT_TYPE_BOOT_GUARD_BOOT_POLICY: return UString("BootGuard Boot Policy");
case INTEL_FIT_TYPE_JMP_DEBUG_POLICY: return UString("JMP Debug Policy"); case INTEL_FIT_TYPE_CSE_SECURE_BOOT: return UString("CSE SecureBoot Settings");
case INTEL_FIT_TYPE_EMPTY: return UString("Empty"); case INTEL_FIT_TYPE_VAB_PROVISIONING_TABLE: return UString("VAB Provisioning Table");
case INTEL_FIT_TYPE_VAB_KEY_MANIFEST: return UString("VAB Key Manifest");
case INTEL_FIT_TYPE_VAB_IMAGE_MANIFEST: return UString("VAB Image Manifest");
case INTEL_FIT_TYPE_VAB_IMAGE_HASH_DESCRIPTORS: return UString("VAB Image Hash Descriptors");
case INTEL_FIT_TYPE_SACM_DEBUG_RECORD: return UString("SACM Debug Record");
case INTEL_FIT_TYPE_ACM_FEATURE_POLICY: return UString("ACM Feature Policy");
case INTEL_FIT_TYPE_SCRTM_ERROR_RECORD: return UString("SCRTM Error Record");
case INTEL_FIT_TYPE_JMP_DEBUG_POLICY: return UString("JMP Debug Policy");
case INTEL_FIT_TYPE_EMPTY: return UString("Empty");
} }
return usprintf("Unknown %02Xh", (type & 0x7F)); return usprintf("Unknown %02Xh", (type & 0x7F));