Skip to contentSkip to conversation

don't taint UP K7's running SMP kernels.

PATCH Dave Jones 3 participants 4 messages Aug 3, 2006 – Aug 4, 2006

lore
Share & tools
lore

Dave Jones

author
#0 lore raw

We have a test that looks for invalid pairings of certain athlon/durons that weren't designed for SMP, and taint accordingly (with 'S') if we find such a configuration. However, this test shouldn't fire if there's only a single CPU present. It's perfectly valid for an SMP kernel to boot on UP hardware for example.

arch/i386/kernel/smpboot.c renamed from arch/i386/kernel/smpboot.c~ +3 -0
@@ -177,6 +177,9 @@ static void __devinit smp_store_cpu_info
 	 */
 	if ((c->x86_vendor == X86_VENDOR_AMD) && (c->x86 == 6)) {
 
+		if (num_online_cpus() == 1)
+			goto valid_k7;
+
 		/* Athlon 660/661 is valid. */	
 		if ((c->x86_model==6) && ((c->x86_mask==0) || (c->x86_mask==1)))
 			goto valid_k7;
Signature · 1 line
http://www.codemonkey.org.uk
Acked-by
#1 lore raw

Ar Iau, 2006-08-03 am 14:32 -0400, ysgrifennodd Dave Jones:

Quoted 11 lines

We have a test that looks for invalid pairings of certain athlon/durons that weren't designed for SMP, and taint accordingly (with 'S') if we find such a configuration. However, this test shouldn't fire if there's only a single CPU present. It's perfectly valid for an SMP kernel to boot on UP hardware for example.

arch/i386/kernel/smpboot.c static void __devinit smp_store_cpu_info · line 185

Quoted 9 lines
arch/i386/kernel/smpboot.c renamed from arch/i386/kernel/smpboot.c~ +3 -0
@@ -177,6 +177,9 @@ static void __devinit smp_store_cpu_info
 	 */
 	if ((c->x86_vendor == X86_VENDOR_AMD) && (c->x86 == 6)) {
 
+		if (num_online_cpus() == 1)
+			goto valid_k7;
+
 		/* Athlon 660/661 is valid. */	
 		if ((c->x86_model==6) && ((c->x86_mask==0) || (c->x86_mask==1)))
 			goto valid_k7;
#2 lore raw
In reply to Dave Jones
Quoted 5 lines · Dave Jones

We have a test that looks for invalid pairings of certain athlon/durons that weren't designed for SMP, and taint accordingly (with 'S') if we find such a configuration. However, this test shouldn't fire if there's only a single CPU present. It's perfectly valid for an SMP kernel to boot on UP hardware for example.

I added it to the x86-64 tree.

-Andi

#3 lore raw

Re: don't taint UP K7's running SMP kernels. II

In reply to Dave Jones
Quoted 5 lines · Dave Jones

We have a test that looks for invalid pairings of certain athlon/durons that weren't designed for SMP, and taint accordingly (with 'S') if we find such a configuration. However, this test shouldn't fire if there's only a single CPU present. It's perfectly valid for an SMP kernel to boot on UP hardware for example.

Actually the test should be for num_possible_cpus() I fixed this.

-Andi