Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755497AbaBFPFJ (ORCPT ); Thu, 6 Feb 2014 10:05:09 -0500 Received: from mga11.intel.com ([192.55.52.93]:29197 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754341AbaBFPFE (ORCPT ); Thu, 6 Feb 2014 10:05:04 -0500 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.95,793,1384329600"; d="scan'208";a="470851957" Date: Thu, 6 Feb 2014 17:11:17 +0200 From: Mika Westerberg To: Thomas Gleixner Cc: Ingo Molnar , Bin Gao , linux-kernel@vger.kernel.org, One Thousand Gnomes , "H. Peter Anvin" , x86@kernel.org Subject: Re: [PATCH v3 1/2] x86, tsc: Fallback to normal calibration if fast MSR calibration fails Message-ID: <20140206151117.GL18029@intel.com> References: <20140206054410.GB18884@gmail.com> <1391687365-10922-1-git-send-email-mika.westerberg@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/