svn commit: r232088 - stable/9/sys/amd64/amd64

[Jung-uk Kim]

Author: jkim
Date: Thu Feb 23 22:34:44 2012
New Revision: 232088
URL: http://svn.freebsd.org/changeset/base/232088

Log:
  MFC:	r231781
  
  Some BIOSes are known for corrupting low 64KB between suspend and resume.
  Mask off the first 16 pages unless we appear to be running in a VM.  This
  address may be overridden by 'hw.physmem.start' tunable from loader.

Modified:
  stable/9/sys/amd64/amd64/machdep.c
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/amd64/amd64/machdep.c
==============================================================================
--- stable/9/sys/amd64/amd64/machdep.c	Thu Feb 23 22:29:36 2012	(r232087)
+++ stable/9/sys/amd64/amd64/machdep.c	Thu Feb 23 22:34:44 2012	(r232088)
@@ -1352,7 +1352,7 @@ getmemsize(caddr_t kmdp, u_int64_t first
 {
 	int i, physmap_idx, pa_indx, da_indx;
 	vm_paddr_t pa, physmap[PHYSMAP_SIZE];
-	u_long physmem_tunable, memtest;
+	u_long physmem_start, physmem_tunable, memtest;
 	pt_entry_t *pte;
 	struct bios_smap *smapbase, *smap, *smapend;
 	u_int32_t smapsize;
@@ -1440,8 +1440,19 @@ getmemsize(caddr_t kmdp, u_int64_t first
 
 	/*
 	 * Size up each available chunk of physical memory.
+	 *
+	 * XXX Some BIOSes corrupt low 64KB between suspend and resume.
+	 * By default, mask off the first 16 pages unless we appear to be
+	 * running in a VM.
 	 */
-	physmap[0] = PAGE_SIZE;		/* mask off page 0 */
+	physmem_start = (vm_guest > VM_GUEST_NO ? 1 : 16) << PAGE_SHIFT;
+	TUNABLE_ULONG_FETCH("hw.physmem.start", &physmem_start);
+	if (physmem_start < PAGE_SIZE)
+		physmap[0] = PAGE_SIZE;
+	else if (physmem_start >= physmap[1])
+		physmap[0] = round_page(physmap[1] - PAGE_SIZE);
+	else
+		physmap[0] = round_page(physmem_start);
 	pa_indx = 0;
 	da_indx = 1;
 	phys_avail[pa_indx++] = physmap[0];