Module Name: src
Committed By: snj
Date: Sun Mar 26 16:05:41 UTC 2017
Modified Files:
src/sys/arch/amd64/include [netbsd-7]: param.h
src/sys/arch/i386/include [netbsd-7]: param.h
src/sys/arch/x86/x86 [netbsd-7]: bus_space.c
Log Message:
Pull up following revision(s) (requested by maya in ticket #1375):
sys/arch/amd64/include/param.h: revision 1.20
sys/arch/i386/include/param.h: revision 1.80
sys/arch/x86/x86/bus_space.c: revision 1.39
increase max io mem on amd64. some devices need it.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.18.14.1 src/sys/arch/amd64/include/param.h
cvs rdiff -u -r1.77 -r1.77.14.1 src/sys/arch/i386/include/param.h
cvs rdiff -u -r1.38 -r1.38.22.1 src/sys/arch/x86/x86/bus_space.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/include/param.h
diff -u src/sys/arch/amd64/include/param.h:1.18 src/sys/arch/amd64/include/param.h:1.18.14.1
--- src/sys/arch/amd64/include/param.h:1.18 Fri Apr 20 22:23:24 2012
+++ src/sys/arch/amd64/include/param.h Sun Mar 26 16:05:40 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: param.h,v 1.18 2012/04/20 22:23:24 rmind Exp $ */
+/* $NetBSD: param.h,v 1.18.14.1 2017/03/26 16:05:40 snj Exp $ */
#ifdef __x86_64__
@@ -27,6 +27,8 @@
#define PGOFSET (NBPG-1) /* byte offset into page */
#define NPTEPG (NBPG/(sizeof (pt_entry_t)))
+#define MAXIOMEM 0xffffffffffff
+
/*
* XXXfvdl change this (after bootstrap) to take # of bits from
* config info into account.
Index: src/sys/arch/i386/include/param.h
diff -u src/sys/arch/i386/include/param.h:1.77 src/sys/arch/i386/include/param.h:1.77.14.1
--- src/sys/arch/i386/include/param.h:1.77 Fri Apr 20 22:23:24 2012
+++ src/sys/arch/i386/include/param.h Sun Mar 26 16:05:41 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: param.h,v 1.77 2012/04/20 22:23:24 rmind Exp $ */
+/* $NetBSD: param.h,v 1.77.14.1 2017/03/26 16:05:41 snj Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -65,6 +65,8 @@
#define PGOFSET (NBPG-1) /* byte offset into page */
#define NPTEPG (NBPG/(sizeof (pt_entry_t)))
+#define MAXIOMEM 0xffffffff
+
#if defined(_KERNEL_OPT)
#include "opt_kernbase.h"
#endif /* defined(_KERNEL_OPT) */
Index: src/sys/arch/x86/x86/bus_space.c
diff -u src/sys/arch/x86/x86/bus_space.c:1.38 src/sys/arch/x86/x86/bus_space.c:1.38.22.1
--- src/sys/arch/x86/x86/bus_space.c:1.38 Fri Jan 27 18:53:07 2012
+++ src/sys/arch/x86/x86/bus_space.c Sun Mar 26 16:05:41 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_space.c,v 1.38 2012/01/27 18:53:07 para Exp $ */
+/* $NetBSD: bus_space.c,v 1.38.22.1 2017/03/26 16:05:41 snj Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus_space.c,v 1.38 2012/01/27 18:53:07 para Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_space.c,v 1.38.22.1 2017/03/26 16:05:41 snj Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -129,7 +129,7 @@ x86_bus_space_init(void)
ioport_ex = extent_create("ioport", 0x0, 0xffff,
(void *)ioport_ex_storage, sizeof(ioport_ex_storage),
EX_NOCOALESCE|EX_NOWAIT);
- iomem_ex = extent_create("iomem", 0x0, 0xffffffff,
+ iomem_ex = extent_create("iomem", 0x0, MAXIOMEM,
(void *)iomem_ex_storage, sizeof(iomem_ex_storage),
EX_NOCOALESCE|EX_NOWAIT);
