xnu-2422.100.13.tar.gz

[apple/xnu.git] / osfmk / i386 / hibernate_restore.c

diff --git a/osfmk/i386/hibernate_restore.c b/osfmk/i386/hibernate_restore.c
index 47a5b9c7a791267d886a00e217726e1a5622a058..278ff4e78003cc0c3b7b396209ee70d6f6b98cd7 100644 (file)
--- a/osfmk/i386/hibernate_restore.c
+++ b/osfmk/i386/hibernate_restore.c
@@ -31,7 +31,7 @@
 
 #include <i386/pal_hibernate.h>
 
 
 #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
 
 // 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;
        (void)procFlags;
        uint64_t * d;
        uint64_t * s;

-       uint32_t idx;

 
        if (src == 0)
                return (uintptr_t)dst;
 
        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;
 
        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;
 }
 
        return (uintptr_t)d;
 }


@@ -74,17 +72,24 @@ pal_hib_map(uintptr_t virt, uint64_t phys)
        case IMAGE_AREA:
        case IMAGE2_AREA:
            break;
        case IMAGE_AREA:
        case IMAGE2_AREA:
            break;

+

        default:
            asm("cli;hlt;");
            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);
     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);
     invlpg(virt);

-    BootstrapPTD[index + 1] = (phys + I386_LPGBYTES);
+    BootPTD[index + 1] = (phys + I386_LPGBYTES);

     invlpg(virt + I386_LPGBYTES);
 
     return (virt);
     invlpg(virt + I386_LPGBYTES);
 
     return (virt);