提交 1db17f55 编写于 作者: G Glauber de Oliveira Costa 提交者: Ingo Molnar

x86: change x86_64 native_smp_prepare_cpus to match i386

An APIC test is moved, and code is replaced by the mach-default
already defined function (smpboot_setup_io_apic).
setup_portio_remap() is added, but it is a nop in mach-default.
Signed-off-by: NGlauber Costa <gcosta@redhat.com>
Signed-off-by: NIngo Molnar <mingo@elte.hu>
上级 3fa7b348
...@@ -71,6 +71,7 @@ int smp_threads_ready; ...@@ -71,6 +71,7 @@ int smp_threads_ready;
cycles_t cacheflush_time; cycles_t cacheflush_time;
unsigned long cache_decay_ticks; unsigned long cache_decay_ticks;
static int boot_cpu_logical_apicid;
/* /*
* Fall back to non SMP mode after errors. * Fall back to non SMP mode after errors.
* *
...@@ -167,7 +168,11 @@ void __init native_smp_prepare_cpus(unsigned int max_cpus) ...@@ -167,7 +168,11 @@ void __init native_smp_prepare_cpus(unsigned int max_cpus)
{ {
nmi_watchdog_default(); nmi_watchdog_default();
smp_cpu_index_default(); smp_cpu_index_default();
cpu_callin_map = cpumask_of_cpu(0);
mb();
current_cpu_data = boot_cpu_data; current_cpu_data = boot_cpu_data;
boot_cpu_logical_apicid = logical_smp_processor_id();
current_thread_info()->cpu = 0; /* needed? */ current_thread_info()->cpu = 0; /* needed? */
set_cpu_sibling_map(0); set_cpu_sibling_map(0);
...@@ -177,6 +182,11 @@ void __init native_smp_prepare_cpus(unsigned int max_cpus) ...@@ -177,6 +182,11 @@ void __init native_smp_prepare_cpus(unsigned int max_cpus)
return; return;
} }
if (GET_APIC_ID(apic_read(APIC_ID)) != boot_cpu_physical_apicid) {
panic("Boot APIC ID in local APIC unexpected (%d vs %d)",
GET_APIC_ID(apic_read(APIC_ID)), boot_cpu_physical_apicid);
/* Or can we switch back to PIC here? */
}
/* /*
* Switch from PIC to APIC mode. * Switch from PIC to APIC mode.
...@@ -190,20 +200,6 @@ void __init native_smp_prepare_cpus(unsigned int max_cpus) ...@@ -190,20 +200,6 @@ void __init native_smp_prepare_cpus(unsigned int max_cpus)
enable_IO_APIC(); enable_IO_APIC();
end_local_APIC_setup(); end_local_APIC_setup();
if (GET_APIC_ID(apic_read(APIC_ID)) != boot_cpu_physical_apicid) {
panic("Boot APIC ID in local APIC unexpected (%d vs %d)",
GET_APIC_ID(apic_read(APIC_ID)), boot_cpu_physical_apicid);
/* Or can we switch back to PIC here? */
}
/*
* Now start the IO-APICs
*/
if (!skip_ioapic_setup && nr_ioapics)
setup_IO_APIC();
else
nr_ioapics = 0;
/* /*
* Set up local APIC timer on boot CPU. * Set up local APIC timer on boot CPU.
*/ */
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册