]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
4.14-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 1 Feb 2018 08:23:43 +0000 (09:23 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 1 Feb 2018 08:23:43 +0000 (09:23 +0100)
added patches:
kvm-x86-fix-cpuid-function-for-word-6-80000001_ecx.patch

queue-4.14/kvm-x86-fix-cpuid-function-for-word-6-80000001_ecx.patch [new file with mode: 0644]
queue-4.14/series

diff --git a/queue-4.14/kvm-x86-fix-cpuid-function-for-word-6-80000001_ecx.patch b/queue-4.14/kvm-x86-fix-cpuid-function-for-word-6-80000001_ecx.patch
new file mode 100644 (file)
index 0000000..97b44a3
--- /dev/null
@@ -0,0 +1,38 @@
+From 50a671d4d15b859f447fa527191073019b6ce9cb Mon Sep 17 00:00:00 2001
+From: Janakarajan Natarajan <Janakarajan.Natarajan@amd.com>
+Date: Mon, 6 Nov 2017 11:44:23 -0600
+Subject: KVM: x86: Fix CPUID function for word 6 (80000001_ECX)
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From: Janakarajan Natarajan <Janakarajan.Natarajan@amd.com>
+
+commit 50a671d4d15b859f447fa527191073019b6ce9cb upstream.
+
+The function for CPUID 80000001 ECX is set to 0xc0000001. Set it to
+0x80000001.
+
+Signed-off-by: Janakarajan Natarajan <Janakarajan.Natarajan@amd.com>
+Reviewed-by: Jim Mattson <jmattson@google.com>
+Reviewed-by: Krish Sadhukhan <krish.sadhukhan@oracle.com>
+Reviewed-by: Borislav Petkov <bp@suse.de>
+Fixes: d6321d493319 ("KVM: x86: generalize guest_cpuid_has_ helpers")
+Signed-off-by: Radim Krčmář <rkrcmar@redhat.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/x86/kvm/cpuid.h |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/arch/x86/kvm/cpuid.h
++++ b/arch/x86/kvm/cpuid.h
+@@ -44,7 +44,7 @@ static const struct cpuid_reg reverse_cp
+       [CPUID_8086_0001_EDX] = {0x80860001, 0, CPUID_EDX},
+       [CPUID_1_ECX]         = {         1, 0, CPUID_ECX},
+       [CPUID_C000_0001_EDX] = {0xc0000001, 0, CPUID_EDX},
+-      [CPUID_8000_0001_ECX] = {0xc0000001, 0, CPUID_ECX},
++      [CPUID_8000_0001_ECX] = {0x80000001, 0, CPUID_ECX},
+       [CPUID_7_0_EBX]       = {         7, 0, CPUID_EBX},
+       [CPUID_D_1_EAX]       = {       0xd, 1, CPUID_EAX},
+       [CPUID_F_0_EDX]       = {       0xf, 0, CPUID_EDX},
index c73cfdb8c51381a80849ba3e7a3ed29a0006a35b..1b86da8fb81988cfcac0695737c2e6a3059266a2 100644 (file)
@@ -1,2 +1,3 @@
 futex-fix-owner_dead-fixup.patch
 loop-fix-concurrent-lo_open-lo_release.patch
+kvm-x86-fix-cpuid-function-for-word-6-80000001_ecx.patch