From: Keir Fraser <keir.fraser@citrix.com>
Date: Mon, 29 Dec 2008 13:32:32 +0000 (+0000)
Subject: x86: Do not restrict 32-bit EPT to 4GB.
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~14019^2~35
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=723c9ab1672104e9eed440b4204d7a195858b4e4;p=xen.git

x86: Do not restrict 32-bit EPT to 4GB.

Signed-off-by: Xin, Xiaohui <xiaohui.xin@intel.com>
---

diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c
index d32498092e..72f470dcf1 100644
--- a/xen/arch/x86/mm/p2m.c
+++ b/xen/arch/x86/mm/p2m.c
@@ -935,11 +935,12 @@ guest_physmap_add_entry(struct domain *d, unsigned long gfn,
 
 #if CONFIG_PAGING_LEVELS == 3
     /*
-     * 32bit PAE nested paging does not support over 4GB guest due to 
+     * 32bit AMD nested paging does not support over 4GB guest due to 
      * hardware translation limit. This limitation is checked by comparing
      * gfn with 0xfffffUL.
      */
-    if ( paging_mode_hap(d) && (gfn > 0xfffffUL) )
+    if ( paging_mode_hap(d) && (gfn > 0xfffffUL) &&
+         (boot_cpu_data.x86_vendor == X86_VENDOR_AMD) )
     {
         if ( !test_and_set_bool(d->arch.hvm_domain.svm.npt_4gb_warning) )
             dprintk(XENLOG_WARNING, "Dom%d failed to populate memory beyond"