From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1163774AbdEXQ5h (ORCPT ); Wed, 24 May 2017 12:57:37 -0400 Received: from david.siemens.de ([192.35.17.14]:38885 "EHLO david.siemens.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933210AbdEXQ5P (ORCPT ); Wed, 24 May 2017 12:57:15 -0400 Subject: Re: [tip:x86/debug] x86/timers: Add simple udelay calibration To: brgerst@gmail.com, mathias.nyman@linux.intel.com, dvlasenk@redhat.com, tglx@linutronix.de, peterz@infradead.org, bp@alien8.de, luto@kernel.org, torvalds@linux-foundation.org, baolu.lu@linux.intel.com, hpa@zytor.com, jpoimboe@redhat.com, gregkh@linuxfoundation.org, linux-kernel@vger.kernel.org, mingo@kernel.org, linux-tip-commits@vger.kernel.org References: <1490083293-3792-2-git-send-email-baolu.lu@linux.intel.com> From: Jan Kiszka Message-ID: <225381e1-5ad6-7208-697d-73cbb56163cc@siemens.com> Date: Wed, 24 May 2017 18:56:14 +0200 User-Agent: Mozilla/5.0 (X11; U; Linux i686 (x86_64); de; rv:1.8.1.12) Gecko/20080226 SUSE/2.0.0.12-1.1 Thunderbird/2.0.0.12 Mnenhy/0.7.5.666 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 2017-03-21 13:19, tip-bot for Lu Baolu wrote: > Commit-ID: dd759d93f4dd4fd2f345a78ad1223bb3edf3ee7b > Gitweb: http://git.kernel.org/tip/dd759d93f4dd4fd2f345a78ad1223bb3edf3ee7b > Author: Lu Baolu > AuthorDate: Tue, 21 Mar 2017 16:01:29 +0800 > Committer: Ingo Molnar > CommitDate: Tue, 21 Mar 2017 12:28:45 +0100 > > x86/timers: Add simple udelay calibration > > Add a simple udelay calibration in x86 architecture-specific > boot-time initializations. This will get a workable estimate > for loops_per_jiffy. Hence, udelay() could be used after this > initialization. > > Signed-off-by: Lu Baolu > Acked-by: Thomas Gleixner > Cc: Andy Lutomirski > Cc: Borislav Petkov > Cc: Brian Gerst > Cc: Denys Vlasenko > Cc: Greg Kroah-Hartman > Cc: H. Peter Anvin > Cc: Josh Poimboeuf > Cc: Linus Torvalds > Cc: Mathias Nyman > Cc: Peter Zijlstra > Cc: linux-usb@vger.kernel.org > Link: http://lkml.kernel.org/r/1490083293-3792-2-git-send-email-baolu.lu@linux.intel.com > Signed-off-by: Ingo Molnar > --- > arch/x86/kernel/setup.c | 22 ++++++++++++++++++++++ > 1 file changed, 22 insertions(+) > > diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c > index 4bf0c89..e70204e 100644 > --- a/arch/x86/kernel/setup.c > +++ b/arch/x86/kernel/setup.c > @@ -837,6 +837,26 @@ dump_kernel_offset(struct notifier_block *self, unsigned long v, void *p) > return 0; > } > > +static void __init simple_udelay_calibration(void) > +{ > + unsigned int tsc_khz, cpu_khz; > + unsigned long lpj; > + > + if (!boot_cpu_has(X86_FEATURE_TSC)) > + return; > + > + cpu_khz = x86_platform.calibrate_cpu(); > + tsc_khz = x86_platform.calibrate_tsc(); > + > + tsc_khz = tsc_khz ? : cpu_khz; > + if (!tsc_khz) > + return; > + > + lpj = tsc_khz * 1000; > + do_div(lpj, HZ); > + loops_per_jiffy = lpj; > +} > + > /* > * Determine if we were loaded by an EFI loader. If so, then we have also been > * passed the efi memmap, systab, etc., so we should use these data structures > @@ -985,6 +1005,8 @@ void __init setup_arch(char **cmdline_p) > */ > x86_configure_nx(); > > + simple_udelay_calibration(); > + > parse_early_param(); > > #ifdef CONFIG_MEMORY_HOTPLUG > Can we move this past init_hypervisor_platform()? Otherwise, the x86_platform hooks aren't fully initialized yet, and we may use the wrong functions. Jan -- Siemens AG, Corporate Technology, CT RDA ITP SES-DE Corporate Competence Center Embedded Linux