[kernel] r19818 - in dists/sid/linux/debian: . patches patches/bugfix/x86

[Ben Hutchings]

Author: benh
Date: Fri Feb 15 01:40:36 2013
New Revision: 19818

Log:
[x86] efi: Clear EFI_RUNTIME_SERVICES rather than EFI_BOOT by "noefi" boot parameter

Added:
   dists/sid/linux/debian/patches/bugfix/x86/efi-Clear-EFI_RUNTIME_SERVICES-rather-than-EFI_BOOT-.patch
Modified:
   dists/sid/linux/debian/changelog
   dists/sid/linux/debian/patches/series

Modified: dists/sid/linux/debian/changelog
==============================================================================
--- dists/sid/linux/debian/changelog	Fri Feb 15 01:21:50 2013	(r19817)
+++ dists/sid/linux/debian/changelog	Fri Feb 15 01:40:36 2013	(r19818)
@@ -140,6 +140,8 @@
     - possible bugfix, race in lookup
     - bugfix, half refreshed iinfo
     - possible bugfix, au_lkup_by_ino() returns ESTALE
+  * [x86] efi: Clear EFI_RUNTIME_SERVICES rather than EFI_BOOT by "noefi" boot
+    parameter
 
   [ Aurelien Jarno ]
   * [armhf/vexpress] Add kernel udebs.

Added: dists/sid/linux/debian/patches/bugfix/x86/efi-Clear-EFI_RUNTIME_SERVICES-rather-than-EFI_BOOT-.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux/debian/patches/bugfix/x86/efi-Clear-EFI_RUNTIME_SERVICES-rather-than-EFI_BOOT-.patch	Fri Feb 15 01:40:36 2013	(r19818)
@@ -0,0 +1,65 @@
+From: Satoru Takeuchi <takeuchi_satoru at jp.fujitsu.com>
+Date: Thu, 14 Feb 2013 09:12:52 +0900
+Subject: efi: Clear EFI_RUNTIME_SERVICES rather than EFI_BOOT by "noefi" boot
+ parameter
+
+commit 1de63d60cd5b0d33a812efa455d5933bf1564a51 upstream.
+
+There was a serious problem in samsung-laptop that its platform driver is
+designed to run under BIOS and running under EFI can cause the machine to
+become bricked or can cause Machine Check Exceptions.
+
+    Discussion about this problem:
+    https://bugs.launchpad.net/ubuntu-cdimage/+bug/1040557
+    https://bugzilla.kernel.org/show_bug.cgi?id=47121
+
+    The patches to fix this problem:
+    efi: Make 'efi_enabled' a function to query EFI facilities
+    83e68189745ad931c2afd45d8ee3303929233e7f
+
+    samsung-laptop: Disable on EFI hardware
+    e0094244e41c4d0c7ad69920681972fc45d8ce34
+
+Unfortunately this problem comes back again if users specify "noefi" option.
+This parameter clears EFI_BOOT and that driver continues to run even if running
+under EFI. Refer to the document, this parameter should clear
+EFI_RUNTIME_SERVICES instead.
+
+Documentation/kernel-parameters.txt:
+===============================================================================
+...
+	noefi		[X86] Disable EFI runtime services support.
+...
+===============================================================================
+
+Documentation/x86/x86_64/uefi.txt:
+===============================================================================
+...
+- If some or all EFI runtime services don't work, you can try following
+  kernel command line parameters to turn off some or all EFI runtime
+  services.
+	noefi		turn off all EFI runtime services
+...
+===============================================================================
+
+Signed-off-by: Satoru Takeuchi <takeuchi_satoru at jp.fujitsu.com>
+Link: http://lkml.kernel.org/r/511C2C04.2070108@jp.fujitsu.com
+Cc: Matt Fleming <matt.fleming at intel.com>
+Signed-off-by: H. Peter Anvin <hpa at linux.intel.com>
+---
+ arch/x86/platform/efi/efi.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c
+index 77cf009..928bf83 100644
+--- a/arch/x86/platform/efi/efi.c
++++ b/arch/x86/platform/efi/efi.c
+@@ -87,7 +87,7 @@ EXPORT_SYMBOL(efi_enabled);
+ 
+ static int __init setup_noefi(char *arg)
+ {
+-	clear_bit(EFI_BOOT, &x86_efi_facility);
++	clear_bit(EFI_RUNTIME_SERVICES, &x86_efi_facility);
+ 	return 0;
+ }
+ early_param("noefi", setup_noefi);

Modified: dists/sid/linux/debian/patches/series
==============================================================================
--- dists/sid/linux/debian/patches/series	Fri Feb 15 01:21:50 2013	(r19817)
+++ dists/sid/linux/debian/patches/series	Fri Feb 15 01:40:36 2013	(r19818)
@@ -626,3 +626,4 @@
 features/all/line6/0105-staging-line6-drop-dump-requests-from-pod-startup.patch
 features/all/line6/0106-staging-line6-drop-unused-dumprequest-code.patch
 bugfix/all/mm-Try-harder-to-allocate-vmemmap-blocks.patch
+bugfix/x86/efi-Clear-EFI_RUNTIME_SERVICES-rather-than-EFI_BOOT-.patch