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 06/23] x86/apic: Check x2apic early
Date: Thu, 15 Jan 2015 21:22:17 -0000 [thread overview]
Message-ID: <20150115211702.702479404@linutronix.de> (raw)
In-Reply-To: 20150115210458.625399149@linutronix.de
[-- Attachment #1: x86-check-x2apic-early.patch --]
[-- Type: text/plain, Size: 3072 bytes --]
No point in delaying the x2apic detection for the CONFIG_X86_X2APIC=n
case to enable_IR_x2apic(). We rather detect that in the early boot
code in check_x2apic().
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
arch/x86/include/asm/apic.h | 6 ++----
arch/x86/kernel/apic/apic.c | 33 +++++++++++++++++++--------------
2 files changed, 21 insertions(+), 18 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,6 @@ static inline u64 native_x2apic_icr_read
extern int x2apic_mode;
extern int x2apic_phys;
-extern void check_x2apic(void);
extern void enable_x2apic(void);
static inline int x2apic_enabled(void)
{
@@ -193,9 +192,6 @@ static inline void x2apic_force_phys(voi
static inline void disable_x2apic(void)
{
}
-static inline void check_x2apic(void)
-{
-}
static inline void enable_x2apic(void)
{
}
@@ -429,6 +425,7 @@ static inline u32 safe_apic_wait_icr_idl
}
extern void __init apic_set_eoi_write(void (*eoi_write)(u32 reg, u32 v));
+extern void __init check_x2apic(void);
#else /* CONFIG_X86_LOCAL_APIC */
@@ -440,6 +437,7 @@ static inline void apic_icr_write(u32 lo
static inline void apic_wait_icr_idle(void) { }
static inline u32 safe_apic_wait_icr_idle(void) { return 0; }
static inline void apic_set_eoi_write(void (*eoi_write)(u32 reg, u32 v)) {}
+static inline void check_x2apic(void) { }
#endif /* CONFIG_X86_LOCAL_APIC */
Index: tip/arch/x86/kernel/apic/apic.c
===================================================================
--- tip.orig/arch/x86/kernel/apic/apic.c
+++ tip/arch/x86/kernel/apic/apic.c
@@ -1541,14 +1541,6 @@ static __init void disable_x2apic(void)
x2apic_disabled = 1;
}
-void check_x2apic(void)
-{
- if (x2apic_enabled()) {
- pr_info("x2apic enabled by BIOS, switching to x2apic ops\n");
- x2apic_mode = 1;
- }
-}
-
void enable_x2apic(void)
{
u64 msr;
@@ -1568,7 +1560,25 @@ void enable_x2apic(void)
wrmsrl(MSR_IA32_APICBASE, msr | X2APIC_ENABLE);
}
}
-#endif /* CONFIG_X86_X2APIC */
+
+void __init check_x2apic(void)
+{
+ if (x2apic_enabled()) {
+ pr_info("x2apic enabled by BIOS, switching to x2apic ops\n");
+ x2apic_mode = 1;
+ }
+}
+#else /* CONFIG_X86_X2APIC */
+void __init check_x2apic(void)
+{
+ if (!cpu_has_apic || !apic_is_x2apic_enabled())
+ return;
+ /*
+ * Checkme: Can we simply turn off x2apic here instead of panic?
+ */
+ panic("BIOS has enabled x2apic but kernel doesn't support x2apic, please disable x2apic in BIOS.\n");
+}
+#endif /* !CONFIG_X86_X2APIC */
static int __init try_to_enable_IR(void)
{
@@ -1620,11 +1630,6 @@ void __init enable_IR_x2apic(void)
unsigned long flags;
int ret, ir_stat;
- if (!IS_ENABLED(CONFIG_X86_X2APIC)) {
- if (apic_is_x2apic_enabled())
- panic("BIOS has enabled x2apic but kernel doesn't support x2apic, please disable x2apic in BIOS.\n");
- }
-
ir_stat = irq_remapping_prepare();
if (ir_stat < 0 && !x2apic_supported())
return;
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 ` Thomas Gleixner [this message]
2015-01-16 8:07 ` [patch 06/23] x86/apic: Check x2apic early 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 ` [patch 11/23] x86/x2apic: Split enable and setup function Thomas Gleixner
2015-01-16 19:00 ` 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=20150115211702.702479404@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).