lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

x86: do smp tainting checks in a separate function

Browse Source 
It will ease integration for x86_64

Signed-off-by: Glauber Costa <gcosta@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Glauber de Oliveira Costa
2008-03-19 14:25:28 -03:00
committed by Ingo Molnar
parent 904541e2f7
commit 693d4b8a64
2 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
arch/x86/kernel/smpboot.c
View File

@@ -45,10 +45,8 @@ unsigned char *trampoline_base = __va(SMP_TRAMPOLINE_BASE);
/* representing cpus for which sibling maps can be computed */ /* representing cpus for which sibling maps can be computed */
static cpumask_t cpu_sibling_setup_map; static cpumask_t cpu_sibling_setup_map;
#ifdef CONFIG_X86_32
/* Set if we find a B stepping CPU */ /* Set if we find a B stepping CPU */
int __cpuinitdata smp_b_stepping; int __cpuinitdata smp_b_stepping;
#endif
static void __cpuinit smp_apply_quirks(struct cpuinfo_x86 *c) static void __cpuinit smp_apply_quirks(struct cpuinfo_x86 *c)
{ {
@@ -105,6 +103,25 @@ valid_k7:
#endif #endif
} }
void smp_checks(void)
{
if (smp_b_stepping)
printk(KERN_WARNING "WARNING: SMP operation may be unreliable"
"with B stepping processors.\n");
/*
* Don't taint if we are running SMP kernel on a single non-MP
* approved Athlon
*/
if (tainted & TAINT_UNSAFE_SMP) {
if (cpus_weight(cpu_present_map))
printk(KERN_INFO "WARNING: This combination of AMD"
"processors is not suitable for SMP.\n");
else
tainted &= ~TAINT_UNSAFE_SMP;
}
}
/* /*
* The bootstrap kernel entry code has set these up. Save them for * The bootstrap kernel entry code has set these up. Save them for
* a given CPU * a given CPU

20
arch/x86/kernel/smpboot_32.c
View File

@@ -59,8 +59,6 @@
#include <asm/vmi.h> #include <asm/vmi.h>
#include <asm/mtrr.h> #include <asm/mtrr.h>
extern int smp_b_stepping;
static cpumask_t smp_commenced_mask; static cpumask_t smp_commenced_mask;
/* which logical CPU number maps to which CPU (physical APIC ID) */ /* which logical CPU number maps to which CPU (physical APIC ID) */
@@ -791,6 +789,7 @@ static int __init smp_sanity_check(unsigned max_cpus)
} }
extern void impress_friends(void); extern void impress_friends(void);
extern void smp_checks(void);
/* /*
* Cycle through the processors sending APIC IPIs to boot each. * Cycle through the processors sending APIC IPIs to boot each.
*/ */
@@ -865,22 +864,7 @@ static void __init smp_boot_cpus(unsigned int max_cpus)
impress_friends(); impress_friends();
if (smp_b_stepping) smp_checks();
printk(KERN_WARNING "WARNING: SMP operation may be unreliable with B stepping processors.\n");
/*
* Don't taint if we are running SMP kernel on a single non-MP
* approved Athlon
*/
if (tainted & TAINT_UNSAFE_SMP) {
if (cpus_weight(cpu_present_map))
printk (KERN_INFO "WARNING: This combination of AMD processors is not suitable for SMP.\n");
else
tainted &= ~TAINT_UNSAFE_SMP;
}
Dprintk("Boot done.\n");
/* /*
* construct cpu_sibling_map, so that we can tell sibling CPUs * construct cpu_sibling_map, so that we can tell sibling CPUs
* efficiently. * efficiently.