summaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
authorJuergen Gross <jgross@suse.com>2017-04-12 09:24:01 +0200
committerJuergen Gross <jgross@suse.com>2017-05-02 11:13:53 +0200
commitaa1071562937d1b66b07db48e3dbafe136027f01 (patch)
treeedd2a52945b8affb77c641132d6c92c4884e5c0a /arch/x86
parent88f3256f21d958d0773bf93523ad12d2ddaf3006 (diff)
downloadlinux-stable-aa1071562937d1b66b07db48e3dbafe136027f01.tar.gz
linux-stable-aa1071562937d1b66b07db48e3dbafe136027f01.tar.bz2
linux-stable-aa1071562937d1b66b07db48e3dbafe136027f01.zip
x86/xen: use capabilities instead of fake cpuid values for acc
When running as pv domain xen_cpuid() is being used instead of native_cpuid(). In xen_cpuid() the acc feature (thermal monitoring) is indicated as not being present by special casing the related cpuid leaf. Instead of delivering fake cpuid values clear the cpu capability bit for acc instead. Signed-off-by: Juergen Gross <jgross@suse.com> Reviewed-by: Boris Ostrovsky <boris.ostrovsky@oracle.com> Signed-off-by: Juergen Gross <jgross@suse.com>
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/xen/enlighten_pv.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/x86/xen/enlighten_pv.c b/arch/x86/xen/enlighten_pv.c
index 37e174d9009b..53fe97bd720f 100644
--- a/arch/x86/xen/enlighten_pv.c
+++ b/arch/x86/xen/enlighten_pv.c
@@ -294,9 +294,6 @@ static void __init xen_init_cpuid_mask(void)
unsigned int ax, bx, cx, dx;
unsigned int xsave_mask;
- cpuid_leaf1_edx_mask =
- ~(1 << X86_FEATURE_ACC); /* thermal monitoring */
-
if (!xen_initial_domain())
cpuid_leaf1_edx_mask &=
~((1 << X86_FEATURE_ACPI)); /* disable ACPI */
@@ -325,6 +322,7 @@ static void __init xen_init_capabilities(void)
setup_clear_cpu_cap(X86_FEATURE_DCA);
setup_clear_cpu_cap(X86_FEATURE_APERFMPERF);
setup_clear_cpu_cap(X86_FEATURE_MTRR);
+ setup_clear_cpu_cap(X86_FEATURE_ACC);
}
static void xen_set_debugreg(int reg, unsigned long val)