MFi386: preserve dcons buffer passed by loader.

1 files changed, 16 insertions, 0 deletions

diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c
index cd7af28..2bf532f 100644
--- a/sys/amd64/amd64/machdep.c
+++ b/sys/amd64/amd64/machdep.c
@@ -823,6 +823,7 @@ getmemsize(caddr_t kmdp, u_int64_t first)
 	char *cp;
 	struct bios_smap *smapbase, *smap, *smapend;
 	u_int32_t smapsize;
+	quad_t dcons_addr, dcons_size;
 
 	bzero(physmap, sizeof(physmap));
 	basemem = 0;
@@ -968,6 +969,13 @@ next_run:
 	pte = CMAP1;
 
 	/*
+	 * Get dcons buffer address
+	 */
+	if (getenv_quad("dcons.addr", &dcons_addr) == 0 ||
+	    getenv_quad("dcons.size", &dcons_size) == 0)
+		dcons_addr = 0;
+
+	/*
 	 * physmap is in bytes, so when converting to page boundaries,
 	 * round up the start address and round down the end address.
 	 */
@@ -987,6 +995,14 @@ next_run:
 			if (pa >= 0x100000 && pa < first)
 				continue;
 
+ 			/*
+ 			 * block out dcons buffer
+ 			 */
+ 			if (dcons_addr > 0
+ 			    && pa >= trunc_page(dcons_addr)
+ 			    && pa < dcons_addr + dcons_size)
+ 				continue;
+
 			page_bad = FALSE;
 
 			/*