Module Name: src
Committed By: maya
Date: Fri Jan 20 00:29:28 UTC 2017
Modified Files:
src/sys/arch/amd64/include: param.h
src/sys/arch/i386/include: param.h
src/sys/arch/x86/x86: bus_space.c
Log Message:
increase max io mem on amd64. some devices need it.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/amd64/include/param.h
cvs rdiff -u -r1.79 -r1.80 src/sys/arch/i386/include/param.h
cvs rdiff -u -r1.38 -r1.39 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.19 src/sys/arch/amd64/include/param.h:1.20
--- src/sys/arch/amd64/include/param.h:1.19 Tue Oct 27 22:28:56 2015
+++ src/sys/arch/amd64/include/param.h Fri Jan 20 00:29:28 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: param.h,v 1.19 2015/10/27 22:28:56 mrg Exp $ */
+/* $NetBSD: param.h,v 1.20 2017/01/20 00:29:28 maya 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.79 src/sys/arch/i386/include/param.h:1.80
--- src/sys/arch/i386/include/param.h:1.79 Fri Aug 26 05:56:03 2016
+++ src/sys/arch/i386/include/param.h Fri Jan 20 00:29:28 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: param.h,v 1.79 2016/08/26 05:56:03 mlelstv Exp $ */
+/* $NetBSD: param.h,v 1.80 2017/01/20 00:29:28 maya 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.39
--- 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 Fri Jan 20 00:29:28 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.39 2017/01/20 00:29:28 maya 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.39 2017/01/20 00:29:28 maya 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);
