mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-30 22:26:55 +00:00
efi: Use standard format for printing the EFI revision
The UEFI spec section 4.2.1 describes the way the human readable EFI revision should be constructed from the 32-bit revision field in the system table: The upper 16 bits of this field contain the major revision value, and the lower 16 bits contain the minor revision value. The minor revision values are binary coded decimals and are limited to the range of 00..99. When printed or displayed UEFI spec revision is referred as (Major revision).(Minor revision upper decimal).(Minor revision lower decimal) or (Major revision).(Minor revision upper decimal) in case Minor revision lower decimal is set to 0. Let's adhere to this when logging the EFI revision to the kernel log. Note that the bit about binary coded decimals is bogus, and the minor revision lower decimal is simply the minor revision modulo 10, given the symbolic definitions provided by the spec itself: #define EFI_2_40_SYSTEM_TABLE_REVISION ((2<<16) | (40)) #define EFI_2_31_SYSTEM_TABLE_REVISION ((2<<16) | (31)) #define EFI_2_30_SYSTEM_TABLE_REVISION ((2<<16) | (30)) Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
This commit is contained in:
parent
234fa51db9
commit
1758817e7e
1 changed files with 9 additions and 4 deletions
|
@ -796,6 +796,7 @@ void __init efi_systab_report_header(const efi_table_hdr_t *systab_hdr,
|
||||||
char vendor[100] = "unknown";
|
char vendor[100] = "unknown";
|
||||||
const efi_char16_t *c16;
|
const efi_char16_t *c16;
|
||||||
size_t i;
|
size_t i;
|
||||||
|
u16 rev;
|
||||||
|
|
||||||
c16 = map_fw_vendor(fw_vendor, sizeof(vendor) * sizeof(efi_char16_t));
|
c16 = map_fw_vendor(fw_vendor, sizeof(vendor) * sizeof(efi_char16_t));
|
||||||
if (c16) {
|
if (c16) {
|
||||||
|
@ -806,10 +807,14 @@ void __init efi_systab_report_header(const efi_table_hdr_t *systab_hdr,
|
||||||
unmap_fw_vendor(c16, sizeof(vendor) * sizeof(efi_char16_t));
|
unmap_fw_vendor(c16, sizeof(vendor) * sizeof(efi_char16_t));
|
||||||
}
|
}
|
||||||
|
|
||||||
pr_info("EFI v%u.%.02u by %s\n",
|
rev = (u16)systab_hdr->revision;
|
||||||
systab_hdr->revision >> 16,
|
pr_info("EFI v%u.%u", systab_hdr->revision >> 16, rev / 10);
|
||||||
systab_hdr->revision & 0xffff,
|
|
||||||
vendor);
|
rev %= 10;
|
||||||
|
if (rev)
|
||||||
|
pr_cont(".%u", rev);
|
||||||
|
|
||||||
|
pr_cont(" by %s\n", vendor);
|
||||||
|
|
||||||
if (IS_ENABLED(CONFIG_X86_64) &&
|
if (IS_ENABLED(CONFIG_X86_64) &&
|
||||||
systab_hdr->revision > EFI_1_10_SYSTEM_TABLE_REVISION &&
|
systab_hdr->revision > EFI_1_10_SYSTEM_TABLE_REVISION &&
|
||||||
|
|
Loading…
Reference in a new issue