]> git.baikalelectronics.ru Git - kernel.git/commit
x86/tsc: Prevent 32bit truncation in calc_hpet_ref()
authorXiaoming Gao <gxm.linux.kernel@gmail.com>
Fri, 13 Apr 2018 09:48:08 +0000 (17:48 +0800)
committerThomas Gleixner <tglx@linutronix.de>
Tue, 17 Apr 2018 09:50:42 +0000 (11:50 +0200)
commit99487fcbb6ee2e6e03756f4e3b7c95e8e46ca329
tree5ffcf974c9b51aa3cc87b0b2db8123ca54e18e9c
parentba2b85a19082b510fb239399684ff7d7a4ce6d63
x86/tsc: Prevent 32bit truncation in calc_hpet_ref()

The TSC calibration code uses HPET as reference. The conversion normalizes
the delta of two HPET timestamps:

    hpetref = ((tshpet1 - tshpet2) * HPET_PERIOD) / 1e6

and then divides the normalized delta of the corresponding TSC timestamps
by the result to calulate the TSC frequency.

    tscfreq = ((tstsc1 - tstsc2 ) * 1e6) / hpetref

This uses do_div() which takes an u32 as the divisor, which worked so far
because the HPET frequency was low enough that 'hpetref' never exceeded
32bit.

On Skylake machines the HPET frequency increased so 'hpetref' can exceed
32bit. do_div() truncates the divisor, which causes the calibration to
fail.

Use div64_u64() to avoid the problem.

[ tglx: Fixes whitespace mangled patch and rewrote changelog ]

Signed-off-by: Xiaoming Gao <newtongao@tencent.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: stable@vger.kernel.org
Cc: peterz@infradead.org
Cc: hpa@zytor.com
Link: https://lkml.kernel.org/r/38894564-4fc9-b8ec-353f-de702839e44e@gmail.com
arch/x86/kernel/tsc.c