Machine check fixes for i386/v2.5

Message ID 20020701220259.A22080@averell
State New, archived
Headers show
Series
  • Machine check fixes for i386/v2.5
Related show

Commit Message

Andi Kleen July 1, 2002, 8:02 p.m. UTC
Some fixes for CONFIG_X86_MCE_NONFATAL

Calling smp_call_function from interrupt context is forbidden

Unless I'm mistaken it would BUG on any box with more than two CPUs because
it would expect smp_call_function callback to run only on a single CPU??

Also handle the Hammer.

Untested of course.

-Andi



-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Patch

--- linux/arch/i386/kernel/bluesmoke.c	Wed Jun 19 07:38:18 2002
+++ linux-2.5.24-work/arch/i386/kernel/bluesmoke.c	Mon Jul  1 21:58:22 2002
@@ -273,9 +273,6 @@ 
 {
 	u32 low, high;
 	int i;
-	unsigned int *cpu = info;
-
-	BUG_ON (*cpu != smp_processor_id());
 
 	for (i=0; i<banks; i++) {
 		rdmsr(MSR_IA32_MC0_STATUS+i*4, low, high);
@@ -293,24 +290,32 @@ 
 	}
 }
 
+static struct tq_struct mce_task = { 
+	routine: do_mce_timer	
+};
+
+static void do_mce_timer(void *data)
+{ 
+	preempt_disable(); 
+	mce_checkregs(NULL);
+	smp_call_function (mce_checkregs, NULL, 1, 1);
+	preempt_enable();
+	mce_timer.expires = jiffies + MCE_RATE;
+	add_timer (&mce_timer);
+} 
 
 static void mce_timerfunc (unsigned long data)
 {
-	unsigned int i;
-
-	for (i=0; i<NR_CPUS; i++) {
-		if (!cpu_online(i))
-			continue;
-		if (i == smp_processor_id())
-			mce_checkregs(&i);
-		else
-			smp_call_function (mce_checkregs, &i, 1, 1);
+#ifdef CONFIG_SMP
+	if (num_online_cpus() > 1) { 
+		schedule_task(&mce_task); 
+		return;
 	}
-
-	/* Refresh the timer. */
+#endif
+	mce_checkregs(NULL);
 	mce_timer.expires = jiffies + MCE_RATE;
 	add_timer (&mce_timer);
-}
+}	
 #endif
 
 
@@ -446,7 +451,7 @@ 
 	{
 		case X86_VENDOR_AMD:
 			/* AMD K7 machine check is Intel like */
-			if(c->x86 == 6) {
+			if(c->x86 == 6 || c->x86 == 15) {
 				intel_mcheck_init(c);
 #ifdef CONFIG_X86_MCE_NONFATAL
 				if (timerset == 0) {