Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 873ec746 authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Linus Torvalds
Browse files

EFI: warn only for pre-1.00 system tables 



We used to warn unless the EFI system table major revision was exactly 1.
But EFI 2.00 firmware is starting to appear, and the 2.00 changes don't
affect anything in Linux.

Signed-off-by: default avatarBjorn Helgaas <bjorn.helgaas@hp.com>
Cc: Andi Kleen <ak@suse.de>
Cc: "Luck, Tony" <tony.luck@intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent f038f9a3

arch/i386/kernel/efi.c

+5 −7
Original line number Diff line number Diff line
@@ -347,14 +347,12 @@ void __init efi_init(void) 
		printk(KERN_ERR PFX "Woah! Couldn't map the EFI system table.\n");

	if (efi.systab->hdr.signature != EFI_SYSTEM_TABLE_SIGNATURE)

		printk(KERN_ERR PFX "Woah! EFI system table signature incorrect\n");

	if ((efi.systab->hdr.revision ^ EFI_SYSTEM_TABLE_REVISION) >> 16 != 0)

		printk(KERN_ERR PFX

		       "Warning: EFI system table major version mismatch: "

		       "got %d.%02d, expected %d.%02d\n",

	if ((efi.systab->hdr.revision >> 16) == 0)

		printk(KERN_ERR PFX "Warning: EFI system table version "

		       "%d.%02d, expected 1.00 or greater\n",

		       efi.systab->hdr.revision >> 16,

		       efi.systab->hdr.revision & 0xffff,

		       EFI_SYSTEM_TABLE_REVISION >> 16,

		       EFI_SYSTEM_TABLE_REVISION & 0xffff);

		       efi.systab->hdr.revision & 0xffff);



	/*

	 * Grab some details from the system table

	 */

arch/ia64/hp/sim/boot/fw-emu.c

+1 −1
Original line number Diff line number Diff line
@@ -287,7 +287,7 @@ sys_fw_init (const char *args, int arglen) 


	memset(efi_systab, 0, sizeof(efi_systab));

	efi_systab->hdr.signature = EFI_SYSTEM_TABLE_SIGNATURE;

	efi_systab->hdr.revision  = EFI_SYSTEM_TABLE_REVISION;

	efi_systab->hdr.revision  = ((1 << 16) | 00);

	efi_systab->hdr.headersize = sizeof(efi_systab->hdr);

	efi_systab->fw_vendor = __pa("H\0e\0w\0l\0e\0t\0t\0-\0P\0a\0c\0k\0a\0r\0d\0\0");

	efi_systab->fw_revision = 1;

arch/ia64/kernel/efi.c

+5 −5
Original line number Diff line number Diff line
@@ -445,11 +445,11 @@ efi_init (void) 
		panic("Woah! Can't find EFI system table.\n");

	if (efi.systab->hdr.signature != EFI_SYSTEM_TABLE_SIGNATURE)

		panic("Woah! EFI system table signature incorrect\n");

	if ((efi.systab->hdr.revision ^ EFI_SYSTEM_TABLE_REVISION) >> 16 != 0)

		printk(KERN_WARNING "Warning: EFI system table major version mismatch: "

		       "got %d.%02d, expected %d.%02d\n",

		       efi.systab->hdr.revision >> 16, efi.systab->hdr.revision & 0xffff,

		       EFI_SYSTEM_TABLE_REVISION >> 16, EFI_SYSTEM_TABLE_REVISION & 0xffff);

	if ((efi.systab->hdr.revision >> 16) == 0)

		printk(KERN_WARNING "Warning: EFI system table version "

		       "%d.%02d, expected 1.00 or greater\n",

		       efi.systab->hdr.revision >> 16,

		       efi.systab->hdr.revision & 0xffff);



	config_tables = __va(efi.systab->tables);

include/linux/efi.h

+0 −1
Original line number Diff line number Diff line
@@ -213,7 +213,6 @@ typedef struct { 
} efi_config_table_t;



#define EFI_SYSTEM_TABLE_SIGNATURE ((u64)0x5453595320494249ULL)

#define EFI_SYSTEM_TABLE_REVISION  ((1 << 16) | 00)



typedef struct {

	efi_table_hdr_t hdr;