Module Name: src
Committed By: martin
Date: Wed Apr 29 13:39:23 UTC 2020
Modified Files:
src/sys/arch/amd64/amd64 [netbsd-9]: machdep.c
src/sys/arch/x86/x86 [netbsd-9]: pmap.c
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.335 -r1.335.2.1 src/sys/arch/amd64/amd64/machdep.c
cvs rdiff -u -r1.334 -r1.334.2.1 src/sys/arch/x86/x86/pmap.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amd64/amd64/machdep.c
diff -u src/sys/arch/amd64/amd64/machdep.c:1.335 src/sys/arch/amd64/amd64/machdep.c:1.335.2.1
--- src/sys/arch/amd64/amd64/machdep.c:1.335 Wed Jul 24 16:36:47 2019
+++ src/sys/arch/amd64/amd64/machdep.c Wed Apr 29 13:39:23 2020
@@ -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 @@ init_x86_64(paddr_t first_avail)
x86_bus_space_init();
#endif
+ pat_init(&cpu_info_primary);
+
consinit(); /* XXX SHOULD NOT BE DONE HERE */
/*
Index: src/sys/arch/x86/x86/pmap.c
diff -u src/sys/arch/x86/x86/pmap.c:1.334 src/sys/arch/x86/x86/pmap.c:1.334.2.1
--- src/sys/arch/x86/x86/pmap.c:1.334 Sat Jun 1 08:12:26 2019
+++ src/sys/arch/x86/x86/pmap.c Wed Apr 29 13:39:23 2020
@@ -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 @@ pat_init(struct cpu_info *ci)
wrmsr(MSR_CR_PAT, pat);
cpu_pat_enabled = true;
- aprint_debug_dev(ci->ci_dev, "PAT enabled\n");
}
static pt_entry_t
