From: Thomas Gleixner <tglx@linutronix.de>
To: LKML <linux-kernel@vger.kernel.org>
Cc: Jiang Liu <jiang.liu@linux.intel.com>,
Joerg Roedel <joro@8bytes.org>,
x86@kernel.org, Tony Luck <tony.luck@intel.com>,
Borislav Petkov <bp@alien8.de>
Subject: [patch 11/23] x86/x2apic: Split enable and setup function
Date: Thu, 15 Jan 2015 21:22:26 -0000 [thread overview]
Message-ID: <20150115211703.129287153@linutronix.de> (raw)
In-Reply-To: 20150115210458.625399149@linutronix.de
[-- Attachment #1: x86-x2apic-split-enable-and-setup.patch --]
[-- Type: text/plain, Size: 4089 bytes --]
enable_x2apic() is a convoluted unreadable mess because it is used for
both enablement in early boot and for setup in cpu_init().
Split the code into x2apic_enable() for enablement and x2apic_setup()
for setup of (secondary cpus). Make use of the new state tracking to
simplify the logic.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
arch/x86/include/asm/apic.h | 4 +--
arch/x86/kernel/apic/apic.c | 55 +++++++++++++++++++++++++------------------
arch/x86/kernel/cpu/common.c | 2 -
3 files changed, 36 insertions(+), 25 deletions(-)
Index: tip/arch/x86/include/asm/apic.h
===================================================================
--- tip.orig/arch/x86/include/asm/apic.h
+++ tip/arch/x86/include/asm/apic.h
@@ -177,7 +177,7 @@ static inline u64 native_x2apic_icr_read
extern int x2apic_mode;
extern int x2apic_phys;
-extern void enable_x2apic(void);
+extern void x2apic_setup(void);
static inline int x2apic_enabled(void)
{
return cpu_has_x2apic && apic_is_x2apic_enabled();
@@ -185,7 +185,7 @@ static inline int x2apic_enabled(void)
#define x2apic_supported() (cpu_has_x2apic)
#else
-static inline void enable_x2apic(void) { }
+static inline void x2apic_setup(void) { }
static inline int x2apic_enabled(void) { return 0; }
#define x2apic_mode (0)
Index: tip/arch/x86/kernel/apic/apic.c
===================================================================
--- tip.orig/arch/x86/kernel/apic/apic.c
+++ tip/arch/x86/kernel/apic/apic.c
@@ -1497,6 +1497,17 @@ static inline void disable_x2apic(void)
printk_once(KERN_INFO "x2apic disabled\n");
}
+static inline void enable_x2apic(void)
+{
+ u64 msr;
+
+ rdmsrl(MSR_IA32_APICBASE, msr);
+ if (msr & X2APIC_ENABLE)
+ return;
+ wrmsrl(MSR_IA32_APICBASE, msr | X2APIC_ENABLE);
+ printk_once(KERN_INFO "x2apic enabled\n");
+}
+
static int __init setup_nox2apic(char *str)
{
if (x2apic_enabled()) {
@@ -1517,6 +1528,21 @@ static int __init setup_nox2apic(char *s
}
early_param("nox2apic", setup_nox2apic);
+/* Called from cpu_init() to enable x2apic on (secondary) cpus */
+void x2apic_setup(void)
+{
+ /*
+ * If x2apic is not in ON state, disable it if already enabled
+ * from BIOS.
+ */
+ if (x2apic_state != X2APIC_ON) {
+ if (cpu_has_apic)
+ disable_x2apic();
+ return;
+ }
+ enable_x2apic();
+}
+
static __init void x2apic_disable(void)
{
u64 msr;
@@ -1541,30 +1567,19 @@ static __init void x2apic_disable(void)
x2apic_state = X2APIC_DISABLED;
}
-void enable_x2apic(void)
+static __init void x2apic_enable(void)
{
- u64 msr;
-
- if (x2apic_state == X2APIC_DISABLED) {
- disable_x2apic();
- x2apic_mode = 0;
+ if (x2apic_state != X2APIC_OFF)
return;
- }
- if (!x2apic_mode)
- return;
-
- rdmsrl(MSR_IA32_APICBASE, msr);
- if (!(msr & X2APIC_ENABLE)) {
- printk_once(KERN_INFO "Enabling x2apic\n");
- wrmsrl(MSR_IA32_APICBASE, msr | X2APIC_ENABLE);
- }
+ x2apic_mode = 1;
x2apic_state = X2APIC_ON;
+ enable_x2apic();
}
static __init void try_to_enable_x2apic(int remap_mode)
{
- if (!x2apic_supported())
+ if (x2apic_state == X2APIC_DISABLED)
return;
if (remap_mode != IRQ_REMAP_X2APIC_MODE) {
@@ -1585,12 +1600,7 @@ static __init void try_to_enable_x2apic(
*/
x2apic_phys = 1;
}
-
- if (!x2apic_mode) {
- x2apic_mode = 1;
- enable_x2apic();
- pr_info("Enabled x2apic\n");
- }
+ x2apic_enable();
}
void __init check_x2apic(void)
@@ -1614,6 +1624,7 @@ void __init check_x2apic(void)
panic("BIOS has enabled x2apic but kernel doesn't support x2apic, please disable x2apic in BIOS.\n");
}
static inline void try_to_enable_x2apic(int remap_mode) { }
+static inline void enable_x2apic(void) { }
#endif /* !CONFIG_X86_X2APIC */
static int __init try_to_enable_IR(void)
Index: tip/arch/x86/kernel/cpu/common.c
===================================================================
--- tip.orig/arch/x86/kernel/cpu/common.c
+++ tip/arch/x86/kernel/cpu/common.c
@@ -1332,7 +1332,7 @@ void cpu_init(void)
barrier();
x86_configure_nx();
- enable_x2apic();
+ x2apic_setup();
/*
* set up and load the per-CPU TSS
next prev parent reply other threads:[~2015-01-15 21:22 UTC|newest]
Thread overview: 80+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-15 21:22 [patch 00/23] x86: Cleanup apic/ioapic/x2apic setup code Thomas Gleixner
2015-01-15 21:22 ` [patch 01/23] x86/apic: Avoid open coded x2apic detection Thomas Gleixner
2015-01-16 9:59 ` Borislav Petkov
2015-01-22 11:39 ` Thomas Gleixner
2015-01-23 16:13 ` Thomas Gleixner
2015-01-22 14:24 ` [tip:x86/apic] " tip-bot for Thomas Gleixner
2015-01-15 21:22 ` [patch 02/23] x86/apic: Make x2apic_mode depend on CONFIG_X86_X2APIC Thomas Gleixner
2015-01-16 10:50 ` Borislav Petkov
2015-01-22 14:24 ` [tip:x86/apic] " tip-bot for Thomas Gleixner
2015-01-15 21:22 ` [patch 03/23] x86/apic: Move x2apic code to one place Thomas Gleixner
2015-01-16 10:55 ` Borislav Petkov
2015-01-22 14:25 ` [tip:x86/apic] " tip-bot for Thomas Gleixner
2015-01-15 21:22 ` [patch 04/23] x86/ioapic: Check x2apic really Thomas Gleixner
2015-01-16 11:10 ` Borislav Petkov
2015-01-16 11:15 ` Borislav Petkov
2015-01-22 14:25 ` [tip:x86/apic] " tip-bot for Thomas Gleixner
2015-01-15 21:22 ` [patch 05/23] x86/apic: Make disable x2apic work really Thomas Gleixner
2015-01-16 11:17 ` Borislav Petkov
2015-01-22 14:25 ` [tip:x86/apic] " tip-bot for Thomas Gleixner
2015-01-15 21:22 ` [patch 06/23] x86/apic: Check x2apic early Thomas Gleixner
2015-01-16 8:07 ` Jiang Liu
2015-01-22 14:26 ` [tip:x86/apic] " tip-bot for Thomas Gleixner
2015-01-15 21:22 ` [patch 07/23] x86/x2apic: Move code in conditional region Thomas Gleixner
2015-01-16 11:56 ` Borislav Petkov
2015-01-22 14:26 ` [tip:x86/apic] " tip-bot for Thomas Gleixner
2015-01-15 21:22 ` [patch 08/23] x86/x2apic: Clarify remapping mode for x2apic enablement Thomas Gleixner
2015-01-16 14:19 ` Borislav Petkov
2015-01-22 14:26 ` [tip:x86/apic] " tip-bot for Thomas Gleixner
2015-01-15 21:22 ` [patch 09/23] x86/x2apic: Add proper state tracking Thomas Gleixner
2015-01-16 18:58 ` Borislav Petkov
2015-01-22 14:27 ` [tip:x86/apic] " tip-bot for Thomas Gleixner
2015-01-15 21:22 ` [patch 10/23] x86/x2apic: Disable x2apic from nox2apic setup Thomas Gleixner
2015-01-16 19:01 ` Borislav Petkov
2015-01-22 14:27 ` [tip:x86/apic] " tip-bot for Thomas Gleixner
2015-01-15 21:22 ` Thomas Gleixner [this message]
2015-01-16 19:00 ` [patch 11/23] x86/x2apic: Split enable and setup function Borislav Petkov
2015-01-22 13:08 ` Thomas Gleixner
2015-01-22 14:28 ` [tip:x86/apic] " tip-bot for Thomas Gleixner
2015-01-15 21:22 ` [patch 12/23] x86/x2apic: Use state information for disable Thomas Gleixner
2015-01-16 19:01 ` Borislav Petkov
2015-01-22 14:28 ` [tip:x86/apic] " tip-bot for Thomas Gleixner
2015-01-15 21:22 ` [patch 13/23] x86/smpboot: Move smpboot inlines to code Thomas Gleixner
2015-01-16 19:01 ` Borislav Petkov
2015-01-22 14:28 ` [tip:x86/apic] " tip-bot for Thomas Gleixner
2015-01-15 21:22 ` [patch 14/23] x86/ioapic: Provide stub functions for IOAPIC=n Thomas Gleixner
2015-01-16 19:02 ` Borislav Petkov
2015-01-22 14:29 ` [tip:x86/apic] x86/ioapic: Provide stub functions for IOAPIC%3Dn tip-bot for Thomas Gleixner
2015-01-15 21:22 ` [patch 15/23] x86/ioapic: Add proper checks to setp/enable_IO_APIC() Thomas Gleixner
2015-01-16 19:02 ` Borislav Petkov
2015-01-22 14:29 ` [tip:x86/apic] x86/ioapic: Add proper checks to setp/ enable_IO_APIC() tip-bot for Thomas Gleixner
2015-01-15 21:22 ` [patch 16/23] x86/apic: Sanitize ioapic handling Thomas Gleixner
2015-01-16 19:02 ` Borislav Petkov
2015-01-22 14:29 ` [tip:x86/apic] " tip-bot for Thomas Gleixner
2015-01-15 21:22 ` [patch 17/23] x86/smpboot: Cleanup " Thomas Gleixner
2015-01-16 19:03 ` Borislav Petkov
2015-01-22 14:30 ` [tip:x86/apic] " tip-bot for Thomas Gleixner
2015-01-15 21:22 ` [patch 18/23] x86/apic: Move apic_init_uniprocessor code Thomas Gleixner
2015-01-16 19:03 ` Borislav Petkov
2015-01-22 14:30 ` [tip:x86/apic] " tip-bot for Thomas Gleixner
2015-01-15 21:22 ` [patch 19/23] init: Get rid of x86isms Thomas Gleixner
2015-01-22 14:30 ` [tip:x86/apic] " tip-bot for Thomas Gleixner
2015-01-15 21:22 ` [patch 20/23] x86/smpboot: Move apic init code to apic.c Thomas Gleixner
2015-01-16 19:04 ` Borislav Petkov
2015-01-22 14:31 ` [tip:x86/apic] " tip-bot for Thomas Gleixner
2015-01-15 21:22 ` [patch 21/23] x86/smpboot: Sanitize uniprocessor init Thomas Gleixner
2015-01-16 19:04 ` Borislav Petkov
2015-01-22 14:31 ` [tip:x86/apic] " tip-bot for Thomas Gleixner
2015-01-15 21:22 ` [patch 22/23] x86/apic: Reuse apic_bsp_setup() for UP APIC setup Thomas Gleixner
2015-01-16 19:04 ` Borislav Petkov
2015-01-22 14:31 ` [tip:x86/apic] " tip-bot for Thomas Gleixner
2015-01-15 21:22 ` [patch 23/23] x86: Consolidate boot cpu timer setup Thomas Gleixner
2015-01-16 19:04 ` Borislav Petkov
2015-01-22 14:32 ` [tip:x86/apic] " tip-bot for Thomas Gleixner
2015-01-16 9:37 ` [patch 00/23] x86: Cleanup apic/ioapic/x2apic setup code Jiang Liu
2015-01-16 10:21 ` Thomas Gleixner
2015-01-16 10:35 ` Jiang Liu
2015-01-16 11:05 ` Thomas Gleixner
2015-01-16 19:03 ` Borislav Petkov
2015-01-21 1:50 ` Jiang Liu
2015-01-21 9:33 ` Thomas Gleixner
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=20150115211703.129287153@linutronix.de \
--to=tglx@linutronix.de \
--cc=bp@alien8.de \
--cc=jiang.liu@linux.intel.com \
--cc=joro@8bytes.org \
--cc=linux-kernel@vger.kernel.org \
--cc=tony.luck@intel.com \
--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).