Skip to contentSkip to conversation

x86 fixes

GIT PULL Ingo Molnar 3 participants 3 messages Jun 19, 2008 x86

lore
Share & tools
lore
#0 lore raw

Linus,

please pull the latest x86 fixes git tree from:

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

Thanks,

Ingo

------------------>
Bernhard Walle (1):
x86: use BOOTMEM_EXCLUSIVE on 32-bit

Jeremy Fitzhardinge (1):
x86: set PAE PHYSICAL_MASK_SHIFT to 44 bits.

Jordan Crouse (1):
x86, geode: add a VSA2 ID for General Software

Mikael Pettersson (1):
x86, 32-bit: fix boot failure on TSC-less processors

Suresh Siddha (1):
x86: fix NULL pointer deref in __switch_to

 arch/x86/kernel/geode_32.c   |    5 ++++-
 arch/x86/kernel/process_32.c |    1 +
 arch/x86/kernel/process_64.c |    1 +
 arch/x86/kernel/setup_32.c   |   10 ++++++++--
 arch/x86/kernel/tsc_32.c     |   18 ++++++++----------
 include/asm-x86/geode.h      |    4 ++--
 include/asm-x86/page_32.h    |    3 ++-
 7 files changed, 26 insertions(+), 16 deletions(-)
arch/x86/kernel/geode_32.c +4 -1
index e8edd63..9b08e85 100644
@@ -166,6 +166,8 @@ int geode_has_vsa2(void)
 	static int has_vsa2 = -1;
 
 	if (has_vsa2 == -1) {
+		u16 val;
+
 		/*
 		 * The VSA has virtual registers that we can query for a
 		 * signature.
@@ -173,7 +175,8 @@ int geode_has_vsa2(void)
 		outw(VSA_VR_UNLOCK, VSA_VRC_INDEX);
 		outw(VSA_VR_SIGNATURE, VSA_VRC_INDEX);
 
-		has_vsa2 = (inw(VSA_VRC_DATA) == VSA_SIG);
+		val = inw(VSA_VRC_DATA);
+		has_vsa2 = (val == AMD_VSA_SIG || val == GSW_VSA_SIG);
 	}
 
 	return has_vsa2;
arch/x86/kernel/process_32.c +1 -0
index 6d54833..e2db9ac 100644
@@ -333,6 +333,7 @@ void flush_thread(void)
 	/*
 	 * Forget coprocessor state..
 	 */
+	tsk->fpu_counter = 0;
 	clear_fpu(tsk);
 	clear_used_math();
 }
arch/x86/kernel/process_64.c +1 -0
index ac54ff5..c6eb5c9 100644
@@ -294,6 +294,7 @@ void flush_thread(void)
 	/*
 	 * Forget coprocessor state..
 	 */
+	tsk->fpu_counter = 0;
 	clear_fpu(tsk);
 	clear_used_math();
 }
arch/x86/kernel/setup_32.c +8 -2
index 2c5f8b2..5a2f8e0 100644
@@ -532,10 +532,16 @@ static void __init reserve_crashkernel(void)
 					(unsigned long)(crash_size >> 20),
 					(unsigned long)(crash_base >> 20),
 					(unsigned long)(total_mem >> 20));
+
+			if (reserve_bootmem(crash_base, crash_size,
+					BOOTMEM_EXCLUSIVE) < 0) {
+				printk(KERN_INFO "crashkernel reservation "
+					"failed - memory is in use\n");
+				return;
+			}
+
 			crashk_res.start = crash_base;
 			crashk_res.end   = crash_base + crash_size - 1;
-			reserve_bootmem(crash_base, crash_size,
-					BOOTMEM_DEFAULT);
 		} else
 			printk(KERN_INFO "crashkernel reservation failed - "
 					"you have to specify a base address\n");
arch/x86/kernel/tsc_32.c +8 -10
index 068759d..65b7063 100644
@@ -14,7 +14,10 @@
 
 #include "mach_timer.h"
 
-static int tsc_disabled;
+/* native_sched_clock() is called before tsc_init(), so
+   we must start with the TSC soft disabled to prevent
+   erroneous rdtsc usage on !cpu_has_tsc processors */
+static int tsc_disabled = -1;
 
 /*
  * On some systems the TSC frequency does not
@@ -402,25 +405,20 @@ void __init tsc_init(void)
 {
 	int cpu;
 
-	if (!cpu_has_tsc || tsc_disabled) {
-		/* Disable the TSC in case of !cpu_has_tsc */
-		tsc_disabled = 1;
+	if (!cpu_has_tsc || tsc_disabled > 0)
 		return;
-	}
 
 	cpu_khz = calculate_cpu_khz();
 	tsc_khz = cpu_khz;
 
 	if (!cpu_khz) {
 		mark_tsc_unstable("could not calculate TSC khz");
-		/*
-		 * We need to disable the TSC completely in this case
-		 * to prevent sched_clock() from using it.
-		 */
-		tsc_disabled = 1;
 		return;
 	}
 
+	/* now allow native_sched_clock() to use rdtsc */
+	tsc_disabled = 0;
+
 	printk("Detected %lu.%03lu MHz processor.\n",
 				(unsigned long)cpu_khz / 1000,
 				(unsigned long)cpu_khz % 1000);
include/asm-x86/geode.h +2 -2
index 6e64588..bb06027 100644
@@ -112,8 +112,8 @@ extern int geode_get_dev_base(unsigned int dev);
 #define VSA_VR_UNLOCK		0xFC53	/* unlock virtual register */
 #define VSA_VR_SIGNATURE	0x0003
 #define VSA_VR_MEM_SIZE		0x0200
-#define VSA_SIG			0x4132	/* signature is ascii 'VSA2' */
-
+#define AMD_VSA_SIG		0x4132	/* signature is ascii 'VSA2' */
+#define GSW_VSA_SIG		0x534d  /* General Software signature */
 /* GPIO */
 
 #define GPIO_OUTPUT_VAL		0x00
include/asm-x86/page_32.h +2 -1
index 424e82f..ccf0ba3 100644
@@ -14,7 +14,8 @@
 #define __PAGE_OFFSET		_AC(CONFIG_PAGE_OFFSET, UL)
 
 #ifdef CONFIG_X86_PAE
-#define __PHYSICAL_MASK_SHIFT	36
+/* 44=32+12, the limit we can fit into an unsigned long pfn */
+#define __PHYSICAL_MASK_SHIFT	44
 #define __VIRTUAL_MASK_SHIFT	32
 #define PAGETABLE_LEVELS	3
 
#1 lore raw

tor, 19 06 2008 kl. 17:13 +0200, skrev Ingo Molnar:

Quoted 9 lines

Linus,

please pull the latest x86 fixes git tree from:

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

Suresh Siddha (1):
x86: fix NULL pointer deref in __switch_to

Ingo, Rusty and Suresh

This doesn't contain the lguest part of the fix that Patrick and I reported were necessary to fix the problem we reported. Is this being pushed via another path?

Simon Holm Thøgersen

#2 lore raw
Quoted 8 lines · Simon Holm Thøgersen

tor, 19 06 2008 kl. 17:13 +0200, skrev Ingo Molnar:

Quoted 6 lines

Linus,

please pull the latest x86 fixes git tree from:

   git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git x86-fixes-for-linus
Quoted 8 lines
Quoted 2 lines

Suresh Siddha (1):
x86: fix NULL pointer deref in __switch_to

Ingo, Rusty and Suresh

This doesn't contain the lguest part of the fix that Patrick and I reported were necessary to fix the problem we reported. Is this being pushed via another path?

Simon, Yes. Ingo is going to push the missing pieces with another patch.

thanks,
suresh