|
 |
357786 |
From 499c2933a848699a80edd44308e1c4f7497a8a66 Mon Sep 17 00:00:00 2001
|
|
|
357786 |
From: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
357786 |
Date: Thu, 26 Jul 2018 15:25:35 +0200
|
|
|
357786 |
Subject: [PATCH 10/15] i386: Allow TOPOEXT to be enabled on older kernels
|
|
|
357786 |
|
|
|
357786 |
RH-Author: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
357786 |
Message-id: <20180726152535.4493-2-ehabkost@redhat.com>
|
|
|
357786 |
Patchwork-id: 81513
|
|
|
357786 |
O-Subject: [RHEL-7.6 qemu-kvm-rhev PATCH 1/1] i386: Allow TOPOEXT to be enabled on older kernels
|
|
|
357786 |
Bugzilla: 1608698
|
|
|
357786 |
RH-Acked-by: Laurent Vivier <lvivier@redhat.com>
|
|
|
357786 |
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
357786 |
RH-Acked-by: Igor Mammedov <imammedo@redhat.com>
|
|
|
357786 |
|
|
|
357786 |
From: Babu Moger <babu.moger@amd.com>
|
|
|
357786 |
|
|
|
357786 |
Enabling TOPOEXT feature might cause compatibility issues if
|
|
|
357786 |
older kernels does not set this feature. Lets set this feature
|
|
|
357786 |
unconditionally.
|
|
|
357786 |
|
|
|
357786 |
Signed-off-by: Babu Moger <babu.moger@amd.com>
|
|
|
357786 |
Message-Id: <1528939107-17193-2-git-send-email-babu.moger@amd.com>
|
|
|
357786 |
[ehabkost: rewrite comment and commit message]
|
|
|
357786 |
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
357786 |
(cherry picked from commit f98bbd8304112187cafc3e636c31b2a3865d2717)
|
|
|
357786 |
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
357786 |
|
|
|
357786 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
357786 |
---
|
|
|
357786 |
target/i386/kvm.c | 7 +++++++
|
|
|
357786 |
1 file changed, 7 insertions(+)
|
|
|
357786 |
|
|
|
357786 |
diff --git a/target/i386/kvm.c b/target/i386/kvm.c
|
|
|
357786 |
index 447215b..00f2141 100644
|
|
|
357786 |
--- a/target/i386/kvm.c
|
|
|
357786 |
+++ b/target/i386/kvm.c
|
|
|
357786 |
@@ -372,6 +372,13 @@ uint32_t kvm_arch_get_supported_cpuid(KVMState *s, uint32_t function,
|
|
|
357786 |
if (host_tsx_blacklisted()) {
|
|
|
357786 |
ret &= ~(CPUID_7_0_EBX_RTM | CPUID_7_0_EBX_HLE);
|
|
|
357786 |
}
|
|
|
357786 |
+ } else if (function == 0x80000001 && reg == R_ECX) {
|
|
|
357786 |
+ /*
|
|
|
357786 |
+ * It's safe to enable TOPOEXT even if it's not returned by
|
|
|
357786 |
+ * GET_SUPPORTED_CPUID. Unconditionally enabling TOPOEXT here allows
|
|
|
357786 |
+ * us to keep CPU models including TOPOEXT runnable on older kernels.
|
|
|
357786 |
+ */
|
|
|
357786 |
+ ret |= CPUID_EXT3_TOPOEXT;
|
|
|
357786 |
} else if (function == 0x80000001 && reg == R_EDX) {
|
|
|
357786 |
/* On Intel, kvm returns cpuid according to the Intel spec,
|
|
|
357786 |
* so add missing bits according to the AMD spec:
|
|
|
357786 |
--
|
|
|
357786 |
1.8.3.1
|
|
|
357786 |
|