summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjsg <jsg@openbsd.org>2018-03-07 01:33:07 +0000
committerjsg <jsg@openbsd.org>2018-03-07 01:33:07 +0000
commitc0b7f8b44d9faa8a96127235666170c5c93b0b12 (patch)
tree8c5c3d1d743d56ef21e26ee7789ef1ac39278b9e
parentupdate to NSD 4.1.20, ok florian@ (diff)
downloadwireguard-openbsd-c0b7f8b44d9faa8a96127235666170c5c93b0b12.tar.xz
wireguard-openbsd-c0b7f8b44d9faa8a96127235666170c5c93b0b12.zip
Stop assuming intel model 0x55 'Skylake X' has a fixed 25 MHz tsc freq.
It turns out the frequency can vary between different processors that share the same cpuid model. Similiar change made in linux. ok mikeb@ millert@
-rw-r--r--sys/arch/amd64/amd64/tsc.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/sys/arch/amd64/amd64/tsc.c b/sys/arch/amd64/amd64/tsc.c
index 466e4659e85..c86e435f63f 100644
--- a/sys/arch/amd64/amd64/tsc.c
+++ b/sys/arch/amd64/amd64/tsc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tsc.c,v 1.6 2017/10/19 22:09:49 mikeb Exp $ */
+/* $OpenBSD: tsc.c,v 1.7 2018/03/07 01:33:07 jsg Exp $ */
/*
* Copyright (c) 2016,2017 Reyk Floeter <reyk@openbsd.org>
* Copyright (c) 2017 Adam Steen <adam@adamsteen.com.au>
@@ -58,7 +58,6 @@ tsc_freq_cpuid(struct cpu_info *ci)
case 0x9e: /* Kabylake desktop */
khz = 24000; /* 24.0 Mhz */
break;
- case 0x55: /* Skylake X */
case 0x5f: /* Atom Denverton */
khz = 25000; /* 25.0 Mhz */
break;