[Xen-changelog] [xen stable-4.6] tools/libxc: Properly increment ApicIdCoreSize field on AMD

[patchbot@xxxxxxx]

commit 0e944364767cb198ae81c4326ed24ea3941ad8e7
Author:     Boris Ostrovsky <boris.ostrovsky@xxxxxxxxxx>
AuthorDate: Fri Jul 22 13:14:01 2016 -0400
Commit:     Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx>
CommitDate: Mon Aug 15 11:31:24 2016 +0100

    tools/libxc: Properly increment ApicIdCoreSize field on AMD
    
    Current code incorrectly adds 1 to full register instead of
    incrementing the field in bits 15:12.
    
    Signed-off-by: Boris Ostrovsky <boris.ostrovsky@xxxxxxxxxx>
    Acked-by: Wei Liu <wei.liu2@xxxxxxxxxx>
    (cherry picked from commit a3336a507519c1d28db3bbff8e439aa3811733f3)
    (cherry picked from commit de781b47f447fcdd1c556543fcf0ef1d654d2d4d)
---
 tools/libxc/xc_cpuid_x86.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/libxc/xc_cpuid_x86.c b/tools/libxc/xc_cpuid_x86.c
index e146a3e..11fecd5 100644
--- a/tools/libxc/xc_cpuid_x86.c
+++ b/tools/libxc/xc_cpuid_x86.c
@@ -123,7 +123,8 @@ static void amd_xc_cpuid_policy(
          * ECX[15:12] is ApicIdCoreSize: ECX[7:0] is NumberOfCores (minus one).
          * Update to reflect vLAPIC_ID = vCPU_ID * 2.
          */
-        regs[2] = ((regs[2] & 0xf000u) + 1) | ((regs[2] & 0xffu) << 1) | 1u;
+        regs[2] = ((regs[2] + (1u << 12)) & 0xf000u) |
+                  ((regs[2] & 0xffu) << 1) | 1u;
         break;
 
     case 0x8000000a: {
--
generated by git-patchbot for /home/xen/git/xen.git#stable-4.6

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
https://lists.xenproject.org/xen-changelog