Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Date:   Sat, 3 Nov 2018 11:04:10 +0100 (CET)
From:   Thomas Gleixner <tglx@linutronix.de>
To:     Daniel Vacek <neelx@redhat.com>
cc:     x86@kernel.org, Ingo Molnar <mingo@redhat.com>,
        Borislav Petkov <bp@alien8.de>,
        "H. Peter Anvin" <hpa@zytor.com>,
        LKML <linux-kernel@vger.kernel.org>,
        Peter Zijlstra <peterz@infradead.org>
Subject: Re: [PATCH] tsc: make calibration refinement more robust
In-Reply-To: <CACjP9X-aZ4-6h7KkgZO6TtPCY4teiBTzVn-c11ULPwbPid8qWQ@mail.gmail.com>
Message-ID: <alpine.DEB.2.21.1811020922240.1642@nanos.tec.linutronix.de>
References: <1541085133-32534-1-git-send-email-neelx@redhat.com> <alpine.DEB.2.21.1811011630310.1642@nanos.tec.linutronix.de> <CACjP9X-aZ4-6h7KkgZO6TtPCY4teiBTzVn-c11ULPwbPid8qWQ@mail.gmail.com>
User-Agent: Alpine 2.21 (DEB 202 2017-01-01)
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

Daniel,

On Fri, 2 Nov 2018, Daniel Vacek wrote:
> On Thu, Nov 1, 2018 at 4:34 PM, Thomas Gleixner <tglx@linutronix.de> wrote:
> >> -#define MAX_RETRIES     5
> >> -#define SMI_TRESHOLD    50000
> >> +#define MAX_RETRIES  5
> >> +#define TSC_THRESHOLD        (tsc_khz >> 5)
> >
> > This breaks pit_hpet_ptimer_calibrate_cpu() because at that point tsc_hkz is 0.
> 
> That did not show up with my testing, sorry. I guess
> pit_calibrate_tsc() never failed for me. Hmm, actually it looks like
> quick_pit_calibrate() does the job for me so
> pit_hpet_ptimer_calibrate_cpu() is likely not even called.

Right. It's only called when quick calibration fails. Testing does not
replace code inspection :)

> Would this:
> 
> #define TSC_THRESHOLD   (tsc_khz? tsc_khz >> 5: 0x20000)
> 
> work for you instead? Or alternatively at some point when chasing this
> down I used:
> 
> #define TSC_THRESHOLD (0x10000 + (tsc_khz >> 6))
> 
> The first one seems better though. I can send v2 next week if you like it.

Can you please avoid hiding the logic in a macro? Just use a local
variable:

	u64 thresh = tsc_khz ? tsc_khz >> 5 : TSC_DEFAULT_THRESHOLD;

and use that in the comparison.

Thanks,

	tglx