From: Len Brown <lenb@kernel.org>
To: x86@kernel.org, linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Len Brown <len.brown@intel.com>
Subject: [PATCH 2/2] x86: remove 10ms delay from cpu_up() on modern processors
Date: Fri, 8 May 2015 13:48:07 -0400 [thread overview]
Message-ID: <8cfb5aaffa494a62f67af45d952bf02a1c8c718b.1431106775.git.len.brown@intel.com> (raw)
In-Reply-To: <1431107287-22022-1-git-send-email-lenb@kernel.org>
In-Reply-To: <3f51dfd7de5bf660b62d01216edce41b0904fddf.1431106775.git.len.brown@intel.com>
From: Len Brown <len.brown@intel.com>
Modern processor familes do not require the 10ms delay
in cpu_up() to de-assert INIT. This speeds up boot
and resume by 10ms per (application) processor.
Signed-off-by: Len Brown <len.brown@intel.com>
---
arch/x86/kernel/smpboot.c | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index 0ddc28b..3ab3df5 100644
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -524,6 +524,7 @@ void __inquire_remote_apic(int apicid)
* many cores and don't require that delay.
*
* Cmdline "init_cpu_udelay=" is available to over-ride this delay.
+ * Modern processor families are quirked to remove the delay entirely.
*/
#define UDELAY_10MS_DEFAULT 10000
@@ -537,6 +538,18 @@ static int __init cpu_init_udelay(char *str)
}
early_param("cpu_init_udelay", cpu_init_udelay);
+static void __init smp_quirk_init_udelay(void)
+{
+ /* if cmdline changed it from default, leave it alone */
+ if (init_udelay != UDELAY_10MS_DEFAULT)
+ return;
+
+ /* if modern processor, use no delay */
+ if (((boot_cpu_data.x86_vendor == X86_VENDOR_INTEL) && (boot_cpu_data.x86 == 6)) ||
+ ((boot_cpu_data.x86_vendor == X86_VENDOR_AMD) && (boot_cpu_data.x86 >= 0xF)))
+ init_udelay = 0;
+}
+
/*
* Poke the other CPU in the eye via NMI to wake it up. Remember that the normal
* INIT, INIT, STARTUP sequence will reset the chip hard for us, and this
@@ -1191,6 +1204,8 @@ void __init native_smp_prepare_cpus(unsigned int max_cpus)
uv_system_init();
set_mtrr_aps_delayed_init();
+
+ smp_quirk_init_udelay();
}
void arch_enable_nonboot_cpus_begin(void)
--
2.4.0.rc1
next prev parent reply other threads:[~2015-05-08 17:48 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-08 17:48 [PATCH 0/2 v3] speed up cpu_up() Len Brown
2015-05-08 17:48 ` [PATCH 1/2] x86: Add cmdline "cpu_init_udelay=N" to specify cpu_up() delay Len Brown
2015-05-08 17:48 ` Len Brown [this message]
2015-05-08 20:43 ` [PATCH 0/2 v3] speed up cpu_up() Rafael J. Wysocki
2015-05-10 10:44 ` Ingo Molnar
2015-05-11 21:06 [PATCH 0/2 v4] " Len Brown
2015-05-11 21:06 ` [PATCH 1/2] x86: Add cmdline "cpu_init_udelay=N" to specify cpu_up() delay Len Brown
2015-05-11 21:06 ` [PATCH 2/2] x86: remove 10ms delay from cpu_up() on modern processors Len Brown
2015-05-11 21:27 [PATCH 0/2 v5] speed up cpu_up() Len Brown
2015-05-11 21:27 ` [PATCH 1/2] x86: Add cmdline "cpu_init_udelay=N" to specify cpu_up() delay Len Brown
2015-05-11 21:27 ` [PATCH 2/2] x86: remove 10ms delay from cpu_up() on modern processors Len Brown
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=8cfb5aaffa494a62f67af45d952bf02a1c8c718b.1431106775.git.len.brown@intel.com \
--to=lenb@kernel.org \
--cc=len.brown@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--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).