tboot: fix S3 issue for Intel Trusted Execution Technology.

Those unmapped pages cause page fault when MACing them and finally
cause S3 failure.

Signed-off-by: Shane Wang <shane.wang@intel.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/xen/common/page_alloc.c b/xen/common/page_alloc.c
index 7139c3d39b..0e1925a3bb 100644
--- a/xen/common/page_alloc.c
+++ b/xen/common/page_alloc.c
@@ -932,8 +932,6 @@ void init_xenheap_pages(paddr_t ps, paddr_t pe)
     if ( pe <= ps )
         return;
 
-    memguard_guard_range(maddr_to_virt(ps), pe - ps);
-
     /*
      * Yuk! Ensure there is a one-page buffer between Xen and Dom zones, to
      * prevent merging of power-of-two blocks across the zone boundary.
@@ -943,6 +941,8 @@ void init_xenheap_pages(paddr_t ps, paddr_t pe)
     if ( !is_xen_heap_mfn(paddr_to_pfn(pe)) )
         pe -= PAGE_SIZE;
 
+    memguard_guard_range(maddr_to_virt(ps), pe - ps);
+
     init_heap_pages(maddr_to_page(ps), (pe - ps) >> PAGE_SHIFT);
 }