From 634947be6c24d844af5f6ecf59453f2ddc09e032 Mon Sep 17 00:00:00 2001 From: Arjan van de Ven Date: Wed, 11 Feb 2015 17:28:14 -0600 Subject: [PATCH 108/114] smpboot: reuse timer calibration NO point recalibrating for known-constant tsc... saves 200ms+ of boot time. Author: Arjan van de Ven Signed-off-by: Miguel Bernal Marin --- arch/x86/kernel/smpboot.c | 2 +- arch/x86/kernel/tsc.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c index 99b920d0e516..e17bb425bb52 100644 --- a/arch/x86/kernel/smpboot.c +++ b/arch/x86/kernel/smpboot.c @@ -761,7 +761,7 @@ wakeup_secondary_cpu_via_init(int phys_apicid, unsigned long start_eip) pr_debug("Waiting for send to finish...\n"); send_status = safe_apic_wait_icr_idle(); - udelay(init_udelay); + udelay(100); pr_debug("Deasserting INIT\n"); diff --git a/arch/x86/kernel/tsc.c b/arch/x86/kernel/tsc.c index 37e7cf544e51..e99be8a6a132 100644 --- a/arch/x86/kernel/tsc.c +++ b/arch/x86/kernel/tsc.c @@ -1413,6 +1413,9 @@ unsigned long calibrate_delay_is_known(void) if (!mask) return 0; + if (cpu !=0) + return cpu_data(0).loops_per_jiffy; + sibling = cpumask_any_but(mask, cpu); if (sibling < nr_cpu_ids) return cpu_data(sibling).loops_per_jiffy; -- 2.11.1