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 v3 09/12] x86/apic: Setup interrupt mode earlier in case of no SMP motherboard
Date: Wed, 10 May 2017 21:44:46 +0800 [thread overview]
Message-ID: <1494423889-25799-10-git-send-email-douly.fnst@cn.fujitsu.com> (raw)
In-Reply-To: <1494423889-25799-1-git-send-email-douly.fnst@cn.fujitsu.com>
Kernel falls back to non SMP mode and sets up interrupt delivery mode
in APIC_init_uniprocessor() in case of no SMP motherboard.
Setting up interrupt delivery mode as soon as possible should wraps
this case for SMP-capable system too.
Wrap this case, make it consistent with SMP-capable systems.
Incidentally,
-Extract apic_bsp_setup() and Refine apic_interrupt_mode_init().
Signed-off-by: Dou Liyang <douly.fnst@cn.fujitsu.com>
---
v2 --> v3:
Replace APIC_SYMMETRIC_IO_NO_CONFIG with APIC_VIRTUAL_WIRE_NO_CONFIG
Do some cleanup.
arch/x86/kernel/apic/apic.c | 23 ++++++++++++++++-------
arch/x86/kernel/smpboot.c | 2 --
2 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
index 941ae1e..b09650d 100644
--- a/arch/x86/kernel/apic/apic.c
+++ b/arch/x86/kernel/apic/apic.c
@@ -1160,12 +1160,13 @@ void __init sync_Arb_IDs(void)
enum apic_interrupt_mode {
APIC_PIC = 0,
APIC_VIRTUAL_WIRE,
+ APIC_VIRTUAL_WIRE_NO_CONFIG,
APIC_SYMMETRIC_IO,
APIC_SYMMETRIC_IO_NO_ROUTING,
APIC_MODE_COUNT
};
-static int __init apic_interrupt_mode_select(void)
+static int __init apic_interrupt_mode_select(int *upmode)
{
/* Check kernel option */
if (disable_apic) {
@@ -1208,8 +1209,12 @@ static int __init apic_interrupt_mode_select(void)
if (!smp_found_config) {
disable_ioapic_support();
- if (!acpi_lapic)
+ if (!acpi_lapic) {
pr_info("ACPI MADT or MP table not detected\n");
+ *upmode = true;
+
+ return APIC_VIRTUAL_WIRE_NO_CONFIG;
+ }
return APIC_VIRTUAL_WIRE;
}
@@ -1285,23 +1290,27 @@ void __init apic_virtual_wire_mode_setup(void)
/* Init the interrupt delivery mode for the BSP */
void __init apic_interrupt_mode_init(void)
{
- switch (apic_interrupt_mode_select()) {
+ int upmode = false;
+
+ switch (apic_interrupt_mode_select(&upmode)) {
case APIC_PIC:
pr_info("Keep in PIC mode(8259)\n");
return;
case APIC_VIRTUAL_WIRE:
+ case APIC_VIRTUAL_WIRE_NO_CONFIG:
pr_info("Switch to virtual wire mode\n");
- return;
+ default_setup_apic_routing();
+ break;
case APIC_SYMMETRIC_IO:
pr_info("Switch to symmectic I/O mode\n");
default_setup_apic_routing();
- apic_bsp_setup(false);
- return;
+ break;
case APIC_SYMMETRIC_IO_NO_ROUTING:
pr_info("Switch to symmectic I/O mode with no APIC routing\n");
- apic_bsp_setup(false);
return;
}
+
+ apic_bsp_setup(upmode);
}
static void lapic_setup_esr(void)
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index 2101d5c..6e8c39b 100644
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -1324,8 +1324,6 @@ void __init native_smp_prepare_cpus(unsigned int max_cpus)
switch (smp_sanity_check(max_cpus)) {
case SMP_NO_CONFIG:
disable_smp();
- if (APIC_init_uniprocessor())
- pr_notice("Local APIC not detected. Using dummy APIC emulation.\n");
return;
case SMP_NO_APIC:
disable_smp();
--
2.5.5
next prev parent reply other threads:[~2017-05-10 13:46 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-10 13:44 [RFC PATCH v3 00/12] Unify interrupt mode and setup it as soon as possible Dou Liyang
2017-05-10 13:44 ` [RFC PATCH v3 01/12] x86/apic: Replace init_bsp_APIC() with apic_virtual_wire_mode_setup() Dou Liyang
2017-05-10 13:44 ` [RFC PATCH v3 02/12] x86/apic: Construct a selector for the interrupt delivery mode Dou Liyang
2017-05-10 13:44 ` [RFC PATCH v3 03/12] x86/apic: Prepare for unifying the interrupt delivery modes setup Dou Liyang
2017-05-10 13:44 ` [RFC PATCH v3 04/12] x86/time: Initialize interrupt mode behind timer init Dou Liyang
2017-06-06 6:00 ` [RFC PATCH v4 " Dou Liyang
2017-05-10 13:44 ` [RFC PATCH v3 05/12] x86/ioapic: Refactor the delay logic in timer_irq_works() Dou Liyang
2017-05-26 8:10 ` [RFC PATCH v4 " Dou Liyang
2017-05-10 13:44 ` [RFC PATCH v3 06/12] x86/apic: Split local APIC timer setup from the APIC setup Dou Liyang
2017-05-10 13:44 ` [RFC PATCH v3 07/12] x86/apic: Move the logical APIC ID setup from apic_bsp_setup() Dou Liyang
2017-05-10 13:44 ` [RFC PATCH v3 08/12] x86/apic: Make interrupt mode setup earlier for SMP-capable system Dou Liyang
2017-05-10 13:44 ` Dou Liyang [this message]
2017-05-12 9:55 ` [RFC PATCH v4 09/12] x86/apic: Setup interrupt mode earlier in case of no SMP motherboard Dou Liyang
2017-05-10 13:44 ` [RFC PATCH v3 10/12] x86/apic: Make the interrupt mode setup earlier for UP system Dou Liyang
2017-05-11 10:57 ` [RFC PATCH v4 " Dou Liyang
2017-05-10 13:44 ` [RFC PATCH v3 11/12] x86/apic: Mark the apic_interrupt_mode extern for disable_smp() Dou Liyang
2017-05-10 13:44 ` [RFC PATCH v3 12/12] x86/apic: Remove the apic_virtual_wire_mode_setup() Dou Liyang
2017-05-22 20:23 ` [RFC PATCH v3 00/12] Unify interrupt mode and setup it as soon as possible Thomas Gleixner
2017-05-23 1:29 ` Dou Liyang
2017-06-06 6:50 ` Dou Liyang
2017-06-26 10:08 ` Dou Liyang
2017-06-26 11:50 ` Thomas Gleixner
2017-06-27 1:50 ` 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=1494423889-25799-10-git-send-email-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).