 @@ -1,14 +1,14 @@
-/*	$NetBSD: param.h,v 1.21 2017/02/02 19:09:08 maxv Exp $	*/
+/*	$NetBSD: param.h,v 1.22 2017/06/14 12:27:24 maxv Exp $	*/
 #ifdef __x86_64__
 #ifndef XEN
 /* Must be defined before cpu.h */
 #define	MAXCPUS		256
 #endif
 #ifdef _KERNEL
 #include <machine/cpu.h>
 #endif
 #define	_MACHINE	amd64
 @@ -20,26 +20,31 @@
 #define ALIGNED_POINTER(p,t)	1
 #define ALIGNBYTES32		(sizeof(int) - 1)
 #define ALIGN32(p)		(((u_long)(p) + ALIGNBYTES32) &~ALIGNBYTES32)
 #define	PGSHIFT		12		/* LOG2(NBPG) */
 #define	NBPG		(1 << PGSHIFT)	/* bytes/page */
 #define	PGOFSET		(NBPG-1)	/* byte offset into page */
 #define	NPTEPG		(NBPG/(sizeof (pt_entry_t)))
 #define	MAXIOMEM	0xffffffffffff
 /*
  * Maximum physical memory supported by the implementation.
  */
 #define MAXPHYSMEM	0x100000000000ULL /* 16TB */
 /*
  * XXXfvdl change this (after bootstrap) to take # of bits from
  * config info into account.
  */
 #define	KERNBASE	0xffffffff80000000 /* start of kernel virtual space */
 #define	KERNTEXTOFF	0xffffffff80200000 /* start of kernel text */
 #define	BTOPKERNBASE	((u_long)KERNBASE >> PGSHIFT)
 #define KERNTEXTOFF_HI	0xffffffff
 #define KERNTEXTOFF_LO	0x80200000
 #define KERNBASE_HI	0xffffffff
 #define KERNBASE_LO	0x80000000

 @@ -1,14 +1,14 @@
-/*	$NetBSD: param.h,v 1.80 2017/01/20 00:29:28 maya Exp $	*/
+/*	$NetBSD: param.h,v 1.81 2017/06/14 12:27:24 maxv Exp $	*/
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * William Jolitz.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -57,26 +57,35 @@
 #define	_MACHINE_ARCH	i386
 #define	MACHINE_ARCH	"i386"
 #define	MID_MACHINE	MID_I386
 #define ALIGNED_POINTER(p,t)	1
 #define	PGSHIFT		12		/* LOG2(NBPG) */
 #define	NBPG		(1 << PGSHIFT)	/* bytes/page */
 #define	PGOFSET		(NBPG-1)	/* byte offset into page */
 #define	NPTEPG		(NBPG/(sizeof (pt_entry_t)))
 #define	MAXIOMEM	0xffffffff
 /*
  * Maximum physical memory supported by the implementation.
  */
 #ifdef PAE
 #define MAXPHYSMEM	0x1000000000ULL /* 64GB */
 #else
 #define MAXPHYSMEM	0x100000000ULL	/* 4GB */
 #endif
 #if defined(_KERNEL_OPT)
 #include "opt_kernbase.h"
 #endif /* defined(_KERNEL_OPT) */
 #ifdef KERNBASE_LOCORE
 #error "You should only re-define KERNBASE"
 #endif
 #ifndef	KERNBASE
 #define	KERNBASE	0xc0000000UL	/* start of kernel virtual space */
 #endif
 #define	KERNTEXTOFF	(KERNBASE + 0x100000) /* start of kernel text */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: x86_machdep.c,v 1.92 2017/06/14 08:12:22 maxv Exp $	*/
+/*	$NetBSD: x86_machdep.c,v 1.93 2017/06/14 12:27:24 maxv Exp $	*/
 /*-
  * Copyright (c) 2002, 2006, 2007 YAMAMOTO Takashi,
  * Copyright (c) 2005, 2008, 2009 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Julio M. Merino Vidal.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -21,27 +21,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: x86_machdep.c,v 1.92 2017/06/14 08:12:22 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: x86_machdep.c,v 1.93 2017/06/14 12:27:24 maxv Exp $");
 #include "opt_modular.h"
 #include "opt_physmem.h"
 #include "opt_splash.h"
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kcore.h>
 #include <sys/errno.h>
 #include <sys/kauth.h>
 #include <sys/mutex.h>
 #include <sys/cpu.h>
 @@ -509,47 +509,37 @@ x86_select_freelist(uint64_t maxaddr)
 	panic("no freelist for maximum address %"PRIx64, maxaddr);
+}
 static int
 x86_add_cluster(uint64_t seg_start, uint64_t seg_end, uint32_t type)
+{
 	extern struct extent *iomem_ex;
 	const uint64_t endext = MAXIOMEM + 1;
 	uint64_t new_physmem = 0;
 	phys_ram_seg_t *cluster;
 	int i;
-#ifdef i386
+	if (seg_end > MAXPHYSMEM) {
 #ifdef PAE
 #define TOPLIMIT	0x1000000000ULL /* 64GB */
 #else
 #define TOPLIMIT	0x100000000ULL	/* 4GB */
 #endif
 #else
 #define TOPLIMIT	0x100000000000ULL /* 16TB */
 #endif
 	if (seg_end > TOPLIMIT) {
 		aprint_verbose("WARNING: skipping large memory map entry: "
 		    "0x%"PRIx64"/0x%"PRIx64"/0x%x\n",
 		    seg_start, (seg_end - seg_start), type);
 		return 0;
+	}
 	/*
 	 * XXX: Chop the last page off the size so that it can fit in avail_end.
 	 */
-	if (seg_end == TOPLIMIT)
+	if (seg_end == MAXPHYSMEM)
 		seg_end -= PAGE_SIZE;
 	if (seg_end <= seg_start)
 		return 0;
 	for (i = 0; i < mem_cluster_cnt; i++) {
 		cluster = &mem_clusters[i];
 		if ((cluster->start == round_page(seg_start)) &&
 		    (cluster->size == trunc_page(seg_end) - cluster->start)) {
 #ifdef DEBUG_MEMLOAD
 			printf("WARNING: skipping duplicate segment entry\n");
 #endif
 			return 0;