X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/6d2010ae8f7a6078e10b361c6962983bab233e0f..527f99514973766e9c0382a4d8550dfb00f54939:/osfmk/i386/hibernate_restore.c

diff --git a/osfmk/i386/hibernate_restore.c b/osfmk/i386/hibernate_restore.c
index bf0508a69..2e4c69e79 100644
--- a/osfmk/i386/hibernate_restore.c
+++ b/osfmk/i386/hibernate_restore.c
@@ -31,10 +31,7 @@
 
 #include <i386/pal_hibernate.h>
 
-extern pd_entry_t BootstrapPTD[2048];
-
-#define TWO_MEG_MASK 0xFFFFFFFFFFE00000ULL
-#define FOUR_K_MASK 0xFFFFFFFFFFFFF000ULL
+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
@@ -46,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;
@@ -54,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];
+	__nosan_memcpy(d, s, len);
 
 	return (uintptr_t)d;
 }
@@ -63,63 +58,48 @@ hibernate_restore_phys_page(uint64_t src, uint64_t dst, uint32_t len, uint32_t p
 
 void hibprintf(const char *fmt, ...);
 
-void
-pal_hib_window_setup(ppnum_t page)
-{
-	uint64_t *pp;
-	uint64_t phys = ptoa_64(page);
-	int i;
-
-	BootstrapPTD[2047] = (phys & ~((uint64_t)I386_LPGMASK)) | INTEL_PTE_PS  | INTEL_PTE_VALID | INTEL_PTE_WRITE;
-
-	invlpg(HIB_PTES);
-
-	pp = (uint64_t *)(uintptr_t)(HIB_PTES + (phys & I386_LPGMASK));
-
-	for(i=0;i<512;i++)
-		*pp = 0;
-
-	pp[0] = phys | INTEL_PTE_VALID | INTEL_PTE_WRITE;
-	BootstrapPTD[2047] = phys | INTEL_PTE_VALID | INTEL_PTE_WRITE;
-
-	invlpg(HIB_PTES);
-}
-
 uintptr_t
-pal_hib_map(uintptr_t v, uint64_t p)
+pal_hib_map(uintptr_t virt, uint64_t phys)
 {
-	int index;
-
-	switch(v) {
-		case DEST_COPY_AREA:
-			index = 1;
-			break;
-		case SRC_COPY_AREA:
-			index = 2;
-			break;
-		case COPY_PAGE_AREA:
-			index = 3;
-			break;
-		default:
-			index = -1;
-			asm("cli;hlt;");
-	}
-
-	uint64_t *ptes = (uint64_t *)HIB_PTES;
-
-	/* Outside 1-1 4G map so set up the mappings for the dest page using 2MB pages */
-	ptes[index] = (p & FOUR_K_MASK) | INTEL_PTE_VALID | INTEL_PTE_WRITE;
-		
-	/* Invalidate the page tables for this */
-	invlpg((uintptr_t)v);
-
-	return v;
+    uintptr_t index;
+
+    switch (virt)
+    {
+	case DEST_COPY_AREA:
+	case SRC_COPY_AREA:
+	case COPY_PAGE_AREA:
+	case BITMAP_AREA:
+	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);
+    if (phys == BootPTD[index]) return (virt);
+    BootPTD[index] = phys;
+    invlpg(virt);
+    BootPTD[index + 1] = (phys + I386_LPGBYTES);
+    invlpg(virt + I386_LPGBYTES);
+
+    return (virt);
 }
 
 void hibernateRestorePALState(uint32_t *arg)
 {
-	(void)arg;
+    (void)arg;
 }
+
 void
 pal_hib_patchup(void)
 {