lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Message-ID: <20140206151117.GL18029@intel.com> Date: Thu, 6 Feb 2014 17:11:17 +0200 From: Mika Westerberg <mika.westerberg@...ux.intel.com> To: Thomas Gleixner <tglx@...utronix.de> Cc: Ingo Molnar <mingo@...nel.org>, Bin Gao <bin.gao@...ux.intel.com>, linux-kernel@...r.kernel.org, One Thousand Gnomes <gnomes@...rguk.ukuu.org.uk>, "H. Peter Anvin" <hpa@...or.com>, x86@...nel.org Subject: Re: [PATCH v3 1/2] x86, tsc: Fallback to normal calibration if fast MSR calibration fails On Thu, Feb 06, 2014 at 03:34:18PM +0100, Thomas Gleixner wrote: > On Thu, 6 Feb 2014, Mika Westerberg wrote: > > arch/x86/kernel/tsc.c | 7 ++++--- > > 1 file changed, 4 insertions(+), 3 deletions(-) > > > > diff --git a/arch/x86/kernel/tsc.c b/arch/x86/kernel/tsc.c > > index 19e5adb49a27..56facfc54575 100644 > > --- a/arch/x86/kernel/tsc.c > > +++ b/arch/x86/kernel/tsc.c > > @@ -655,10 +655,11 @@ unsigned long native_calibrate_tsc(void) > > local_irq_save(flags); > > i = try_msr_calibrate_tsc(&fast_calibrate); > > local_irq_restore(flags); > > - if (i >= 0) { > > - if (i == 0) > > - pr_warn("Fast TSC calibration using MSR failed\n"); > > + if (i > 0) { > > return fast_calibrate; > > + } else if (i == 0) { > > + pr_warn("Fast TSC calibration using MSR failed\n"); > > + /* Continue with the normal calibration */ > > } > > Bah. Can we please fix that proper. The whole 0,1,-1 return value from > try_msr_calibrate_tsc() is just horrible. Why not doing the obvious? Yes, that looks better and works fine, thanks. Tested-by: Mika Westerberg <mika.westerberg@...ux.intel.com> -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists