summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorderaadt <deraadt@openbsd.org>2018-08-25 05:29:28 +0000
committerderaadt <deraadt@openbsd.org>2018-08-25 05:29:28 +0000
commitc0542acbda766ce0796928b11c15b22080f0c473 (patch)
treec2a43055478f82c266373c1b75280c9adee0997b
parentRework disks to have pluggable backends. (diff)
downloadwireguard-openbsd-c0542acbda766ce0796928b11c15b22080f0c473.tar.xz
wireguard-openbsd-c0542acbda766ce0796928b11c15b22080f0c473.zip
As Intel(TM) cpus are discovered to have more bugs, more workaround MSRs
are added. Presence of such MSRs is indicated with a feature flag, which we probe and print at startup for each AP CPU. EFI screen scrolling hasn't gotten faster (yet) and 9600 baud serial console is still the same speed as 1980. Final piece of the puzzle is machines have more cpus, providing more opportunity for screen scrolling and serial fifo's to fill up. The BSP cpu is watching the AP cpus probe and print, but increased latency causes it to exceed a timeout and print "cpuXX: failed messages". Crank that timeout. discussed with kettenis, ok guenther
-rw-r--r--sys/arch/amd64/amd64/cpu.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/arch/amd64/amd64/cpu.c b/sys/arch/amd64/amd64/cpu.c
index 3e1e888a561..302395da251 100644
--- a/sys/arch/amd64/amd64/cpu.c
+++ b/sys/arch/amd64/amd64/cpu.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cpu.c,v 1.126 2018/07/27 21:11:31 kettenis Exp $ */
+/* $OpenBSD: cpu.c,v 1.127 2018/08/25 05:29:28 deraadt Exp $ */
/* $NetBSD: cpu.c,v 1.1 2003/04/26 18:39:26 fvdl Exp $ */
/*-
@@ -692,7 +692,7 @@ cpu_start_secondary(struct cpu_info *ci)
atomic_setbits_int(&ci->ci_flags, CPUF_IDENTIFY);
/* wait for it to identify */
- for (i = 100000; (ci->ci_flags & CPUF_IDENTIFY) && i > 0; i--)
+ for (i = 500000; (ci->ci_flags & CPUF_IDENTIFY) && i > 0; i--)
delay(10);
if (ci->ci_flags & CPUF_IDENTIFY)