[src/netbsd-9]: src/sys/arch Pull up following revision(s) (requested by jmcn...

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

details:   https://anonhg.NetBSD.org/src/rev/0b2126027e75
branches:  netbsd-9
changeset: 963833:0b2126027e75
user:      martin <martin%NetBSD.org@localhost>
date:      Wed Apr 29 13:39:23 2020 +0000

description:
Pull up following revision(s) (requested by jmcneill in ticket #868):

        sys/arch/x86/x86/pmap.c: revision 1.384
        sys/arch/amd64/amd64/machdep.c: revision 1.349

Detect PAT on the boot processor before cpu0 attaches so the early genfb
attach code can map the framebuffer with write combining.

diffstat:

 sys/arch/amd64/amd64/machdep.c |  6 ++++--
 sys/arch/x86/x86/pmap.c        |  5 ++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diffs (53 lines):

diff -r 95367d285abc -r 0b2126027e75 sys/arch/amd64/amd64/machdep.c
--- a/sys/arch/amd64/amd64/machdep.c    Wed Apr 29 13:36:57 2020 +0000
+++ b/sys/arch/amd64/amd64/machdep.c    Wed Apr 29 13:39:23 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.335 2019/07/24 16:36:47 bouyer Exp $     */
+/*     $NetBSD: machdep.c,v 1.335.2.1 2020/04/29 13:39:23 martin Exp $ */
 
 /*
  * Copyright (c) 1996, 1997, 1998, 2000, 2006, 2007, 2008, 2011
@@ -110,7 +110,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.335 2019/07/24 16:36:47 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.335.2.1 2020/04/29 13:39:23 martin Exp $");
 
 #include "opt_modular.h"
 #include "opt_user_ldt.h"
@@ -1714,6 +1714,8 @@
        x86_bus_space_init();
 #endif
 
+       pat_init(&cpu_info_primary);
+
        consinit();     /* XXX SHOULD NOT BE DONE HERE */
 
        /*
diff -r 95367d285abc -r 0b2126027e75 sys/arch/x86/x86/pmap.c
--- a/sys/arch/x86/x86/pmap.c   Wed Apr 29 13:36:57 2020 +0000
+++ b/sys/arch/x86/x86/pmap.c   Wed Apr 29 13:39:23 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pmap.c,v 1.334 2019/06/01 08:12:26 maxv Exp $  */
+/*     $NetBSD: pmap.c,v 1.334.2.1 2020/04/29 13:39:23 martin Exp $    */
 
 /*
  * Copyright (c) 2008, 2010, 2016, 2017 The NetBSD Foundation, Inc.
@@ -130,7 +130,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.334 2019/06/01 08:12:26 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.334.2.1 2020/04/29 13:39:23 martin Exp $");
 
 #include "opt_user_ldt.h"
 #include "opt_lockdebug.h"
@@ -818,7 +818,6 @@
 
        wrmsr(MSR_CR_PAT, pat);
        cpu_pat_enabled = true;
-       aprint_debug_dev(ci->ci_dev, "PAT enabled\n");
 }
 
 static pt_entry_t