Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1506371 > unrolled thread
| Started by | ville.syrjala@linux.intel.com |
|---|---|
| First post | 2016-10-22 04:20 +0200 |
| Last post | 2016-10-25 20:40 +0200 |
| Articles | 2 — 2 participants |
Back to article view | Back to linux.kernel
[PATCH] arch/x86: Don't try to poke disabled/non-existent APIC ville.syrjala@linux.intel.com - 2016-10-22 04:20 +0200
Re: [PATCH] arch/x86: Don't try to poke disabled/non-existent APIC Prarit Bhargava <prarit@redhat.com> - 2016-10-25 20:40 +0200
| From | ville.syrjala@linux.intel.com |
|---|---|
| Date | 2016-10-22 04:20 +0200 |
| Subject | [PATCH] arch/x86: Don't try to poke disabled/non-existent APIC |
| Message-ID | <suU4F-5LZ-1@gated-at.bofh.it> |
From: Ville Syrjälä <ville.syrjala@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: stable@vger.kernel.org
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: x86@kernel.org
Cc: Prarit Bhargava <prarit@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Len Brown <len.brown@intel.com>
Cc: Borislav Petkov <bp@suse.de>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Juergen Gross <jgross@suse.com>
Cc: dyoung@redhat.com
Cc: Eric Biederman <ebiederm@xmission.com>
Cc: kexec@lists.infradead.org
Cc: Thomas Gleixner <tglx@linutronix.de>
Fixes: 2a51fe083eba ("arch/x86: Handle non enumerated CPU after physical hotplug")
Signed-off-by: Ville Syrjälä <ville.syrjala@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
[toc] | [next] | [standalone]
| From | Prarit Bhargava <prarit@redhat.com> |
|---|---|
| Date | 2016-10-25 20:40 +0200 |
| Message-ID | <sweNI-Sp-43@gated-at.bofh.it> |
| In reply to | #1506371 |
On 10/21/2016 10:18 PM, ville.syrjala@linux.intel.com wrote:
> From: Ville Syrjälä <ville.syrjala@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: stable@vger.kernel.org
> Cc: Ingo Molnar <mingo@redhat.com>
> Cc: "H. Peter Anvin" <hpa@zytor.com>
> Cc: x86@kernel.org
> Cc: Prarit Bhargava <prarit@redhat.com>
> Cc: Peter Zijlstra <peterz@infradead.org>
> Cc: Len Brown <len.brown@intel.com>
> Cc: Borislav Petkov <bp@suse.de>
> Cc: Andi Kleen <ak@linux.intel.com>
> Cc: Jiri Olsa <jolsa@redhat.com>
> Cc: Juergen Gross <jgross@suse.com>
> Cc: dyoung@redhat.com
> Cc: Eric Biederman <ebiederm@xmission.com>
> Cc: kexec@lists.infradead.org
> Cc: Thomas Gleixner <tglx@linutronix.de>
> Fixes: 2a51fe083eba ("arch/x86: Handle non enumerated CPU after physical hotplug")
> Signed-off-by: Ville Syrjälä <ville.syrjala@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)) {
It looks okay to gate on X86_FEATURE_APIC, but not sure if it should be
cpu_has(&cpu_data(0), X86_FEATURE_APIC)
since smp_store_boot_cpu_info() was already called.
tglx?
P.
> + 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;
>
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web