2005-04-16 22:20:36 +00:00
|
|
|
/*
|
|
|
|
* x86 SMP booting functions
|
|
|
|
*
|
|
|
|
* (c) 1995 Alan Cox, Building #3 <alan@redhat.com>
|
|
|
|
* (c) 1998, 1999, 2000 Ingo Molnar <mingo@redhat.com>
|
|
|
|
* Copyright 2001 Andi Kleen, SuSE Labs.
|
|
|
|
*
|
|
|
|
* Much of the core SMP work is based on previous work by Thomas Radke, to
|
|
|
|
* whom a great many thanks are extended.
|
|
|
|
*
|
|
|
|
* Thanks to Intel for making available several different Pentium,
|
|
|
|
* Pentium Pro and Pentium-II/Xeon MP machines.
|
|
|
|
* Original development of Linux SMP code supported by Caldera.
|
|
|
|
*
|
2005-04-16 22:25:19 +00:00
|
|
|
* This code is released under the GNU General Public License version 2
|
2005-04-16 22:20:36 +00:00
|
|
|
*
|
|
|
|
* Fixes
|
|
|
|
* Felix Koop : NR_CPUS used properly
|
|
|
|
* Jose Renau : Handle single CPU case.
|
|
|
|
* Alan Cox : By repeated request 8) - Total BogoMIP report.
|
|
|
|
* Greg Wright : Fix for kernel stacks panic.
|
|
|
|
* Erich Boleyn : MP v1.4 and additional changes.
|
|
|
|
* Matthias Sattler : Changes for 2.1 kernel map.
|
|
|
|
* Michel Lespinasse : Changes for 2.1 kernel map.
|
|
|
|
* Michael Chastain : Change trampoline.S to gnu as.
|
|
|
|
* Alan Cox : Dumb bug: 'B' step PPro's are fine
|
|
|
|
* Ingo Molnar : Added APIC timers, based on code
|
|
|
|
* from Jose Renau
|
|
|
|
* Ingo Molnar : various cleanups and rewrites
|
|
|
|
* Tigran Aivazian : fixed "0.00 in /proc/uptime on SMP" bug.
|
|
|
|
* Maciej W. Rozycki : Bits for genuine 82489DX APICs
|
|
|
|
* Andi Kleen : Changed for SMP boot into long mode.
|
2005-04-16 22:25:19 +00:00
|
|
|
* Rusty Russell : Hacked into shape for new "hotplug" boot process.
|
|
|
|
* Andi Kleen : Converted to new state machine.
|
|
|
|
* Various cleanups.
|
|
|
|
* Probably mostly hotplug CPU ready now.
|
2005-06-25 21:55:00 +00:00
|
|
|
* Ashok Raj : CPU hotplug support
|
2005-04-16 22:20:36 +00:00
|
|
|
*/
|
|
|
|
|
2005-04-16 22:25:19 +00:00
|
|
|
|
2005-04-16 22:20:36 +00:00
|
|
|
#include <linux/init.h>
|
|
|
|
|
|
|
|
#include <linux/mm.h>
|
|
|
|
#include <linux/kernel_stat.h>
|
|
|
|
#include <linux/bootmem.h>
|
|
|
|
#include <linux/thread_info.h>
|
|
|
|
#include <linux/module.h>
|
|
|
|
#include <linux/delay.h>
|
|
|
|
#include <linux/mc146818rtc.h>
|
2006-09-26 06:32:33 +00:00
|
|
|
#include <linux/smp.h>
|
2007-05-08 07:27:03 +00:00
|
|
|
#include <linux/kdebug.h>
|
2006-09-26 06:32:33 +00:00
|
|
|
|
2005-04-16 22:20:36 +00:00
|
|
|
#include <asm/mtrr.h>
|
|
|
|
#include <asm/pgalloc.h>
|
|
|
|
#include <asm/desc.h>
|
|
|
|
#include <asm/tlbflush.h>
|
|
|
|
#include <asm/proto.h>
|
2005-05-17 04:53:34 +00:00
|
|
|
#include <asm/nmi.h>
|
2005-09-12 16:49:25 +00:00
|
|
|
#include <asm/irq.h>
|
|
|
|
#include <asm/hw_irq.h>
|
2006-02-07 20:58:23 +00:00
|
|
|
#include <asm/numa.h>
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
/* Number of siblings per CPU package */
|
|
|
|
int smp_num_siblings = 1;
|
2006-06-26 11:59:44 +00:00
|
|
|
EXPORT_SYMBOL(smp_num_siblings);
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2006-03-27 09:15:22 +00:00
|
|
|
/* Last level cache ID of each logical CPU */
|
|
|
|
u8 cpu_llc_id[NR_CPUS] __cpuinitdata = {[0 ... NR_CPUS-1] = BAD_APICID};
|
|
|
|
|
2005-04-16 22:20:36 +00:00
|
|
|
/* Bitmask of currently online CPUs */
|
2005-09-06 22:17:45 +00:00
|
|
|
cpumask_t cpu_online_map __read_mostly;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2005-04-16 22:25:19 +00:00
|
|
|
EXPORT_SYMBOL(cpu_online_map);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Private maps to synchronize booting between AP and BP.
|
|
|
|
* Probably not needed anymore, but it makes for easier debugging. -AK
|
|
|
|
*/
|
2005-04-16 22:20:36 +00:00
|
|
|
cpumask_t cpu_callin_map;
|
|
|
|
cpumask_t cpu_callout_map;
|
2006-06-26 11:59:44 +00:00
|
|
|
EXPORT_SYMBOL(cpu_callout_map);
|
2005-04-16 22:25:19 +00:00
|
|
|
|
|
|
|
cpumask_t cpu_possible_map;
|
|
|
|
EXPORT_SYMBOL(cpu_possible_map);
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
/* Per CPU bogomips and other parameters */
|
|
|
|
struct cpuinfo_x86 cpu_data[NR_CPUS] __cacheline_aligned;
|
2006-06-26 11:59:44 +00:00
|
|
|
EXPORT_SYMBOL(cpu_data);
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2005-04-16 22:25:19 +00:00
|
|
|
/* Set when the idlers are all forked */
|
|
|
|
int smp_threads_ready;
|
|
|
|
|
2005-11-05 16:25:54 +00:00
|
|
|
/* representing HT siblings of each logical CPU */
|
2007-10-16 08:24:05 +00:00
|
|
|
DEFINE_PER_CPU(cpumask_t, cpu_sibling_map);
|
|
|
|
EXPORT_PER_CPU_SYMBOL(cpu_sibling_map);
|
2005-11-05 16:25:54 +00:00
|
|
|
|
|
|
|
/* representing HT and core siblings of each logical CPU */
|
2007-10-16 08:24:04 +00:00
|
|
|
DEFINE_PER_CPU(cpumask_t, cpu_core_map);
|
|
|
|
EXPORT_PER_CPU_SYMBOL(cpu_core_map);
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Trampoline 80x86 program as an array.
|
|
|
|
*/
|
|
|
|
|
2007-10-17 16:04:37 +00:00
|
|
|
extern const unsigned char trampoline_data[];
|
|
|
|
extern const unsigned char trampoline_end[];
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2005-06-25 21:55:00 +00:00
|
|
|
/* State of each CPU */
|
|
|
|
DEFINE_PER_CPU(int, cpu_state) = { 0 };
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Store all idle threads, this can be reused instead of creating
|
|
|
|
* a new thread. Also avoids complicated thread destroy functionality
|
|
|
|
* for idle threads.
|
|
|
|
*/
|
|
|
|
struct task_struct *idle_thread_array[NR_CPUS] __cpuinitdata ;
|
|
|
|
|
|
|
|
#define get_idle_for_cpu(x) (idle_thread_array[(x)])
|
|
|
|
#define set_idle_for_cpu(x,p) (idle_thread_array[(x)] = (p))
|
|
|
|
|
2005-04-16 22:20:36 +00:00
|
|
|
/*
|
|
|
|
* Currently trivial. Write the real->protected mode
|
|
|
|
* bootstrap into the page concerned. The caller
|
|
|
|
* has made sure it's suitably aligned.
|
|
|
|
*/
|
|
|
|
|
2005-04-16 22:25:19 +00:00
|
|
|
static unsigned long __cpuinit setup_trampoline(void)
|
2005-04-16 22:20:36 +00:00
|
|
|
{
|
|
|
|
void *tramp = __va(SMP_TRAMPOLINE_BASE);
|
|
|
|
memcpy(tramp, trampoline_data, trampoline_end - trampoline_data);
|
|
|
|
return virt_to_phys(tramp);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* The bootstrap kernel entry code has set these up. Save them for
|
|
|
|
* a given CPU
|
|
|
|
*/
|
|
|
|
|
2005-04-16 22:25:19 +00:00
|
|
|
static void __cpuinit smp_store_cpu_info(int id)
|
2005-04-16 22:20:36 +00:00
|
|
|
{
|
|
|
|
struct cpuinfo_x86 *c = cpu_data + id;
|
|
|
|
|
|
|
|
*c = boot_cpu_data;
|
|
|
|
identify_cpu(c);
|
2005-05-17 04:53:25 +00:00
|
|
|
print_cpu_info(c);
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
|
2005-04-16 22:25:19 +00:00
|
|
|
static atomic_t init_deasserted __cpuinitdata;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2005-04-16 22:25:19 +00:00
|
|
|
/*
|
|
|
|
* Report back to the Boot Processor.
|
|
|
|
* Running on AP.
|
|
|
|
*/
|
|
|
|
void __cpuinit smp_callin(void)
|
2005-04-16 22:20:36 +00:00
|
|
|
{
|
|
|
|
int cpuid, phys_id;
|
|
|
|
unsigned long timeout;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* If waken up by an INIT in an 82489DX configuration
|
|
|
|
* we may get here before an INIT-deassert IPI reaches
|
|
|
|
* our local APIC. We have to wait for the IPI or we'll
|
|
|
|
* lock up on an APIC access.
|
|
|
|
*/
|
2005-04-16 22:25:19 +00:00
|
|
|
while (!atomic_read(&init_deasserted))
|
|
|
|
cpu_relax();
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* (This works even if the APIC is not enabled.)
|
|
|
|
*/
|
|
|
|
phys_id = GET_APIC_ID(apic_read(APIC_ID));
|
|
|
|
cpuid = smp_processor_id();
|
|
|
|
if (cpu_isset(cpuid, cpu_callin_map)) {
|
|
|
|
panic("smp_callin: phys CPU#%d, CPU#%d already present??\n",
|
|
|
|
phys_id, cpuid);
|
|
|
|
}
|
|
|
|
Dprintk("CPU#%d (phys ID: %d) waiting for CALLOUT\n", cpuid, phys_id);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* STARTUP IPIs are fragile beasts as they might sometimes
|
|
|
|
* trigger some glue motherboard logic. Complete APIC bus
|
|
|
|
* silence for 1 second, this overestimates the time the
|
|
|
|
* boot CPU is spending to send the up to 2 STARTUP IPIs
|
|
|
|
* by a factor of two. This should be enough.
|
|
|
|
*/
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Waiting 2s total for startup (udelay is not yet working)
|
|
|
|
*/
|
|
|
|
timeout = jiffies + 2*HZ;
|
|
|
|
while (time_before(jiffies, timeout)) {
|
|
|
|
/*
|
|
|
|
* Has the boot CPU finished it's STARTUP sequence?
|
|
|
|
*/
|
|
|
|
if (cpu_isset(cpuid, cpu_callout_map))
|
|
|
|
break;
|
2005-04-16 22:25:19 +00:00
|
|
|
cpu_relax();
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (!time_before(jiffies, timeout)) {
|
|
|
|
panic("smp_callin: CPU%d started up but did not get a callout!\n",
|
|
|
|
cpuid);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* the boot CPU has finished the init stage and is spinning
|
|
|
|
* on callin_map until we finish. We are free to set up this
|
|
|
|
* CPU, first the APIC. (this is probably redundant on most
|
|
|
|
* boards)
|
|
|
|
*/
|
|
|
|
|
|
|
|
Dprintk("CALLIN, before setup_local_APIC().\n");
|
|
|
|
setup_local_APIC();
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Get our bogomips.
|
2005-09-12 16:49:24 +00:00
|
|
|
*
|
|
|
|
* Need to enable IRQs because it can take longer and then
|
|
|
|
* the NMI watchdog might kill us.
|
2005-04-16 22:20:36 +00:00
|
|
|
*/
|
2005-09-12 16:49:24 +00:00
|
|
|
local_irq_enable();
|
2005-04-16 22:20:36 +00:00
|
|
|
calibrate_delay();
|
2005-09-12 16:49:24 +00:00
|
|
|
local_irq_disable();
|
2005-04-16 22:20:36 +00:00
|
|
|
Dprintk("Stack at about %p\n",&cpuid);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Save our processor parameters
|
|
|
|
*/
|
|
|
|
smp_store_cpu_info(cpuid);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Allow the master to continue.
|
|
|
|
*/
|
|
|
|
cpu_set(cpuid, cpu_callin_map);
|
|
|
|
}
|
|
|
|
|
2006-03-27 09:15:22 +00:00
|
|
|
/* maps the cpu to the sched domain representing multi-core */
|
|
|
|
cpumask_t cpu_coregroup_map(int cpu)
|
|
|
|
{
|
|
|
|
struct cpuinfo_x86 *c = cpu_data + cpu;
|
|
|
|
/*
|
|
|
|
* For perf, we return last level cache shared map.
|
2006-06-27 09:54:42 +00:00
|
|
|
* And for power savings, we return cpu_core_map
|
2006-03-27 09:15:22 +00:00
|
|
|
*/
|
2006-06-27 09:54:42 +00:00
|
|
|
if (sched_mc_power_savings || sched_smt_power_savings)
|
2007-10-16 08:24:04 +00:00
|
|
|
return per_cpu(cpu_core_map, cpu);
|
2006-06-27 09:54:42 +00:00
|
|
|
else
|
|
|
|
return c->llc_shared_map;
|
2006-03-27 09:15:22 +00:00
|
|
|
}
|
|
|
|
|
2005-11-05 16:25:54 +00:00
|
|
|
/* representing cpus for which sibling maps can be computed */
|
|
|
|
static cpumask_t cpu_sibling_setup_map;
|
|
|
|
|
2005-06-25 21:55:01 +00:00
|
|
|
static inline void set_cpu_sibling_map(int cpu)
|
|
|
|
{
|
|
|
|
int i;
|
2005-11-05 16:25:54 +00:00
|
|
|
struct cpuinfo_x86 *c = cpu_data;
|
|
|
|
|
|
|
|
cpu_set(cpu, cpu_sibling_setup_map);
|
2005-06-25 21:55:01 +00:00
|
|
|
|
|
|
|
if (smp_num_siblings > 1) {
|
2005-11-05 16:25:54 +00:00
|
|
|
for_each_cpu_mask(i, cpu_sibling_setup_map) {
|
2006-06-26 11:58:17 +00:00
|
|
|
if (c[cpu].phys_proc_id == c[i].phys_proc_id &&
|
|
|
|
c[cpu].cpu_core_id == c[i].cpu_core_id) {
|
2007-10-16 08:24:05 +00:00
|
|
|
cpu_set(i, per_cpu(cpu_sibling_map, cpu));
|
|
|
|
cpu_set(cpu, per_cpu(cpu_sibling_map, i));
|
2007-10-16 08:24:04 +00:00
|
|
|
cpu_set(i, per_cpu(cpu_core_map, cpu));
|
|
|
|
cpu_set(cpu, per_cpu(cpu_core_map, i));
|
2006-03-27 09:15:22 +00:00
|
|
|
cpu_set(i, c[cpu].llc_shared_map);
|
|
|
|
cpu_set(cpu, c[i].llc_shared_map);
|
2005-06-25 21:55:01 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
} else {
|
2007-10-16 08:24:05 +00:00
|
|
|
cpu_set(cpu, per_cpu(cpu_sibling_map, cpu));
|
2005-06-25 21:55:01 +00:00
|
|
|
}
|
|
|
|
|
2006-03-27 09:15:22 +00:00
|
|
|
cpu_set(cpu, c[cpu].llc_shared_map);
|
|
|
|
|
2005-11-05 16:25:54 +00:00
|
|
|
if (current_cpu_data.x86_max_cores == 1) {
|
2007-10-16 08:24:05 +00:00
|
|
|
per_cpu(cpu_core_map, cpu) = per_cpu(cpu_sibling_map, cpu);
|
2005-11-05 16:25:54 +00:00
|
|
|
c[cpu].booted_cores = 1;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
for_each_cpu_mask(i, cpu_sibling_setup_map) {
|
2006-03-27 09:15:22 +00:00
|
|
|
if (cpu_llc_id[cpu] != BAD_APICID &&
|
|
|
|
cpu_llc_id[cpu] == cpu_llc_id[i]) {
|
|
|
|
cpu_set(i, c[cpu].llc_shared_map);
|
|
|
|
cpu_set(cpu, c[i].llc_shared_map);
|
|
|
|
}
|
2006-06-26 11:58:17 +00:00
|
|
|
if (c[cpu].phys_proc_id == c[i].phys_proc_id) {
|
2007-10-16 08:24:04 +00:00
|
|
|
cpu_set(i, per_cpu(cpu_core_map, cpu));
|
|
|
|
cpu_set(cpu, per_cpu(cpu_core_map, i));
|
2005-11-05 16:25:54 +00:00
|
|
|
/*
|
|
|
|
* Does this new cpu bringup a new core?
|
|
|
|
*/
|
2007-10-16 08:24:05 +00:00
|
|
|
if (cpus_weight(per_cpu(cpu_sibling_map, cpu)) == 1) {
|
2005-11-05 16:25:54 +00:00
|
|
|
/*
|
|
|
|
* for each core in package, increment
|
|
|
|
* the booted_cores for this new cpu
|
|
|
|
*/
|
2007-10-16 08:24:05 +00:00
|
|
|
if (first_cpu(per_cpu(cpu_sibling_map, i)) == i)
|
2005-11-05 16:25:54 +00:00
|
|
|
c[cpu].booted_cores++;
|
|
|
|
/*
|
|
|
|
* increment the core count for all
|
|
|
|
* the other cpus in this package
|
|
|
|
*/
|
|
|
|
if (i != cpu)
|
|
|
|
c[i].booted_cores++;
|
|
|
|
} else if (i != cpu && !c[cpu].booted_cores)
|
|
|
|
c[cpu].booted_cores = c[i].booted_cores;
|
|
|
|
}
|
2005-06-25 21:55:01 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2005-04-16 22:20:36 +00:00
|
|
|
/*
|
2005-04-16 22:25:19 +00:00
|
|
|
* Setup code on secondary processor (after comming out of the trampoline)
|
2005-04-16 22:20:36 +00:00
|
|
|
*/
|
2005-04-16 22:25:19 +00:00
|
|
|
void __cpuinit start_secondary(void)
|
2005-04-16 22:20:36 +00:00
|
|
|
{
|
|
|
|
/*
|
|
|
|
* Dont put anything before smp_callin(), SMP
|
|
|
|
* booting is too fragile that we want to limit the
|
|
|
|
* things done here to the most necessary things.
|
|
|
|
*/
|
|
|
|
cpu_init();
|
2005-11-09 05:39:01 +00:00
|
|
|
preempt_disable();
|
2005-04-16 22:20:36 +00:00
|
|
|
smp_callin();
|
|
|
|
|
|
|
|
/* otherwise gcc will move up the smp_processor_id before the cpu_init */
|
|
|
|
barrier();
|
|
|
|
|
2007-02-16 09:27:34 +00:00
|
|
|
/*
|
|
|
|
* Check TSC sync first:
|
|
|
|
*/
|
|
|
|
check_tsc_sync_target();
|
|
|
|
|
2005-04-16 22:20:36 +00:00
|
|
|
if (nmi_watchdog == NMI_IO_APIC) {
|
|
|
|
disable_8259A_irq(0);
|
|
|
|
enable_NMI_through_LVT0(NULL);
|
|
|
|
enable_8259A_irq(0);
|
|
|
|
}
|
|
|
|
|
2005-06-25 21:55:01 +00:00
|
|
|
/*
|
|
|
|
* The sibling maps must be set before turing the online map on for
|
|
|
|
* this cpu
|
|
|
|
*/
|
|
|
|
set_cpu_sibling_map(smp_processor_id());
|
|
|
|
|
2005-06-25 21:55:02 +00:00
|
|
|
/*
|
|
|
|
* We need to hold call_lock, so there is no inconsistency
|
|
|
|
* between the time smp_call_function() determines number of
|
|
|
|
* IPI receipients, and the time when the determination is made
|
|
|
|
* for which cpus receive the IPI in genapic_flat.c. Holding this
|
|
|
|
* lock helps us to not include this cpu in a currently in progress
|
|
|
|
* smp_call_function().
|
|
|
|
*/
|
|
|
|
lock_ipi_call_lock();
|
2006-10-24 23:00:23 +00:00
|
|
|
spin_lock(&vector_lock);
|
2005-06-25 21:55:02 +00:00
|
|
|
|
2006-10-24 23:00:23 +00:00
|
|
|
/* Setup the per cpu irq handling data structures */
|
|
|
|
__setup_vector_irq(smp_processor_id());
|
2005-04-16 22:20:36 +00:00
|
|
|
/*
|
2005-04-16 22:25:19 +00:00
|
|
|
* Allow the master to continue.
|
2005-04-16 22:20:36 +00:00
|
|
|
*/
|
|
|
|
cpu_set(smp_processor_id(), cpu_online_map);
|
2005-06-25 21:55:02 +00:00
|
|
|
per_cpu(cpu_state, smp_processor_id()) = CPU_ONLINE;
|
2006-10-24 23:00:23 +00:00
|
|
|
spin_unlock(&vector_lock);
|
2007-02-16 09:27:34 +00:00
|
|
|
|
2005-06-25 21:55:02 +00:00
|
|
|
unlock_ipi_call_lock();
|
|
|
|
|
2007-10-14 20:57:45 +00:00
|
|
|
setup_secondary_APIC_clock();
|
|
|
|
|
2005-04-16 22:20:36 +00:00
|
|
|
cpu_idle();
|
|
|
|
}
|
|
|
|
|
2005-04-16 22:25:19 +00:00
|
|
|
extern volatile unsigned long init_rsp;
|
2005-04-16 22:20:36 +00:00
|
|
|
extern void (*initial_code)(void);
|
|
|
|
|
2005-07-27 18:45:17 +00:00
|
|
|
#ifdef APIC_DEBUG
|
2005-04-16 22:25:19 +00:00
|
|
|
static void inquire_remote_apic(int apicid)
|
2005-04-16 22:20:36 +00:00
|
|
|
{
|
|
|
|
unsigned i, regs[] = { APIC_ID >> 4, APIC_LVR >> 4, APIC_SPIV >> 4 };
|
|
|
|
char *names[] = { "ID", "VERSION", "SPIV" };
|
2007-05-02 17:27:17 +00:00
|
|
|
int timeout;
|
|
|
|
unsigned int status;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
printk(KERN_INFO "Inquiring remote APIC #%d...\n", apicid);
|
|
|
|
|
|
|
|
for (i = 0; i < sizeof(regs) / sizeof(*regs); i++) {
|
|
|
|
printk("... APIC #%d %s: ", apicid, names[i]);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Wait for idle.
|
|
|
|
*/
|
2007-05-02 17:27:17 +00:00
|
|
|
status = safe_apic_wait_icr_idle();
|
|
|
|
if (status)
|
|
|
|
printk("a previous APIC delivery may have failed\n");
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2005-09-12 16:49:23 +00:00
|
|
|
apic_write(APIC_ICR2, SET_APIC_DEST_FIELD(apicid));
|
|
|
|
apic_write(APIC_ICR, APIC_DM_REMRD | regs[i]);
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
timeout = 0;
|
|
|
|
do {
|
|
|
|
udelay(100);
|
|
|
|
status = apic_read(APIC_ICR) & APIC_ICR_RR_MASK;
|
|
|
|
} while (status == APIC_ICR_RR_INPROG && timeout++ < 1000);
|
|
|
|
|
|
|
|
switch (status) {
|
|
|
|
case APIC_ICR_RR_VALID:
|
|
|
|
status = apic_read(APIC_RRR);
|
|
|
|
printk("%08x\n", status);
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
printk("failed\n");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2005-04-16 22:25:19 +00:00
|
|
|
/*
|
|
|
|
* Kick the secondary to wake up.
|
|
|
|
*/
|
|
|
|
static int __cpuinit wakeup_secondary_via_INIT(int phys_apicid, unsigned int start_rip)
|
2005-04-16 22:20:36 +00:00
|
|
|
{
|
2007-05-02 17:27:17 +00:00
|
|
|
unsigned long send_status, accept_status = 0;
|
|
|
|
int maxlvt, num_starts, j;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
Dprintk("Asserting INIT.\n");
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Turn INIT on target chip
|
|
|
|
*/
|
2005-09-12 16:49:23 +00:00
|
|
|
apic_write(APIC_ICR2, SET_APIC_DEST_FIELD(phys_apicid));
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Send IPI
|
|
|
|
*/
|
2005-09-12 16:49:23 +00:00
|
|
|
apic_write(APIC_ICR, APIC_INT_LEVELTRIG | APIC_INT_ASSERT
|
2005-04-16 22:20:36 +00:00
|
|
|
| APIC_DM_INIT);
|
|
|
|
|
|
|
|
Dprintk("Waiting for send to finish...\n");
|
2007-05-02 17:27:17 +00:00
|
|
|
send_status = safe_apic_wait_icr_idle();
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
mdelay(10);
|
|
|
|
|
|
|
|
Dprintk("Deasserting INIT.\n");
|
|
|
|
|
|
|
|
/* Target chip */
|
2005-09-12 16:49:23 +00:00
|
|
|
apic_write(APIC_ICR2, SET_APIC_DEST_FIELD(phys_apicid));
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
/* Send IPI */
|
2005-09-12 16:49:23 +00:00
|
|
|
apic_write(APIC_ICR, APIC_INT_LEVELTRIG | APIC_DM_INIT);
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
Dprintk("Waiting for send to finish...\n");
|
2007-05-02 17:27:17 +00:00
|
|
|
send_status = safe_apic_wait_icr_idle();
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2006-01-11 21:43:03 +00:00
|
|
|
mb();
|
2005-04-16 22:20:36 +00:00
|
|
|
atomic_set(&init_deasserted, 1);
|
|
|
|
|
2005-09-12 16:49:24 +00:00
|
|
|
num_starts = 2;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Run STARTUP IPI loop.
|
|
|
|
*/
|
|
|
|
Dprintk("#startup loops: %d.\n", num_starts);
|
|
|
|
|
|
|
|
maxlvt = get_maxlvt();
|
|
|
|
|
|
|
|
for (j = 1; j <= num_starts; j++) {
|
|
|
|
Dprintk("Sending STARTUP #%d.\n",j);
|
|
|
|
apic_write(APIC_ESR, 0);
|
|
|
|
apic_read(APIC_ESR);
|
|
|
|
Dprintk("After apic_write.\n");
|
|
|
|
|
|
|
|
/*
|
|
|
|
* STARTUP IPI
|
|
|
|
*/
|
|
|
|
|
|
|
|
/* Target chip */
|
2005-09-12 16:49:23 +00:00
|
|
|
apic_write(APIC_ICR2, SET_APIC_DEST_FIELD(phys_apicid));
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
/* Boot on the stack */
|
|
|
|
/* Kick the second */
|
2005-09-12 16:49:23 +00:00
|
|
|
apic_write(APIC_ICR, APIC_DM_STARTUP | (start_rip >> 12));
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Give the other CPU some time to accept the IPI.
|
|
|
|
*/
|
|
|
|
udelay(300);
|
|
|
|
|
|
|
|
Dprintk("Startup point 1.\n");
|
|
|
|
|
|
|
|
Dprintk("Waiting for send to finish...\n");
|
2007-05-02 17:27:17 +00:00
|
|
|
send_status = safe_apic_wait_icr_idle();
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Give the other CPU some time to accept the IPI.
|
|
|
|
*/
|
|
|
|
udelay(200);
|
|
|
|
/*
|
|
|
|
* Due to the Pentium erratum 3AP.
|
|
|
|
*/
|
|
|
|
if (maxlvt > 3) {
|
|
|
|
apic_write(APIC_ESR, 0);
|
|
|
|
}
|
|
|
|
accept_status = (apic_read(APIC_ESR) & 0xEF);
|
|
|
|
if (send_status || accept_status)
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
Dprintk("After Startup.\n");
|
|
|
|
|
|
|
|
if (send_status)
|
|
|
|
printk(KERN_ERR "APIC never delivered???\n");
|
|
|
|
if (accept_status)
|
|
|
|
printk(KERN_ERR "APIC delivery error (%lx).\n", accept_status);
|
|
|
|
|
|
|
|
return (send_status | accept_status);
|
|
|
|
}
|
|
|
|
|
2005-06-25 21:55:00 +00:00
|
|
|
struct create_idle {
|
2006-11-22 14:55:48 +00:00
|
|
|
struct work_struct work;
|
2005-06-25 21:55:00 +00:00
|
|
|
struct task_struct *idle;
|
|
|
|
struct completion done;
|
|
|
|
int cpu;
|
|
|
|
};
|
|
|
|
|
2006-11-22 14:55:48 +00:00
|
|
|
void do_fork_idle(struct work_struct *work)
|
2005-06-25 21:55:00 +00:00
|
|
|
{
|
2006-11-22 14:55:48 +00:00
|
|
|
struct create_idle *c_idle =
|
|
|
|
container_of(work, struct create_idle, work);
|
2005-06-25 21:55:00 +00:00
|
|
|
|
|
|
|
c_idle->idle = fork_idle(c_idle->cpu);
|
|
|
|
complete(&c_idle->done);
|
|
|
|
}
|
|
|
|
|
2005-04-16 22:25:19 +00:00
|
|
|
/*
|
|
|
|
* Boot one CPU.
|
|
|
|
*/
|
|
|
|
static int __cpuinit do_boot_cpu(int cpu, int apicid)
|
2005-04-16 22:20:36 +00:00
|
|
|
{
|
|
|
|
unsigned long boot_error;
|
2005-04-16 22:25:19 +00:00
|
|
|
int timeout;
|
2005-04-16 22:20:36 +00:00
|
|
|
unsigned long start_rip;
|
2005-06-25 21:55:00 +00:00
|
|
|
struct create_idle c_idle = {
|
2006-11-22 14:55:48 +00:00
|
|
|
.work = __WORK_INITIALIZER(c_idle.work, do_fork_idle),
|
2005-06-25 21:55:00 +00:00
|
|
|
.cpu = cpu,
|
2006-07-10 11:44:05 +00:00
|
|
|
.done = COMPLETION_INITIALIZER_ONSTACK(c_idle.done),
|
2005-06-25 21:55:00 +00:00
|
|
|
};
|
|
|
|
|
2006-01-11 21:43:57 +00:00
|
|
|
/* allocate memory for gdts of secondary cpus. Hotplug is considered */
|
|
|
|
if (!cpu_gdt_descr[cpu].address &&
|
|
|
|
!(cpu_gdt_descr[cpu].address = get_zeroed_page(GFP_KERNEL))) {
|
|
|
|
printk(KERN_ERR "Failed to allocate GDT for CPU %d\n", cpu);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2006-01-11 21:45:42 +00:00
|
|
|
/* Allocate node local memory for AP pdas */
|
|
|
|
if (cpu_pda(cpu) == &boot_cpu_pda[cpu]) {
|
|
|
|
struct x8664_pda *newpda, *pda;
|
|
|
|
int node = cpu_to_node(cpu);
|
|
|
|
pda = cpu_pda(cpu);
|
|
|
|
newpda = kmalloc_node(sizeof (struct x8664_pda), GFP_ATOMIC,
|
|
|
|
node);
|
|
|
|
if (newpda) {
|
|
|
|
memcpy(newpda, pda, sizeof (struct x8664_pda));
|
|
|
|
cpu_pda(cpu) = newpda;
|
|
|
|
} else
|
|
|
|
printk(KERN_ERR
|
|
|
|
"Could not allocate node local PDA for CPU %d on node %d\n",
|
|
|
|
cpu, node);
|
|
|
|
}
|
|
|
|
|
2006-06-26 11:56:16 +00:00
|
|
|
alternatives_smp_switch(1);
|
|
|
|
|
2005-06-25 21:55:00 +00:00
|
|
|
c_idle.idle = get_idle_for_cpu(cpu);
|
|
|
|
|
|
|
|
if (c_idle.idle) {
|
|
|
|
c_idle.idle->thread.rsp = (unsigned long) (((struct pt_regs *)
|
2006-01-12 09:05:39 +00:00
|
|
|
(THREAD_SIZE + task_stack_page(c_idle.idle))) - 1);
|
2005-06-25 21:55:00 +00:00
|
|
|
init_idle(c_idle.idle, cpu);
|
|
|
|
goto do_rest;
|
|
|
|
}
|
|
|
|
|
2005-04-16 22:20:36 +00:00
|
|
|
/*
|
2005-06-25 21:55:00 +00:00
|
|
|
* During cold boot process, keventd thread is not spun up yet.
|
|
|
|
* When we do cpu hot-add, we create idle threads on the fly, we should
|
|
|
|
* not acquire any attributes from the calling context. Hence the clean
|
|
|
|
* way to create kernel_threads() is to do that from keventd().
|
|
|
|
* We do the current_is_keventd() due to the fact that ACPI notifier
|
|
|
|
* was also queuing to keventd() and when the caller is already running
|
|
|
|
* in context of keventd(), we would end up with locking up the keventd
|
|
|
|
* thread.
|
2005-04-16 22:20:36 +00:00
|
|
|
*/
|
2005-06-25 21:55:00 +00:00
|
|
|
if (!keventd_up() || current_is_keventd())
|
2006-11-22 14:55:48 +00:00
|
|
|
c_idle.work.func(&c_idle.work);
|
2005-06-25 21:55:00 +00:00
|
|
|
else {
|
2006-11-22 14:55:48 +00:00
|
|
|
schedule_work(&c_idle.work);
|
2005-06-25 21:55:00 +00:00
|
|
|
wait_for_completion(&c_idle.done);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (IS_ERR(c_idle.idle)) {
|
2005-04-16 22:25:19 +00:00
|
|
|
printk("failed fork for CPU %d\n", cpu);
|
2005-06-25 21:55:00 +00:00
|
|
|
return PTR_ERR(c_idle.idle);
|
2005-04-16 22:25:19 +00:00
|
|
|
}
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2005-06-25 21:55:00 +00:00
|
|
|
set_idle_for_cpu(cpu, c_idle.idle);
|
|
|
|
|
|
|
|
do_rest:
|
|
|
|
|
2006-01-11 21:45:39 +00:00
|
|
|
cpu_pda(cpu)->pcurrent = c_idle.idle;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
start_rip = setup_trampoline();
|
|
|
|
|
2005-06-25 21:55:00 +00:00
|
|
|
init_rsp = c_idle.idle->thread.rsp;
|
2005-04-16 22:20:36 +00:00
|
|
|
per_cpu(init_tss,cpu).rsp0 = init_rsp;
|
|
|
|
initial_code = start_secondary;
|
2006-01-12 09:05:38 +00:00
|
|
|
clear_tsk_thread_flag(c_idle.idle, TIF_FORK);
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2005-07-29 04:15:29 +00:00
|
|
|
printk(KERN_INFO "Booting processor %d/%d APIC 0x%x\n", cpu,
|
|
|
|
cpus_weight(cpu_present_map),
|
|
|
|
apicid);
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* This grunge runs the startup process for
|
|
|
|
* the targeted processor.
|
|
|
|
*/
|
|
|
|
|
|
|
|
atomic_set(&init_deasserted, 0);
|
|
|
|
|
|
|
|
Dprintk("Setting warm reset code and vector.\n");
|
|
|
|
|
|
|
|
CMOS_WRITE(0xa, 0xf);
|
|
|
|
local_flush_tlb();
|
|
|
|
Dprintk("1.\n");
|
|
|
|
*((volatile unsigned short *) phys_to_virt(0x469)) = start_rip >> 4;
|
|
|
|
Dprintk("2.\n");
|
|
|
|
*((volatile unsigned short *) phys_to_virt(0x467)) = start_rip & 0xf;
|
|
|
|
Dprintk("3.\n");
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Be paranoid about clearing APIC errors.
|
|
|
|
*/
|
2006-01-11 21:46:51 +00:00
|
|
|
apic_write(APIC_ESR, 0);
|
|
|
|
apic_read(APIC_ESR);
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Status is now clean
|
|
|
|
*/
|
|
|
|
boot_error = 0;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Starting actual IPI sequence...
|
|
|
|
*/
|
2005-04-16 22:25:19 +00:00
|
|
|
boot_error = wakeup_secondary_via_INIT(apicid, start_rip);
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
if (!boot_error) {
|
|
|
|
/*
|
|
|
|
* allow APs to start initializing.
|
|
|
|
*/
|
|
|
|
Dprintk("Before Callout %d.\n", cpu);
|
|
|
|
cpu_set(cpu, cpu_callout_map);
|
|
|
|
Dprintk("After Callout %d.\n", cpu);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Wait 5s total for a response
|
|
|
|
*/
|
|
|
|
for (timeout = 0; timeout < 50000; timeout++) {
|
|
|
|
if (cpu_isset(cpu, cpu_callin_map))
|
|
|
|
break; /* It has booted */
|
|
|
|
udelay(100);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (cpu_isset(cpu, cpu_callin_map)) {
|
|
|
|
/* number CPUs logically, starting from 1 (BSP is 0) */
|
|
|
|
Dprintk("CPU has booted.\n");
|
|
|
|
} else {
|
|
|
|
boot_error = 1;
|
|
|
|
if (*((volatile unsigned char *)phys_to_virt(SMP_TRAMPOLINE_BASE))
|
|
|
|
== 0xA5)
|
|
|
|
/* trampoline started but...? */
|
|
|
|
printk("Stuck ??\n");
|
|
|
|
else
|
|
|
|
/* trampoline code not run */
|
|
|
|
printk("Not responding.\n");
|
2005-07-27 18:45:17 +00:00
|
|
|
#ifdef APIC_DEBUG
|
2005-04-16 22:20:36 +00:00
|
|
|
inquire_remote_apic(apicid);
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (boot_error) {
|
|
|
|
cpu_clear(cpu, cpu_callout_map); /* was set here (do_boot_cpu()) */
|
|
|
|
clear_bit(cpu, &cpu_initialized); /* was set by cpu_init() */
|
2006-02-07 20:58:23 +00:00
|
|
|
clear_node_cpumask(cpu); /* was set by numa_add_cpu */
|
2005-04-16 22:25:19 +00:00
|
|
|
cpu_clear(cpu, cpu_present_map);
|
|
|
|
cpu_clear(cpu, cpu_possible_map);
|
2005-04-16 22:20:36 +00:00
|
|
|
x86_cpu_to_apicid[cpu] = BAD_APICID;
|
2005-04-16 22:25:19 +00:00
|
|
|
return -EIO;
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
2005-04-16 22:25:19 +00:00
|
|
|
|
|
|
|
return 0;
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
|
2005-04-16 22:25:19 +00:00
|
|
|
cycles_t cacheflush_time;
|
|
|
|
unsigned long cache_decay_ticks;
|
|
|
|
|
2005-04-16 22:20:36 +00:00
|
|
|
/*
|
2005-04-16 22:25:19 +00:00
|
|
|
* Cleanup possible dangling ends...
|
2005-04-16 22:20:36 +00:00
|
|
|
*/
|
2005-04-16 22:25:19 +00:00
|
|
|
static __cpuinit void smp_cleanup_boot(void)
|
2005-04-16 22:20:36 +00:00
|
|
|
{
|
2005-04-16 22:25:19 +00:00
|
|
|
/*
|
|
|
|
* Paranoid: Set warm reset code and vector here back
|
|
|
|
* to default values.
|
|
|
|
*/
|
|
|
|
CMOS_WRITE(0, 0xf);
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2005-04-16 22:25:19 +00:00
|
|
|
/*
|
|
|
|
* Reset trampoline flag
|
|
|
|
*/
|
|
|
|
*((volatile int *) phys_to_virt(0x467)) = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Fall back to non SMP mode after errors.
|
|
|
|
*
|
|
|
|
* RED-PEN audit/test this more. I bet there is more state messed up here.
|
|
|
|
*/
|
[PATCH] x86_64: Change init sections for CPU hotplug support
This patch adds __cpuinit and __cpuinitdata sections that need to exist past
boot to support cpu hotplug.
Caveat: This is done *only* for EM64T CPU Hotplug support, on request from
Andi Kleen. Much of the generic hotplug code in kernel, and none of the other
archs that support CPU hotplug today, i386, ia64, ppc64, s390 and parisc dont
mark sections with __cpuinit, but only mark them as __devinit, and
__devinitdata.
If someone is motivated to change generic code, we need to make sure all
existing hotplug code does not break, on other arch's that dont use __cpuinit,
and __cpudevinit.
Signed-off-by: Ashok Raj <ashok.raj@intel.com>
Acked-by: Andi Kleen <ak@muc.de>
Acked-by: Zwane Mwaikambo <zwane@arm.linux.org.uk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-06-25 21:54:58 +00:00
|
|
|
static __init void disable_smp(void)
|
2005-04-16 22:25:19 +00:00
|
|
|
{
|
|
|
|
cpu_present_map = cpumask_of_cpu(0);
|
|
|
|
cpu_possible_map = cpumask_of_cpu(0);
|
|
|
|
if (smp_found_config)
|
|
|
|
phys_cpu_present_map = physid_mask_of_physid(boot_cpu_id);
|
|
|
|
else
|
|
|
|
phys_cpu_present_map = physid_mask_of_physid(0);
|
2007-10-16 08:24:05 +00:00
|
|
|
cpu_set(0, per_cpu(cpu_sibling_map, 0));
|
2007-10-16 08:24:04 +00:00
|
|
|
cpu_set(0, per_cpu(cpu_core_map, 0));
|
2005-04-16 22:25:19 +00:00
|
|
|
}
|
|
|
|
|
2005-07-29 04:15:27 +00:00
|
|
|
#ifdef CONFIG_HOTPLUG_CPU
|
2005-11-05 16:25:54 +00:00
|
|
|
|
|
|
|
int additional_cpus __initdata = -1;
|
|
|
|
|
2005-07-29 04:15:27 +00:00
|
|
|
/*
|
|
|
|
* cpu_possible_map should be static, it cannot change as cpu's
|
|
|
|
* are onlined, or offlined. The reason is per-cpu data-structures
|
|
|
|
* are allocated by some modules at init time, and dont expect to
|
|
|
|
* do this dynamically on cpu arrival/departure.
|
|
|
|
* cpu_present_map on the other hand can change dynamically.
|
|
|
|
* In case when cpu_hotplug is not compiled, then we resort to current
|
|
|
|
* behaviour, which is cpu_possible == cpu_present.
|
|
|
|
* - Ashok Raj
|
2005-11-05 16:25:54 +00:00
|
|
|
*
|
|
|
|
* Three ways to find out the number of additional hotplug CPUs:
|
|
|
|
* - If the BIOS specified disabled CPUs in ACPI/mptables use that.
|
|
|
|
* - The user can overwrite it with additional_cpus=NUM
|
2006-01-11 21:42:35 +00:00
|
|
|
* - Otherwise don't reserve additional CPUs.
|
2005-11-05 16:25:54 +00:00
|
|
|
* We do this because additional CPUs waste a lot of memory.
|
|
|
|
* -AK
|
2005-07-29 04:15:27 +00:00
|
|
|
*/
|
2005-10-10 20:32:45 +00:00
|
|
|
__init void prefill_possible_map(void)
|
2005-07-29 04:15:27 +00:00
|
|
|
{
|
|
|
|
int i;
|
2005-11-05 16:25:54 +00:00
|
|
|
int possible;
|
|
|
|
|
|
|
|
if (additional_cpus == -1) {
|
2006-01-11 21:42:35 +00:00
|
|
|
if (disabled_cpus > 0)
|
2005-11-05 16:25:54 +00:00
|
|
|
additional_cpus = disabled_cpus;
|
2006-01-11 21:42:35 +00:00
|
|
|
else
|
|
|
|
additional_cpus = 0;
|
2005-11-05 16:25:54 +00:00
|
|
|
}
|
|
|
|
possible = num_processors + additional_cpus;
|
|
|
|
if (possible > NR_CPUS)
|
|
|
|
possible = NR_CPUS;
|
|
|
|
|
|
|
|
printk(KERN_INFO "SMP: Allowing %d CPUs, %d hotplug CPUs\n",
|
|
|
|
possible,
|
|
|
|
max_t(int, possible - num_processors, 0));
|
|
|
|
|
|
|
|
for (i = 0; i < possible; i++)
|
2005-07-29 04:15:27 +00:00
|
|
|
cpu_set(i, cpu_possible_map);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2005-04-16 22:25:19 +00:00
|
|
|
/*
|
|
|
|
* Various sanity checks.
|
|
|
|
*/
|
[PATCH] x86_64: Change init sections for CPU hotplug support
This patch adds __cpuinit and __cpuinitdata sections that need to exist past
boot to support cpu hotplug.
Caveat: This is done *only* for EM64T CPU Hotplug support, on request from
Andi Kleen. Much of the generic hotplug code in kernel, and none of the other
archs that support CPU hotplug today, i386, ia64, ppc64, s390 and parisc dont
mark sections with __cpuinit, but only mark them as __devinit, and
__devinitdata.
If someone is motivated to change generic code, we need to make sure all
existing hotplug code does not break, on other arch's that dont use __cpuinit,
and __cpudevinit.
Signed-off-by: Ashok Raj <ashok.raj@intel.com>
Acked-by: Andi Kleen <ak@muc.de>
Acked-by: Zwane Mwaikambo <zwane@arm.linux.org.uk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-06-25 21:54:58 +00:00
|
|
|
static int __init smp_sanity_check(unsigned max_cpus)
|
2005-04-16 22:25:19 +00:00
|
|
|
{
|
2005-04-16 22:20:36 +00:00
|
|
|
if (!physid_isset(hard_smp_processor_id(), phys_cpu_present_map)) {
|
|
|
|
printk("weird, boot CPU (#%d) not listed by the BIOS.\n",
|
|
|
|
hard_smp_processor_id());
|
|
|
|
physid_set(hard_smp_processor_id(), phys_cpu_present_map);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* If we couldn't find an SMP configuration at boot time,
|
|
|
|
* get out of here now!
|
|
|
|
*/
|
|
|
|
if (!smp_found_config) {
|
|
|
|
printk(KERN_NOTICE "SMP motherboard not detected.\n");
|
2005-04-16 22:25:19 +00:00
|
|
|
disable_smp();
|
2005-04-16 22:20:36 +00:00
|
|
|
if (APIC_init_uniprocessor())
|
|
|
|
printk(KERN_NOTICE "Local APIC not detected."
|
|
|
|
" Using dummy APIC emulation.\n");
|
2005-04-16 22:25:19 +00:00
|
|
|
return -1;
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Should not be necessary because the MP table should list the boot
|
|
|
|
* CPU too, but we do it for the sake of robustness anyway.
|
|
|
|
*/
|
|
|
|
if (!physid_isset(boot_cpu_id, phys_cpu_present_map)) {
|
|
|
|
printk(KERN_NOTICE "weird, boot CPU (#%d) not listed by the BIOS.\n",
|
|
|
|
boot_cpu_id);
|
|
|
|
physid_set(hard_smp_processor_id(), phys_cpu_present_map);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* If we couldn't find a local APIC, then get out of here now!
|
|
|
|
*/
|
2006-01-11 21:46:51 +00:00
|
|
|
if (!cpu_has_apic) {
|
2005-04-16 22:20:36 +00:00
|
|
|
printk(KERN_ERR "BIOS bug, local APIC #%d not detected!...\n",
|
|
|
|
boot_cpu_id);
|
|
|
|
printk(KERN_ERR "... forcing use of dummy APIC emulation. (tell your hw vendor)\n");
|
2005-04-16 22:25:19 +00:00
|
|
|
nr_ioapics = 0;
|
|
|
|
return -1;
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* If SMP should be disabled, then really disable it!
|
|
|
|
*/
|
|
|
|
if (!max_cpus) {
|
|
|
|
printk(KERN_INFO "SMP mode deactivated, forcing use of dummy APIC emulation.\n");
|
2005-04-16 22:25:19 +00:00
|
|
|
nr_ioapics = 0;
|
|
|
|
return -1;
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
|
2005-04-16 22:25:19 +00:00
|
|
|
return 0;
|
|
|
|
}
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2005-04-16 22:25:19 +00:00
|
|
|
/*
|
|
|
|
* Prepare for SMP bootup. The MP table or ACPI has been read
|
|
|
|
* earlier. Just do some sanity checking here and enable APIC mode.
|
|
|
|
*/
|
[PATCH] x86_64: Change init sections for CPU hotplug support
This patch adds __cpuinit and __cpuinitdata sections that need to exist past
boot to support cpu hotplug.
Caveat: This is done *only* for EM64T CPU Hotplug support, on request from
Andi Kleen. Much of the generic hotplug code in kernel, and none of the other
archs that support CPU hotplug today, i386, ia64, ppc64, s390 and parisc dont
mark sections with __cpuinit, but only mark them as __devinit, and
__devinitdata.
If someone is motivated to change generic code, we need to make sure all
existing hotplug code does not break, on other arch's that dont use __cpuinit,
and __cpudevinit.
Signed-off-by: Ashok Raj <ashok.raj@intel.com>
Acked-by: Andi Kleen <ak@muc.de>
Acked-by: Zwane Mwaikambo <zwane@arm.linux.org.uk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-06-25 21:54:58 +00:00
|
|
|
void __init smp_prepare_cpus(unsigned int max_cpus)
|
2005-04-16 22:25:19 +00:00
|
|
|
{
|
|
|
|
nmi_watchdog_default();
|
|
|
|
current_cpu_data = boot_cpu_data;
|
|
|
|
current_thread_info()->cpu = 0; /* needed? */
|
2005-11-05 16:25:54 +00:00
|
|
|
set_cpu_sibling_map(0);
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2005-04-16 22:25:19 +00:00
|
|
|
if (smp_sanity_check(max_cpus) < 0) {
|
|
|
|
printk(KERN_INFO "SMP disabled\n");
|
|
|
|
disable_smp();
|
|
|
|
return;
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
|
2005-04-16 22:25:19 +00:00
|
|
|
|
2005-04-16 22:20:36 +00:00
|
|
|
/*
|
2005-04-16 22:25:19 +00:00
|
|
|
* Switch from PIC to APIC mode.
|
2005-04-16 22:20:36 +00:00
|
|
|
*/
|
2005-04-16 22:25:19 +00:00
|
|
|
setup_local_APIC();
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2005-04-16 22:25:19 +00:00
|
|
|
if (GET_APIC_ID(apic_read(APIC_ID)) != boot_cpu_id) {
|
|
|
|
panic("Boot APIC ID in local APIC unexpected (%d vs %d)",
|
|
|
|
GET_APIC_ID(apic_read(APIC_ID)), boot_cpu_id);
|
|
|
|
/* Or can we switch back to PIC here? */
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
2005-04-16 22:25:19 +00:00
|
|
|
* Now start the IO-APICs
|
2005-04-16 22:20:36 +00:00
|
|
|
*/
|
|
|
|
if (!skip_ioapic_setup && nr_ioapics)
|
|
|
|
setup_IO_APIC();
|
|
|
|
else
|
|
|
|
nr_ioapics = 0;
|
|
|
|
|
|
|
|
/*
|
2005-04-16 22:25:19 +00:00
|
|
|
* Set up local APIC timer on boot CPU.
|
2005-04-16 22:20:36 +00:00
|
|
|
*/
|
|
|
|
|
2005-04-16 22:25:19 +00:00
|
|
|
setup_boot_APIC_clock();
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
|
2005-04-16 22:25:19 +00:00
|
|
|
/*
|
|
|
|
* Early setup to make printk work.
|
|
|
|
*/
|
|
|
|
void __init smp_prepare_boot_cpu(void)
|
2005-04-16 22:20:36 +00:00
|
|
|
{
|
2005-04-16 22:25:19 +00:00
|
|
|
int me = smp_processor_id();
|
|
|
|
cpu_set(me, cpu_online_map);
|
|
|
|
cpu_set(me, cpu_callout_map);
|
2005-06-25 21:55:02 +00:00
|
|
|
per_cpu(cpu_state, me) = CPU_ONLINE;
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
|
2005-04-16 22:25:19 +00:00
|
|
|
/*
|
|
|
|
* Entry point to boot a CPU.
|
|
|
|
*/
|
|
|
|
int __cpuinit __cpu_up(unsigned int cpu)
|
2005-04-16 22:20:36 +00:00
|
|
|
{
|
2005-04-16 22:25:19 +00:00
|
|
|
int apicid = cpu_present_to_apicid(cpu);
|
2007-03-07 17:12:31 +00:00
|
|
|
unsigned long flags;
|
|
|
|
int err;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2005-04-16 22:25:19 +00:00
|
|
|
WARN_ON(irqs_disabled());
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2005-04-16 22:25:19 +00:00
|
|
|
Dprintk("++++++++++++++++++++=_---CPU UP %u\n", cpu);
|
|
|
|
|
|
|
|
if (apicid == BAD_APICID || apicid == boot_cpu_id ||
|
|
|
|
!physid_isset(apicid, phys_cpu_present_map)) {
|
|
|
|
printk("__cpu_up: bad cpu %d\n", cpu);
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
|
2005-06-25 21:55:00 +00:00
|
|
|
/*
|
|
|
|
* Already booted CPU?
|
|
|
|
*/
|
|
|
|
if (cpu_isset(cpu, cpu_callin_map)) {
|
|
|
|
Dprintk("do_boot_cpu %d Already started\n", cpu);
|
|
|
|
return -ENOSYS;
|
|
|
|
}
|
|
|
|
|
[PATCH] x86: Save the MTRRs of the BSP before booting an AP
Applied fix by Andew Morton:
http://lkml.org/lkml/2007/4/8/88 - Fix `make headers_check'.
AMD and Intel x86 CPU manuals state that it is the responsibility of
system software to initialize and maintain MTRR consistency across
all processors in Multi-Processing Environments.
Quote from page 188 of the AMD64 System Programming manual (Volume 2):
7.6.5 MTRRs in Multi-Processing Environments
"In multi-processing environments, the MTRRs located in all processors must
characterize memory in the same way. Generally, this means that identical
values are written to the MTRRs used by the processors." (short omission here)
"Failure to do so may result in coherency violations or loss of atomicity.
Processor implementations do not check the MTRR settings in other processors
to ensure consistency. It is the responsibility of system software to
initialize and maintain MTRR consistency across all processors."
Current Linux MTRR code already implements the above in the case that the
BIOS does not properly initialize MTRRs on the secondary processors,
but the case where the fixed-range MTRRs of the boot processor are changed
after Linux started to boot, before the initialsation of a secondary
processor, is not handled yet.
In this case, secondary processors are currently initialized by Linux
with MTRRs which the boot processor had very early, when mtrr_bp_init()
did run, but not with the MTRRs which the boot processor uses at the
time when that secondary processors is actually booted,
causing differing MTRR contents on the secondary processors.
Such situation happens on Acer Ferrari 1000 and 5000 notebooks where the
BIOS enables and sets AMD-specific IORR bits in the fixed-range MTRRs
of the boot processor when it transitions the system into ACPI mode.
The SMI handler of the BIOS does this in SMM, entered while Linux ACPI
code runs acpi_enable().
Other occasions where the SMI handler of the BIOS may change bits in
the MTRRs could occur as well. To initialize newly booted secodary
processors with the fixed-range MTRRs which the boot processor uses
at that time, this patch saves the fixed-range MTRRs of the boot
processor before new secondary processors are started. When the
secondary processors run their Linux initialisation code, their
fixed-range MTRRs will be updated with the saved fixed-range MTRRs.
If CONFIG_MTRR is not set, we define mtrr_save_state
as an empty statement because there is nothing to do.
Possible TODOs:
*) CPU-hotplugging outside of SMP suspend/resume is not yet tested
with this patch.
*) If, even in this case, an AP never runs i386/do_boot_cpu or x86_64/cpu_up,
then the calls to mtrr_save_state() could be replaced by calls to
mtrr_save_fixed_ranges(NULL) and mtrr_save_state() would not be
needed.
That would need either verification of the CPU-hotplug code or
at least a test on a >2 CPU machine.
*) The MTRRs of other running processors are not yet checked at this
time but it might be interesting to syncronize the MTTRs of all
processors before booting. That would be an incremental patch,
but of rather low priority since there is no machine known so
far which would require this.
AK: moved prototypes on x86-64 around to fix warnings
Signed-off-by: Bernhard Kaindl <bk@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Andi Kleen <ak@suse.de>
Cc: Andi Kleen <ak@suse.de>
Cc: Dave Jones <davej@codemonkey.org.uk>
2007-05-02 17:27:17 +00:00
|
|
|
/*
|
|
|
|
* Save current MTRR state in case it was changed since early boot
|
|
|
|
* (e.g. by the ACPI SMI) to initialize new CPUs with MTRRs in sync:
|
|
|
|
*/
|
|
|
|
mtrr_save_state();
|
|
|
|
|
2005-06-25 21:55:02 +00:00
|
|
|
per_cpu(cpu_state, cpu) = CPU_UP_PREPARE;
|
2005-04-16 22:25:19 +00:00
|
|
|
/* Boot it! */
|
|
|
|
err = do_boot_cpu(cpu, apicid);
|
|
|
|
if (err < 0) {
|
|
|
|
Dprintk("do_boot_cpu failed %d\n", err);
|
|
|
|
return err;
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
2005-04-16 22:25:19 +00:00
|
|
|
|
2005-04-16 22:20:36 +00:00
|
|
|
/* Unleash the CPU! */
|
|
|
|
Dprintk("waiting for cpu %d\n", cpu);
|
|
|
|
|
2007-02-16 09:27:34 +00:00
|
|
|
/*
|
|
|
|
* Make sure and check TSC sync:
|
|
|
|
*/
|
2007-03-07 17:12:31 +00:00
|
|
|
local_irq_save(flags);
|
2007-02-16 09:27:34 +00:00
|
|
|
check_tsc_sync_source(cpu);
|
2007-03-07 17:12:31 +00:00
|
|
|
local_irq_restore(flags);
|
2007-02-16 09:27:34 +00:00
|
|
|
|
2005-04-16 22:20:36 +00:00
|
|
|
while (!cpu_isset(cpu, cpu_online_map))
|
2005-04-16 22:25:19 +00:00
|
|
|
cpu_relax();
|
2005-06-25 21:55:00 +00:00
|
|
|
err = 0;
|
|
|
|
|
|
|
|
return err;
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
|
2005-04-16 22:25:19 +00:00
|
|
|
/*
|
|
|
|
* Finish the SMP boot.
|
|
|
|
*/
|
[PATCH] x86_64: Change init sections for CPU hotplug support
This patch adds __cpuinit and __cpuinitdata sections that need to exist past
boot to support cpu hotplug.
Caveat: This is done *only* for EM64T CPU Hotplug support, on request from
Andi Kleen. Much of the generic hotplug code in kernel, and none of the other
archs that support CPU hotplug today, i386, ia64, ppc64, s390 and parisc dont
mark sections with __cpuinit, but only mark them as __devinit, and
__devinitdata.
If someone is motivated to change generic code, we need to make sure all
existing hotplug code does not break, on other arch's that dont use __cpuinit,
and __cpudevinit.
Signed-off-by: Ashok Raj <ashok.raj@intel.com>
Acked-by: Andi Kleen <ak@muc.de>
Acked-by: Zwane Mwaikambo <zwane@arm.linux.org.uk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-06-25 21:54:58 +00:00
|
|
|
void __init smp_cpus_done(unsigned int max_cpus)
|
2005-04-16 22:20:36 +00:00
|
|
|
{
|
2005-04-16 22:25:19 +00:00
|
|
|
smp_cleanup_boot();
|
2005-04-16 22:20:36 +00:00
|
|
|
setup_ioapic_dest();
|
2005-05-17 04:53:34 +00:00
|
|
|
check_nmi_watchdog();
|
2005-04-16 22:25:19 +00:00
|
|
|
}
|
2005-06-25 21:55:00 +00:00
|
|
|
|
|
|
|
#ifdef CONFIG_HOTPLUG_CPU
|
|
|
|
|
2005-06-25 21:55:01 +00:00
|
|
|
static void remove_siblinginfo(int cpu)
|
2005-06-25 21:55:00 +00:00
|
|
|
{
|
|
|
|
int sibling;
|
2005-11-05 16:25:54 +00:00
|
|
|
struct cpuinfo_x86 *c = cpu_data;
|
2005-06-25 21:55:00 +00:00
|
|
|
|
2007-10-16 08:24:04 +00:00
|
|
|
for_each_cpu_mask(sibling, per_cpu(cpu_core_map, cpu)) {
|
|
|
|
cpu_clear(cpu, per_cpu(cpu_core_map, sibling));
|
2005-11-05 16:25:54 +00:00
|
|
|
/*
|
|
|
|
* last thread sibling in this cpu core going down
|
|
|
|
*/
|
2007-10-16 08:24:05 +00:00
|
|
|
if (cpus_weight(per_cpu(cpu_sibling_map, cpu)) == 1)
|
2005-11-05 16:25:54 +00:00
|
|
|
c[sibling].booted_cores--;
|
|
|
|
}
|
|
|
|
|
2007-10-16 08:24:05 +00:00
|
|
|
for_each_cpu_mask(sibling, per_cpu(cpu_sibling_map, cpu))
|
|
|
|
cpu_clear(cpu, per_cpu(cpu_sibling_map, sibling));
|
|
|
|
cpus_clear(per_cpu(cpu_sibling_map, cpu));
|
2007-10-16 08:24:04 +00:00
|
|
|
cpus_clear(per_cpu(cpu_core_map, cpu));
|
2006-06-26 11:58:17 +00:00
|
|
|
c[cpu].phys_proc_id = 0;
|
|
|
|
c[cpu].cpu_core_id = 0;
|
2005-11-05 16:25:54 +00:00
|
|
|
cpu_clear(cpu, cpu_sibling_setup_map);
|
2005-06-25 21:55:00 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void remove_cpu_from_maps(void)
|
|
|
|
{
|
|
|
|
int cpu = smp_processor_id();
|
|
|
|
|
|
|
|
cpu_clear(cpu, cpu_callout_map);
|
|
|
|
cpu_clear(cpu, cpu_callin_map);
|
|
|
|
clear_bit(cpu, &cpu_initialized); /* was set by cpu_init() */
|
2006-02-07 20:58:23 +00:00
|
|
|
clear_node_cpumask(cpu);
|
2005-06-25 21:55:00 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
int __cpu_disable(void)
|
|
|
|
{
|
|
|
|
int cpu = smp_processor_id();
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Perhaps use cpufreq to drop frequency, but that could go
|
|
|
|
* into generic code.
|
|
|
|
*
|
|
|
|
* We won't take down the boot processor on i386 due to some
|
|
|
|
* interrupts only being able to be serviced by the BSP.
|
|
|
|
* Especially so if we're not using an IOAPIC -zwane
|
|
|
|
*/
|
|
|
|
if (cpu == 0)
|
|
|
|
return -EBUSY;
|
|
|
|
|
2006-09-26 08:52:27 +00:00
|
|
|
if (nmi_watchdog == NMI_LOCAL_APIC)
|
|
|
|
stop_apic_nmi_watchdog(NULL);
|
2005-12-13 06:17:08 +00:00
|
|
|
clear_local_APIC();
|
2005-06-25 21:55:00 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* HACK:
|
|
|
|
* Allow any queued timer interrupts to get serviced
|
|
|
|
* This is only a temporary solution until we cleanup
|
|
|
|
* fixup_irqs as we do for IA64.
|
|
|
|
*/
|
|
|
|
local_irq_enable();
|
|
|
|
mdelay(1);
|
|
|
|
|
|
|
|
local_irq_disable();
|
|
|
|
remove_siblinginfo(cpu);
|
|
|
|
|
2006-10-24 23:00:23 +00:00
|
|
|
spin_lock(&vector_lock);
|
2005-06-25 21:55:00 +00:00
|
|
|
/* It's now safe to remove this processor from the online map */
|
|
|
|
cpu_clear(cpu, cpu_online_map);
|
2006-10-24 23:00:23 +00:00
|
|
|
spin_unlock(&vector_lock);
|
2005-06-25 21:55:00 +00:00
|
|
|
remove_cpu_from_maps();
|
|
|
|
fixup_irqs(cpu_online_map);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
void __cpu_die(unsigned int cpu)
|
|
|
|
{
|
|
|
|
/* We don't do anything here: idle task is faking death itself. */
|
|
|
|
unsigned int i;
|
|
|
|
|
|
|
|
for (i = 0; i < 10; i++) {
|
|
|
|
/* They ack this in play_dead by setting CPU_DEAD */
|
2005-06-25 21:55:02 +00:00
|
|
|
if (per_cpu(cpu_state, cpu) == CPU_DEAD) {
|
|
|
|
printk ("CPU %d is now offline\n", cpu);
|
2006-06-26 11:56:16 +00:00
|
|
|
if (1 == num_online_cpus())
|
|
|
|
alternatives_smp_switch(0);
|
2005-06-25 21:55:00 +00:00
|
|
|
return;
|
2005-06-25 21:55:02 +00:00
|
|
|
}
|
2005-07-29 04:15:53 +00:00
|
|
|
msleep(100);
|
2005-06-25 21:55:00 +00:00
|
|
|
}
|
|
|
|
printk(KERN_ERR "CPU %u didn't die...\n", cpu);
|
|
|
|
}
|
|
|
|
|
2006-09-26 08:52:32 +00:00
|
|
|
static __init int setup_additional_cpus(char *s)
|
2005-11-05 16:25:54 +00:00
|
|
|
{
|
2006-09-26 08:52:32 +00:00
|
|
|
return s && get_option(&s, &additional_cpus) ? 0 : -EINVAL;
|
2005-11-05 16:25:54 +00:00
|
|
|
}
|
2006-09-26 08:52:32 +00:00
|
|
|
early_param("additional_cpus", setup_additional_cpus);
|
2005-11-05 16:25:54 +00:00
|
|
|
|
2005-06-25 21:55:00 +00:00
|
|
|
#else /* ... !CONFIG_HOTPLUG_CPU */
|
|
|
|
|
|
|
|
int __cpu_disable(void)
|
|
|
|
{
|
|
|
|
return -ENOSYS;
|
|
|
|
}
|
|
|
|
|
|
|
|
void __cpu_die(unsigned int cpu)
|
|
|
|
{
|
|
|
|
/* We said "no" in __cpu_disable */
|
|
|
|
BUG();
|
|
|
|
}
|
|
|
|
#endif /* CONFIG_HOTPLUG_CPU */
|