[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <alpine.LNX.2.00.1003311008270.24576@pobox.suse.cz>
Date: Wed, 31 Mar 2010 10:15:28 +0200 (CEST)
From: Jiri Kosina <jkosina@...e.cz>
To: Andi Kleen <andi@...stfloor.org>, Ingo Molnar <mingo@...e.hu>
Cc: Avi Kivity <avi@...hat.com>, Marcelo Tosatti <mtosatti@...hat.com>,
Joerg Roedel <joerg.roedel@....com>,
linux-kernel@...r.kernel.org, kvm@...r.kernel.org
Subject: [PATCH][RFC] x86: remove SMP check/taint for AMD K7 (was Re: KVM
warning about uncertified CPU for SMP for AMD model 2, stepping 3)
On Wed, 31 Mar 2010, Andi Kleen wrote:
> > booting 32bit guest on 32bit host on AMD system gives me the following
> > warning when KVM is instructed to boot as SMP:
>
> I guess these warnings could be just disabled. With nearly everyone
> using multi-core these days they are kind of obsolete anyways.
Why is it there for K7 only anyway? Was that the only product line which
had instances which were explicitly marked as unsuitable for SMP by AMD?
From: Jiri Kosina <jkosina@...e.cz>
Subject: x86: remove SMP check/taint for AMD K7
Remove code checking of AMD K7 CPU models and warning/tainting kernel if
it doesn't suit given criteria.
The code has been there originally in order to detect systems which were
doing SMP with CPUs that were not oficially cerified by AMD as SMP-safe.
It's not clear whether the checks are either proper or complete. Quoting
Andi Kleen: "I guess these warnings could be just disabled. With nearly
everyone using multi-core these days they are kind of obsolete anyways."
Signed-off-by: Jiri Kosina <jkosina@...e.cz>
---
arch/x86/kernel/cpu/amd.c | 51 ---------------------------------------------
1 files changed, 0 insertions(+), 51 deletions(-)
diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
index e485825..6510fe5 100644
--- a/arch/x86/kernel/cpu/amd.c
+++ b/arch/x86/kernel/cpu/amd.c
@@ -144,55 +144,6 @@ static void __cpuinit init_amd_k6(struct cpuinfo_x86 *c)
}
}
-static void __cpuinit amd_k7_smp_check(struct cpuinfo_x86 *c)
-{
-#ifdef CONFIG_SMP
- /* calling is from identify_secondary_cpu() ? */
- if (c->cpu_index == boot_cpu_id)
- return;
-
- /*
- * Certain Athlons might work (for various values of 'work') in SMP
- * but they are not certified as MP capable.
- */
- /* Athlon 660/661 is valid. */
- if ((c->x86_model == 6) && ((c->x86_mask == 0) ||
- (c->x86_mask == 1)))
- goto valid_k7;
-
- /* Duron 670 is valid */
- if ((c->x86_model == 7) && (c->x86_mask == 0))
- goto valid_k7;
-
- /*
- * Athlon 662, Duron 671, and Athlon >model 7 have capability
- * bit. It's worth noting that the A5 stepping (662) of some
- * Athlon XP's have the MP bit set.
- * See http://www.heise.de/newsticker/data/jow-18.10.01-000 for
- * more.
- */
- if (((c->x86_model == 6) && (c->x86_mask >= 2)) ||
- ((c->x86_model == 7) && (c->x86_mask >= 1)) ||
- (c->x86_model > 7))
- if (cpu_has_mp)
- goto valid_k7;
-
- /* If we get here, not a certified SMP capable AMD system. */
-
- /*
- * Don't taint if we are running SMP kernel on a single non-MP
- * approved Athlon
- */
- WARN_ONCE(1, "WARNING: This combination of AMD"
- " processors is not suitable for SMP.\n");
- if (!test_taint(TAINT_UNSAFE_SMP))
- add_taint(TAINT_UNSAFE_SMP);
-
-valid_k7:
- ;
-#endif
-}
-
static void __cpuinit init_amd_k7(struct cpuinfo_x86 *c)
{
u32 l, h;
@@ -228,8 +179,6 @@ static void __cpuinit init_amd_k7(struct cpuinfo_x86 *c)
}
set_cpu_cap(c, X86_FEATURE_K7);
-
- amd_k7_smp_check(c);
}
#endif
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists