Skip to contentSkip to conversation

x86 fixes for v3.14-rc6 - bad patch dropped

GIT PULL H. Peter Anvin 2 participants 3 messages Mar 10, 2014

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

Hi Linus,

The same collection of fixes except the broken NMI patch dropped. I will send a fixed version of that plus Suresh' FPU fix in a few days, to get them some testing, plus I will be on a trip (part of why I got unduly rushed this past Friday. Sorry again for that.)

The following changes since commit 0414855fdc4a40da05221fc6062cccbc0c30f169:

Linux 3.14-rc5 (2014-03-02 18:56:16 -0800)

are available in the git repository at:

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

for you to fetch changes up to d4078e232267ff53f3b030b9698a3c001db4dbec:

x86, trace: Further robustify CR2 handling vs tracing (2014-03-06 10:58:18 -0800)

----------------------------------------------------------------
Borislav Petkov (1):
x86/efi: Quirk out SGI UV

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

Jiri Olsa (1):
x86, trace: Fix CR2 corruption when tracing page faults

Peter Zijlstra (1):
x86, trace: Further robustify CR2 handling vs tracing

 arch/x86/include/asm/efi.h  |  1 +
 arch/x86/kernel/setup.c     | 10 ++--------
 arch/x86/mm/fault.c         | 47 +++++++++++++++++++++++++++++++--------------
 arch/x86/platform/efi/efi.c | 20 +++++++++++++++++++
 4 files changed, 56 insertions(+), 22 deletions(-)
arch/x86/include/asm/efi.h +1 -0
index 3d6b9f81cc68..acd86c850414 100644
@@ -134,6 +134,7 @@ extern void efi_setup_page_tables(void);
 extern void __init old_map_region(efi_memory_desc_t *md);
 extern void __init runtime_code_page_mkexec(void);
 extern void __init efi_runtime_mkexec(void);
+extern void __init efi_apply_memmap_quirks(void);
 
 struct efi_setup_data {
 	u64 fw_vendor;
arch/x86/kernel/setup.c +2 -8
index 06853e670354..ce72964b2f46 100644
@@ -1239,14 +1239,8 @@ void __init setup_arch(char **cmdline_p)
 	register_refined_jiffies(CLOCK_TICK_RATE);
 
 #ifdef CONFIG_EFI
-	/* Once setup is done above, unmap the EFI memory map on
-	 * mismatched firmware/kernel archtectures since there is no
-	 * support for runtime services.
-	 */
-	if (efi_enabled(EFI_BOOT) && !efi_is_native()) {
-		pr_info("efi: Setup done, disabling due to 32/64-bit mismatch\n");
-		efi_unmap_memmap();
-	}
+	if (efi_enabled(EFI_BOOT))
+		efi_apply_memmap_quirks();
 #endif
 }
 
arch/x86/mm/fault.c +33 -14

87 lines not on this page · raw message

arch/x86/platform/efi/efi.c +20 -0
index 1a201ac7cef8..b97acecf3fd9 100644
@@ -52,6 +52,7 @@
 #include <asm/tlbflush.h>
 #include <asm/x86_init.h>
 #include <asm/rtc.h>
+#include <asm/uv/uv.h>
 
 #define EFI_DEBUG
 
@@ -1210,3 +1211,22 @@ static int __init parse_efi_cmdline(char *str)
 	return 0;
 }
 early_param("efi", parse_efi_cmdline);
+
+void __init efi_apply_memmap_quirks(void)
+{
+	/*
+	 * Once setup is done earlier, unmap the EFI memory map on mismatched
+	 * firmware/kernel architectures since there is no support for runtime
+	 * services.
+	 */
+	if (!efi_is_native()) {
+		pr_info("efi: Setup done, disabling due to 32/64-bit mismatch\n");
+		efi_unmap_memmap();
+	}
+
+	/*
+	 * UV doesn't support the new EFI pagetable mapping yet.
+	 */
+	if (is_uv_system())
+		set_bit(EFI_OLD_MEMMAP, &x86_efi_facility);
+}
#1 lore raw
Quoted 5 lines · H. Peter Anvin

The same collection of fixes except the broken NMI patch dropped. I will send a fixed version of that plus Suresh' FPU fix in a few days, to get them some testing, plus I will be on a trip (part of why I got unduly rushed this past Friday. Sorry again for that.)

I already pulled the broken one, and had actually pushed it out in that broken format, which was so upsetting. Normally I tend to delay pushing things out until I've done my compile tests, but I had stupidly thought I didn't need to that time.

Linus

#2 lore raw
Quoted 7 lines · Linus Torvalds
Quoted 5 lines · H. Peter Anvin

The same collection of fixes except the broken NMI patch dropped. I will send a fixed version of that plus Suresh' FPU fix in a few days, to get them some testing, plus I will be on a trip (part of why I got unduly rushed this past Friday. Sorry again for that.)

Quoted 5 lines

I already pulled the broken one, and had actually pushed it out in that broken format, which was so upsetting. Normally I tend to delay pushing things out until I've done my compile tests, but I had stupidly thought I didn't need to that time.

So I see. Thanks and sorry again.

-hpa