From: Ville Syrjälä <ville.syrj...@linux.intel.com>
Apparently trying to poke a disabled or non-existent APIC
leads to a box that doesn't even boot. Let's not do that.
No real clue if this is the right fix, but at least my
P3 machine boots again.
Cc: sta...@vger.kernel.org
Cc: Ingo Molnar <mi...@redhat.com>
Cc: "H. Peter Anvin" <h...@zytor.com>
Cc: x...@kernel.org
Cc: Prarit Bhargava <pra...@redhat.com>
Cc: Peter Zijlstra <pet...@infradead.org>
Cc: Len Brown <len.br...@intel.com>
Cc: Borislav Petkov <b...@suse.de>
Cc: Andi Kleen <a...@linux.intel.com>
Cc: Jiri Olsa <jo...@redhat.com>
Cc: Juergen Gross <jgr...@suse.com>
Cc: dyo...@redhat.com
Cc: Eric Biederman <ebied...@xmission.com>
Cc: ke...@lists.infradead.org
Cc: Thomas Gleixner <t...@linutronix.de>
Fixes: 2a51fe083eba ("arch/x86: Handle non enumerated CPU after physical
hotplug")
Signed-off-by: Ville Syrjälä <ville.syrj...@linux.intel.com>
---
arch/x86/kernel/smpboot.c | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index 951f093a96fe..42f5eb7b4f6c 100644
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -1409,15 +1409,17 @@ __init void prefill_possible_map(void)
/* No boot processor was found in mptable or ACPI MADT */
if (!num_processors) {
- int apicid = boot_cpu_physical_apicid;
- int cpu = hard_smp_processor_id();
+ if (boot_cpu_has(X86_FEATURE_APIC)) {
+ int apicid = boot_cpu_physical_apicid;
+ int cpu = hard_smp_processor_id();
- pr_warn("Boot CPU (id %d) not listed by BIOS\n", cpu);
+ pr_warn("Boot CPU (id %d) not listed by BIOS\n", cpu);
- /* Make sure boot cpu is enumerated */
- if (apic->cpu_present_to_apicid(0) == BAD_APICID &&
- apic->apic_id_valid(apicid))
- generic_processor_info(apicid, boot_cpu_apic_version);
+ /* Make sure boot cpu is enumerated */
+ if (apic->cpu_present_to_apicid(0) == BAD_APICID &&
+ apic->apic_id_valid(apicid))
+ generic_processor_info(apicid,
boot_cpu_apic_version);
+ }
if (!num_processors)
num_processors = 1;
--
2.7.4
