From mboxrd@z Thu Jan  1 00:00:00 1970
From: Wei Wang2 <wei.wang2@amd.com>
Subject: [PATCH] svm: Re-enable 2MB super paging
Date: Tue, 19 Oct 2010 17:38:01 +0200
Message-ID: <201010191738.02188.wei.wang2@amd.com>
Mime-Version: 1.0
Content-Type: multipart/mixed; boundary="Boundary-00=_atbvMySWoeu1FBc"
Return-path: <xen-devel-bounces@lists.xensource.com>
List-Unsubscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xensource.com>
List-Help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-Subscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
Sender: xen-devel-bounces@lists.xensource.com
Errors-To: xen-devel-bounces@lists.xensource.com
To: xen-devel@lists.xensource.com
List-Id: xen-devel@lists.xenproject.org

--Boundary-00=_atbvMySWoeu1FBc
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: inline

Bitwise OR operator has higher precedence than conditional operator. This=20
patch fixes the incorrect associativity and re-enables 2MB paging for AMD=20
family 10h system.=20
Thanks,
Wei

Signed-off-by: Wei Wang <wei.wang2@amd.com>
Acked-by: Wei Huang <wei.huang2@amd.com>

Legal Information:
Advanced Micro Devices GmbH
Sitz: Dornach, Gemeinde Aschheim,=20
Landkreis M=FCnchen Registergericht M=FCnchen,=20
HRB Nr. 43632
Gesch=E4ftsf=FChrer:
Alberto Bozzo, Andrew Bowd

--Boundary-00=_atbvMySWoeu1FBc
Content-Type: text/x-diff; charset="iso-8859-1"; name="fix_2mb.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="fix_2mb.patch"

diff -r 3a5755249361 xen/arch/x86/hvm/svm/svm.c
--- a/xen/arch/x86/hvm/svm/svm.c	Thu Oct 14 12:46:29 2010 +0100
+++ b/xen/arch/x86/hvm/svm/svm.c	Tue Oct 19 14:40:13 2010 +0200
@@ -904,8 +904,8 @@ struct hvm_function_table * __init start
 
     svm_function_table.hap_supported = cpu_has_svm_npt;
     svm_function_table.hap_capabilities = HVM_HAP_SUPERPAGE_2MB |
-        ((CONFIG_PAGING_LEVELS == 4) && (cpuid_edx(0x80000001) & 0x04000000)) ?
-            HVM_HAP_SUPERPAGE_1GB : 0;
+        (((CONFIG_PAGING_LEVELS == 4) && (cpuid_edx(0x80000001) & 0x04000000)) ?
+            HVM_HAP_SUPERPAGE_1GB : 0);
 
     return &svm_function_table;
 }

--Boundary-00=_atbvMySWoeu1FBc
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel

--Boundary-00=_atbvMySWoeu1FBc--