diff options
| author | Glauber de Oliveira Costa | 2008-03-19 18:25:11 +0100 |
|---|---|---|
| committer | Ingo Molnar | 2008-04-17 17:41:00 +0200 |
| commit | 148a30f8cf2ac72b7ea6e5c8971fad8d80ec3879 (patch) | |
| tree | 471a35308b130102ea4dfabe007a821667cccd81 /arch/x86/kernel/smpboot_64.c | |
| parent | x86: provide APIC_INTEGRATED definition for x86_64 (diff) | |
| download | kernel-qcow2-linux-148a30f8cf2ac72b7ea6e5c8971fad8d80ec3879.tar.gz kernel-qcow2-linux-148a30f8cf2ac72b7ea6e5c8971fad8d80ec3879.tar.xz kernel-qcow2-linux-148a30f8cf2ac72b7ea6e5c8971fad8d80ec3879.zip | |
x86: use APIC_INTEGRATED tests in x86_64
This patch does not change the behaviour of x86_64, since APIC_INTEGRATED
is always defined as (1). But the code now matches exactly i386 version
(well, this part of the code, at least)
Signed-off-by: Glauber Costa <gcosta@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/smpboot_64.c')
| -rw-r--r-- | arch/x86/kernel/smpboot_64.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/arch/x86/kernel/smpboot_64.c b/arch/x86/kernel/smpboot_64.c index cfcfd2c2062b..d7b59d6c6963 100644 --- a/arch/x86/kernel/smpboot_64.c +++ b/arch/x86/kernel/smpboot_64.c @@ -295,6 +295,15 @@ static int __cpuinit wakeup_secondary_via_INIT(int phys_apicid, unsigned int sta unsigned long send_status, accept_status = 0; int maxlvt, num_starts, j; + /* + * Be paranoid about clearing APIC errors. + */ + if (APIC_INTEGRATED(apic_version[phys_apicid])) { + apic_read_around(APIC_SPIV); + apic_write(APIC_ESR, 0); + apic_read(APIC_ESR); + } + Dprintk("Asserting INIT.\n"); /* @@ -327,7 +336,10 @@ static int __cpuinit wakeup_secondary_via_INIT(int phys_apicid, unsigned int sta mb(); atomic_set(&init_deasserted, 1); - num_starts = 2; + if (APIC_INTEGRATED(apic_version[phys_apicid])) + num_starts = 2; + else + num_starts = 0; /* * Paravirt / VMI wants a startup IPI hook here to set up the |