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>,
<yinghai@kernel.org>, <bhe@redhat.com>,
Dou Liyang <douly.fnst@cn.fujitsu.com>
Subject: [PATCH v9 02/12] x86/apic: Prepare for unifying the interrupt delivery modes setup
Date: Wed, 13 Sep 2017 17:12:45 +0800 [thread overview]
Message-ID: <1505293975-26005-3-git-send-email-douly.fnst@cn.fujitsu.com> (raw)
In-Reply-To: <1505293975-26005-1-git-send-email-douly.fnst@cn.fujitsu.com>
There are three positions for initializing the interrupt delivery
modes:
1) In IRQ initial function, may setup the through-local-APIC
virtual wire mode.
2) In an SMP-capable system, will try to switch to symmetric I/O
model when preparing the cpus in native_smp_prepare_cpus().
3) In UP system with UP_LATE_INIT=y, will set up local APIC and
I/O APIC in smp_init().
Switching to symmetric I/O mode is so late, which causes kernel
in an unmatched mode at the beginning of booting time. And it
causes the dump-capture kernel hangs with 'notsc' option inherited
from 1st kernel option.
Provide a new function to unify that three positions. Preparatory
patch to initialize an interrupt mode directly.
Signed-off-by: Dou Liyang <douly.fnst@cn.fujitsu.com>
---
arch/x86/include/asm/apic.h | 2 ++
arch/x86/kernel/apic/apic.c | 16 ++++++++++++++++
2 files changed, 18 insertions(+)
diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h
index 5f01671..1a970f5 100644
--- a/arch/x86/include/asm/apic.h
+++ b/arch/x86/include/asm/apic.h
@@ -128,6 +128,7 @@ extern void disable_local_APIC(void);
extern void lapic_shutdown(void);
extern void sync_Arb_IDs(void);
extern void init_bsp_APIC(void);
+extern void apic_intr_mode_init(void);
extern void setup_local_APIC(void);
extern void init_apic_mappings(void);
void register_lapic_address(unsigned long address);
@@ -170,6 +171,7 @@ static inline void disable_local_APIC(void) { }
# define setup_boot_APIC_clock x86_init_noop
# define setup_secondary_APIC_clock x86_init_noop
static inline void lapic_update_tsc_freq(void) { }
+static inline void apic_intr_mode_init(void) { }
#endif /* !CONFIG_X86_LOCAL_APIC */
#ifdef CONFIG_X86_X2APIC
diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
index 39cb8c1..08585bc 100644
--- a/arch/x86/kernel/apic/apic.c
+++ b/arch/x86/kernel/apic/apic.c
@@ -1319,6 +1319,22 @@ void __init init_bsp_APIC(void)
apic_write(APIC_LVT1, value);
}
+/* Init the interrupt delivery mode for the BSP */
+void __init apic_intr_mode_init(void)
+{
+ switch (apic_intr_mode_select()) {
+ case APIC_PIC:
+ pr_info("APIC: Keep in PIC mode(8259)\n");
+ return;
+ case APIC_VIRTUAL_WIRE:
+ pr_info("APIC: Switch to virtual wire mode setup\n");
+ return;
+ case APIC_SYMMETRIC_IO:
+ pr_info("APIC: Switch to symmectic I/O mode setup\n");
+ return;
+ }
+}
+
static void lapic_setup_esr(void)
{
unsigned int oldvalue, value, maxlvt;
--
2.5.5
next prev parent reply other threads:[~2017-09-13 9:14 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-13 9:12 [PATCH v9 00/12] Unify the interrupt delivery mode and do its setup in advance Dou Liyang
2017-09-13 9:12 ` [PATCH v9 01/12] x86/apic: Construct a selector for the interrupt delivery mode Dou Liyang
2017-09-13 9:12 ` Dou Liyang [this message]
2017-09-13 9:12 ` [PATCH v9 03/12] x86/apic: Split local APIC timer setup from the APIC setup Dou Liyang
2017-09-13 9:12 ` [PATCH v9 04/12] x86/apic: Move logical APIC ID away from apic_bsp_setup() Dou Liyang
2017-09-13 9:12 ` [PATCH v9 05/12] x86/apic: Unify interrupt mode setup for SMP-capable system Dou Liyang
2017-09-13 9:12 ` [PATCH v9 06/12] x86/apic: Mark the apic_intr_mode extern for sanity check cleanup Dou Liyang
2017-09-13 9:12 ` [PATCH v9 07/12] x86/apic: Unify interrupt mode setup for UP system Dou Liyang
2017-09-13 9:12 ` [PATCH v9 08/12] x86/ioapic: Refactor the delay logic in timer_irq_works() Dou Liyang
2017-09-13 9:12 ` [PATCH v9 09/12] x86/init: add intr_mode_init to x86_init_ops Dou Liyang
2017-09-13 9:12 ` [PATCH v9 10/12] x86/xen: Bypass intr mode setup in enlighten_pv system Dou Liyang
2017-09-13 9:45 ` [Xen-devel] " Juergen Gross
2017-09-13 10:09 ` Dou Liyang
2017-09-13 10:22 ` [PATCH v10 " Dou Liyang
2017-09-13 9:12 ` [PATCH v9 11/12] x86/time: Initialize interrupt mode behind timer init Dou Liyang
2017-09-13 9:12 ` [PATCH v9 12/12] x86/apic: Remove the init_bsp_APIC() Dou Liyang
2017-09-13 9:17 ` [PATCH v9] ACPI / init: Invoke early ACPI initialization earlier Dou Liyang
2017-09-27 1:41 ` Dou Liyang
2017-09-27 7:19 ` Thomas Gleixner
2017-09-27 7:33 ` Dou Liyang
2017-09-27 9:02 ` Borislav Petkov
2017-09-27 10:06 ` 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=1505293975-26005-3-git-send-email-douly.fnst@cn.fujitsu.com \
--to=douly.fnst@cn.fujitsu.com \
--cc=bhe@redhat.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=tglx@linutronix.de \
--cc=x86@kernel.org \
--cc=yinghai@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
all inboxes | Powered by JetHome®