X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/7ddcb079202367355dddccdfa4318e57d50318be..22ba694c5857e62b5a553b1505dcf2e509177f28:/osfmk/i386/hibernate_restore.c?ds=sidebyside

diff --git a/osfmk/i386/hibernate_restore.c b/osfmk/i386/hibernate_restore.c
index 47a5b9c7a..278ff4e78 100644
--- a/osfmk/i386/hibernate_restore.c
+++ b/osfmk/i386/hibernate_restore.c
@@ -31,7 +31,7 @@
 
 #include <i386/pal_hibernate.h>
 
-extern pd_entry_t BootstrapPTD[2048];
+extern pd_entry_t BootPTD[2048];
 
 // src is virtually mapped, not page aligned, 
 // dst is a physical 4k page aligned ptr, len is one 4K page
@@ -43,7 +43,6 @@ hibernate_restore_phys_page(uint64_t src, uint64_t dst, uint32_t len, uint32_t p
 	(void)procFlags;
 	uint64_t * d;
 	uint64_t * s;
-	uint32_t idx;
 
 	if (src == 0)
 		return (uintptr_t)dst;
@@ -51,8 +50,7 @@ hibernate_restore_phys_page(uint64_t src, uint64_t dst, uint32_t len, uint32_t p
 	d = (uint64_t *)pal_hib_map(DEST_COPY_AREA, dst);
 	s = (uint64_t *) (uintptr_t)src;
 
-	for (idx = 0; idx < (len / (uint32_t)sizeof(uint64_t)); idx++) 
-		d[idx] = s[idx];
+	memcpy(d, s, len);
 
 	return (uintptr_t)d;
 }
@@ -74,17 +72,24 @@ pal_hib_map(uintptr_t virt, uint64_t phys)
 	case IMAGE_AREA:
 	case IMAGE2_AREA:
 	    break;
+
 	default:
 	    asm("cli;hlt;");
 	    break;
     }
-
+    if (phys < IMAGE2_AREA)
+    {
+    	// first 4Gb is all mapped,
+	// and do not expect source areas to cross 4Gb
+        return (phys);
+    }
     index = (virt >> I386_LPGSHIFT);
     virt += (uintptr_t)(phys & I386_LPGMASK);
     phys  = ((phys & ~((uint64_t)I386_LPGMASK)) | INTEL_PTE_PS  | INTEL_PTE_VALID | INTEL_PTE_WRITE);
-    BootstrapPTD[index] = phys;
+    if (phys == BootPTD[index]) return (virt);
+    BootPTD[index] = phys;
     invlpg(virt);
-    BootstrapPTD[index + 1] = (phys + I386_LPGBYTES);
+    BootPTD[index + 1] = (phys + I386_LPGBYTES);
     invlpg(virt + I386_LPGBYTES);
 
     return (virt);