From: Dou Liyang <douly.fnst@cn.fujitsu.com>
To: <x86@kernel.org>, <linux-kernel@vger.kernel.org>
Cc: <tglx@linutronix.de>, <mingo@kernel.org>, <hpa@zytor.com>,
<ebiederm@xmission.com>, <bhe@redhat.com>,
<izumi.taku@jp.fujitsu.com>,
Dou Liyang <douly.fnst@cn.fujitsu.com>
Subject: [RFC PATCH v2 08/12] x86/apic: Make the interrupt mode setup earlier for SMP-capable system
Date: Wed, 19 Apr 2017 17:05:22 +0800 [thread overview]
Message-ID: <d6dc14ee055d6d78bd11061b3ff364a1fb9ee1df.1492589715.git.douly.fnst@cn.fujitsu.com> (raw)
In-Reply-To: <cover.1492589715.git.douly.fnst@cn.fujitsu.com>
In the SMP-capable system, enable and setup the interrupt delivery
mode in native_smp_prepare_cpus() which almost be called at the end of
start_kernel().
But, calibrate delay needs the timer interrupt which may be disabled
in dump-capture kernel.
Due to the MP table or ACPI has been read earlier, setup the interrupt
mode as soon as possible to cleanup the disabled situation for
SMP-capable system.
Signed-off-by: Dou Liyang <douly.fnst@cn.fujitsu.com>
---
arch/x86/kernel/apic/apic.c | 21 +++++++++++++++++++++
arch/x86/kernel/smpboot.c | 10 ----------
2 files changed, 21 insertions(+), 10 deletions(-)
diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
index f726c4f..170cd1a 100644
--- a/arch/x86/kernel/apic/apic.c
+++ b/arch/x86/kernel/apic/apic.c
@@ -1157,6 +1157,7 @@ enum apic_interrupt_mode {
APIC_PIC = 0,
APIC_VIRTUAL_WIRE,
APIC_SYMMETRIC_IO,
+ APIC_SYMMETRIC_IO_NO_ROUTING,
APIC_MODE_COUNT
};
@@ -1207,6 +1208,20 @@ static int __init apic_bsp_mode_check(void)
/* Other checks of ACPI options will be done in each setup function */
+#ifdef CONFIG_SMP
+ if (read_apic_id() != boot_cpu_physical_apicid) {
+ panic("Boot APIC ID in local APIC unexpected (%d vs %d)",
+ read_apic_id(), boot_cpu_physical_apicid);
+ /* Or can we switch back to PIC here? */
+ }
+
+ /* If SMP should be disabled, then really disable it! */
+ if (!setup_max_cpus) {
+ pr_info("SMP mode deactivated\n");
+ return APIC_SYMMETRIC_IO_NO_ROUTING;
+ }
+#endif
+
return APIC_SYMMETRIC_IO;
}
@@ -1271,6 +1286,12 @@ void __init init_interrupt_mode(void)
return;
case APIC_SYMMETRIC_IO:
pr_info("Switch to symmectic I/O mode\n");
+ default_setup_apic_routing();
+ apic_bsp_setup(false);
+ return;
+ case APIC_SYMMETRIC_IO_NO_ROUTING:
+ pr_info("Switch to symmectic I/O mode with no APIC routing\n");
+ apic_bsp_setup(false);
return;
}
}
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index 830b01b..345ad20 100644
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -1332,21 +1332,11 @@ void __init native_smp_prepare_cpus(unsigned int max_cpus)
return;
case SMP_FORCE_UP:
disable_smp();
- apic_bsp_setup(false);
return;
case SMP_OK:
break;
}
- if (read_apic_id() != boot_cpu_physical_apicid) {
- panic("Boot APIC ID in local APIC unexpected (%d vs %d)",
- read_apic_id(), boot_cpu_physical_apicid);
- /* Or can we switch back to PIC here? */
- }
-
- default_setup_apic_routing();
- cpu0_logical_apicid = apic_bsp_setup(false);
-
if (x2apic_mode)
cpu0_logical_apicid = apic_read(APIC_LDR);
else
--
2.5.5
next prev parent reply other threads:[~2017-04-19 9:06 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-19 9:05 [RFC PATCH v2 00/12] Unify interrupt mode and setup it as soon as possible Dou Liyang
2017-04-19 9:05 ` [RFC PATCH v2 01/12] x86/apic: Replace init_bsp_APIC() with apic_virtual_wire_mode_setup() Dou Liyang
2017-04-19 9:05 ` [RFC PATCH v2 02/12] x86/apic: Construct a selector for the interrupt delivery mode Dou Liyang
2017-04-19 9:05 ` [RFC PATCH v2 03/12] x86/apic: Prepare for unifying the interrupt delivery modes setup Dou Liyang
2017-04-19 9:05 ` [RFC PATCH v2 04/12] x86/time: Initialize interrupt mode behind timer init Dou Liyang
2017-04-19 9:05 ` [RFC PATCH v2 05/12] x86/ioapic: Refactor the delay logic in timer_irq_works() Dou Liyang
2017-04-19 9:05 ` [RFC PATCH v2 06/12] x86/apic: Split local APIC timer setup from the APIC setup Dou Liyang
2017-04-19 9:05 ` [RFC PATCH v2 07/12] x86/apic: Move the logical APIC ID setup from apic_bsp_setup() Dou Liyang
2017-04-19 9:05 ` Dou Liyang [this message]
2017-04-19 9:05 ` [RFC PATCH v2 09/12] x86/apic: Setup interrupt mode earlier in case of no SMP motherboard Dou Liyang
2017-04-19 9:05 ` [RFC PATCH v2 10/12] x86/apic: Make the interrupt mode setup earlier for UP system Dou Liyang
2017-04-19 9:05 ` [RFC PATCH v2 11/12] x86/apic: Mark the apic_interrupt_mode extern for refining code Dou Liyang
2017-04-19 9:05 ` [RFC PATCH v2 12/12] x86/apic: Remove the apic_virtual_wire_mode_setup() Dou Liyang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=d6dc14ee055d6d78bd11061b3ff364a1fb9ee1df.1492589715.git.douly.fnst@cn.fujitsu.com \
--to=douly.fnst@cn.fujitsu.com \
--cc=bhe@redhat.com \
--cc=ebiederm@xmission.com \
--cc=hpa@zytor.com \
--cc=izumi.taku@jp.fujitsu.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=tglx@linutronix.de \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).