[src/netbsd-8]: src/sys/arch/x86/x86 Pull up following revision(s) (requested...

[snj <snj%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/f17e937dcd9f
branches:  netbsd-8
changeset: 850723:f17e937dcd9f
user:      snj <snj%NetBSD.org@localhost>
date:      Wed Jun 14 04:47:33 2017 +0000

description:
Pull up following revision(s) (requested by pgoyette in ticket #28):
        sys/arch/x86/x86/cpu.c: revision 1.131
Further reduce the loop counter so that hatching completes before the
boot processor times us out.
Add a nice big XXX comment for why the counter is so low.

diffstat:

 sys/arch/x86/x86/cpu.c |  12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diffs (33 lines):

diff -r c0ed07de9a82 -r f17e937dcd9f sys/arch/x86/x86/cpu.c
--- a/sys/arch/x86/x86/cpu.c    Sat Jun 10 06:35:52 2017 +0000
+++ b/sys/arch/x86/x86/cpu.c    Wed Jun 14 04:47:33 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpu.c,v 1.130 2017/05/31 14:41:07 kre Exp $    */
+/*     $NetBSD: cpu.c,v 1.130.2.1 2017/06/14 04:47:33 snj Exp $        */
 
 /*-
  * Copyright (c) 2000-2012 NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.130 2017/05/31 14:41:07 kre Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.130.2.1 2017/06/14 04:47:33 snj Exp $");
 
 #include "opt_ddb.h"
 #include "opt_mpbios.h"                /* for MPDEBUG */
@@ -835,7 +835,13 @@
                        }
                        x86_mwait(0, 0);
                } else {
-                       for (i = 100; i != 0; i--) {
+       /*
+        * XXX The loop repetition count could be a lot higher, but
+        * XXX currently qemu emulator takes a _very_long_time_ to
+        * XXX execute the pause instruction.  So for now, use a low
+        * XXX value to allow the cpu to hatch before timing out.
+        */
+                       for (i = 50; i != 0; i--) {
                                x86_pause();
                        }
                }