public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [GIT PULL] x86 fixes for 3.9
@ 2013-04-25 21:44 H. Peter Anvin
  2013-04-25 22:20 ` Linus Torvalds
  0 siblings, 1 reply; 13+ messages in thread
From: H. Peter Anvin @ 2013-04-25 21:44 UTC (permalink / raw)
  To: Linus Torvalds
  Cc: Borislav Petkov, H. Peter Anvin, H. Peter Anvin, Ingo Molnar,
	Josh Boyer, Linux Kernel Mailing List, Matt Fleming,
	Matthew Garrett, Paul Bolle, Thomas Gleixner

Hi Linus,

The following changes since commit 0fbd06761f5c17cc9b20e02af60fd7ee9c895996:

  Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc (2013-04-24 17:10:18 -0700)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-urgent-for-linus

This is exclusively two EFI fixes:

 * The EFI variable anti-bricking algorithm merged in -rc8 broke
   booting on some Apple machines because they implement EFI spec
   1.10, which doesn't provide a QueryVariableInfo() runtime function
   and the logic used to check for the existence of that function was
   insufficient.  Fix from Josh Boyer.

 * The anti-bricking algorithm also introduced a compiler warning on
   32-bit. Fix from Borislav Petkov.

----------------------------------------------------------------

Borislav Petkov (1):
      x86, efi: Fix a build warning

H. Peter Anvin (1):
      Merge tag 'efi-urgent' into x86/urgent

Josh Boyer (1):
      efi: Check EFI revision in setup_efi_vars

 arch/x86/boot/compressed/eboot.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/x86/boot/compressed/eboot.c b/arch/x86/boot/compressed/eboot.c
index 8615f75..35ee62f 100644
--- a/arch/x86/boot/compressed/eboot.c
+++ b/arch/x86/boot/compressed/eboot.c
@@ -258,7 +258,7 @@ static efi_status_t setup_efi_vars(struct boot_params *params)
 	u64 store_size, remaining_size, var_size;
 	efi_status_t status;
 
-	if (!sys_table->runtime->query_variable_info)
+	if (sys_table->runtime->hdr.revision < EFI_2_00_SYSTEM_TABLE_REVISION)
 		return EFI_UNSUPPORTED;
 
 	data = (struct setup_data *)(unsigned long)params->hdr.setup_data;
@@ -266,7 +266,7 @@ static efi_status_t setup_efi_vars(struct boot_params *params)
 	while (data && data->next)
 		data = (struct setup_data *)(unsigned long)data->next;
 
-	status = efi_call_phys4(sys_table->runtime->query_variable_info,
+	status = efi_call_phys4((void *)sys_table->runtime->query_variable_info,
 				EFI_VARIABLE_NON_VOLATILE |
 				EFI_VARIABLE_BOOTSERVICE_ACCESS |
 				EFI_VARIABLE_RUNTIME_ACCESS, &store_size,

^ permalink raw reply related	[flat|nested] 13+ messages in thread

end of thread, other threads:[~2013-04-26  9:44 UTC | newest]

Thread overview: 13+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-04-25 21:44 [GIT PULL] x86 fixes for 3.9 H. Peter Anvin
2013-04-25 22:20 ` Linus Torvalds
2013-04-25 22:23   ` Matthew Garrett
2013-04-25 22:53     ` Michel Lespinasse
2013-04-25 22:54       ` H. Peter Anvin
2013-04-25 23:11         ` Michel Lespinasse
2013-04-26  7:12           ` Matt Fleming
2013-04-26  7:43             ` Michel Lespinasse
2013-04-26  8:49               ` Matt Fleming
2013-04-26  9:02                 ` Michel Lespinasse
2013-04-26  9:44                   ` Matt Fleming
2013-04-26  7:29     ` Ingo Molnar
2013-04-26  9:01       ` Matt Fleming

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox