svn commit: r214954 - head/sys/amd64/amd64

Alan Cox alc at FreeBSD.org
Sun Nov 7 21:48:49 UTC 2010


Author: alc
Date: Sun Nov  7 21:48:49 2010
New Revision: 214954
URL: http://svn.freebsd.org/changeset/base/214954

Log:
  Don't call pmap_demote_DMAP() on MTRR entries from the BIOS that are marked
  as "bogus".
  
  Reported by:	Jia-Shiun Li

Modified:
  head/sys/amd64/amd64/amd64_mem.c

Modified: head/sys/amd64/amd64/amd64_mem.c
==============================================================================
--- head/sys/amd64/amd64/amd64_mem.c	Sun Nov  7 21:40:34 2010	(r214953)
+++ head/sys/amd64/amd64/amd64_mem.c	Sun Nov  7 21:48:49 2010	(r214954)
@@ -583,7 +583,7 @@ amd64_mrset(struct mem_range_softc *sc, 
 	i = (sc->mr_cap & MR686_FIXMTRR) ? MTRR_N64K + MTRR_N16K + MTRR_N4K : 0;
 	mrd = sc->mr_desc + i;
 	for (; i < sc->mr_ndesc; i++, mrd++) {
-		if (mrd->mr_flags & MDF_ACTIVE)
+		if ((mrd->mr_flags & (MDF_ACTIVE | MDF_BOGUS)) == MDF_ACTIVE)
 			pmap_demote_DMAP(mrd->mr_base, mrd->mr_len, FALSE);
 	}
 
@@ -688,7 +688,7 @@ amd64_mrinit(struct mem_range_softc *sc)
 	i = (sc->mr_cap & MR686_FIXMTRR) ? MTRR_N64K + MTRR_N16K + MTRR_N4K : 0;
 	mrd = sc->mr_desc + i;
 	for (; i < sc->mr_ndesc; i++, mrd++) {
-		if (mrd->mr_flags & MDF_ACTIVE)
+		if ((mrd->mr_flags & (MDF_ACTIVE | MDF_BOGUS)) == MDF_ACTIVE)
 			pmap_demote_DMAP(mrd->mr_base, mrd->mr_len, TRUE);
 	}
 }


More information about the svn-src-head mailing list