Skip to content

Commit

Permalink
x86: do smp tainting checks in a separate function
Browse files Browse the repository at this point in the history
It will ease integration for x86_64

Signed-off-by: Glauber Costa <gcosta@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
  • Loading branch information
Glauber de Oliveira Costa authored and Ingo Molnar committed Apr 17, 2008
1 parent 904541e commit 693d4b8
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 20 deletions.
21 changes: 19 additions & 2 deletions arch/x86/kernel/smpboot.c
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,8 @@ unsigned char *trampoline_base = __va(SMP_TRAMPOLINE_BASE);
/* representing cpus for which sibling maps can be computed */
static cpumask_t cpu_sibling_setup_map;

#ifdef CONFIG_X86_32
/* Set if we find a B stepping CPU */
int __cpuinitdata smp_b_stepping;
#endif

static void __cpuinit smp_apply_quirks(struct cpuinfo_x86 *c)
{
Expand Down Expand Up @@ -105,6 +103,25 @@ static void __cpuinit smp_apply_quirks(struct cpuinfo_x86 *c)
#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
* a given CPU
Expand Down
20 changes: 2 additions & 18 deletions arch/x86/kernel/smpboot_32.c
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,6 @@
#include <asm/vmi.h>
#include <asm/mtrr.h>

extern int smp_b_stepping;

static cpumask_t smp_commenced_mask;

/* which logical CPU number maps to which CPU (physical APIC ID) */
Expand Down Expand Up @@ -791,6 +789,7 @@ static int __init smp_sanity_check(unsigned max_cpus)
}

extern void impress_friends(void);
extern void smp_checks(void);
/*
* Cycle through the processors sending APIC IPIs to boot each.
*/
Expand Down Expand Up @@ -865,22 +864,7 @@ static void __init smp_boot_cpus(unsigned int max_cpus)

impress_friends();

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;
}

Dprintk("Boot done.\n");

smp_checks();
/*
* construct cpu_sibling_map, so that we can tell sibling CPUs
* efficiently.
Expand Down

0 comments on commit 693d4b8

Please sign in to comment.