Commit ea01598b authored by Juergen Gross's avatar Juergen Gross

x86/xen: use capabilities instead of fake cpuid values for mwait

When running as pv domain xen_cpuid() is being used instead of
native_cpuid(). In xen_cpuid() the mwait feature is indicated to be
present or not by special casing the related cpuid leaf.

Instead of delivering fake cpuid values use the cpu capability bit
for mwait instead.
Signed-off-by: default avatarJuergen Gross <jgross@suse.com>
Reviewed-by: default avatarBoris Ostrovsky <boris.ostrovsky@oracle.com>
Signed-off-by: default avatarJuergen Gross <jgross@suse.com>
parent b778d6bf
...@@ -167,7 +167,6 @@ xen_running_on_version_or_later(unsigned int major, unsigned int minor) ...@@ -167,7 +167,6 @@ xen_running_on_version_or_later(unsigned int major, unsigned int minor)
static __read_mostly unsigned int cpuid_leaf1_ecx_mask = ~0; static __read_mostly unsigned int cpuid_leaf1_ecx_mask = ~0;
static __read_mostly unsigned int cpuid_leaf1_ecx_set_mask;
static __read_mostly unsigned int cpuid_leaf5_ecx_val; static __read_mostly unsigned int cpuid_leaf5_ecx_val;
static __read_mostly unsigned int cpuid_leaf5_edx_val; static __read_mostly unsigned int cpuid_leaf5_edx_val;
...@@ -176,7 +175,6 @@ static void xen_cpuid(unsigned int *ax, unsigned int *bx, ...@@ -176,7 +175,6 @@ static void xen_cpuid(unsigned int *ax, unsigned int *bx,
{ {
unsigned maskebx = ~0; unsigned maskebx = ~0;
unsigned maskecx = ~0; unsigned maskecx = ~0;
unsigned setecx = 0;
/* /*
* Mask out inconvenient features, to try and disable as many * Mask out inconvenient features, to try and disable as many
* unsupported kernel subsystems as possible. * unsupported kernel subsystems as possible.
...@@ -184,7 +182,6 @@ static void xen_cpuid(unsigned int *ax, unsigned int *bx, ...@@ -184,7 +182,6 @@ static void xen_cpuid(unsigned int *ax, unsigned int *bx,
switch (*ax) { switch (*ax) {
case 1: case 1:
maskecx = cpuid_leaf1_ecx_mask; maskecx = cpuid_leaf1_ecx_mask;
setecx = cpuid_leaf1_ecx_set_mask;
break; break;
case CPUID_MWAIT_LEAF: case CPUID_MWAIT_LEAF:
...@@ -210,7 +207,6 @@ static void xen_cpuid(unsigned int *ax, unsigned int *bx, ...@@ -210,7 +207,6 @@ static void xen_cpuid(unsigned int *ax, unsigned int *bx,
*bx &= maskebx; *bx &= maskebx;
*cx &= maskecx; *cx &= maskecx;
*cx |= setecx;
} }
STACK_FRAME_NON_STANDARD(xen_cpuid); /* XEN_EMULATE_PREFIX */ STACK_FRAME_NON_STANDARD(xen_cpuid); /* XEN_EMULATE_PREFIX */
...@@ -303,8 +299,6 @@ static void __init xen_init_cpuid_mask(void) ...@@ -303,8 +299,6 @@ static void __init xen_init_cpuid_mask(void)
/* Xen will set CR4.OSXSAVE if supported and not disabled by force */ /* Xen will set CR4.OSXSAVE if supported and not disabled by force */
if ((cx & xsave_mask) != xsave_mask) if ((cx & xsave_mask) != xsave_mask)
cpuid_leaf1_ecx_mask &= ~xsave_mask; /* disable XSAVE & OSXSAVE */ cpuid_leaf1_ecx_mask &= ~xsave_mask; /* disable XSAVE & OSXSAVE */
if (xen_check_mwait())
cpuid_leaf1_ecx_set_mask = (1 << (X86_FEATURE_MWAIT % 32));
} }
static void __init xen_init_capabilities(void) static void __init xen_init_capabilities(void)
...@@ -318,6 +312,11 @@ static void __init xen_init_capabilities(void) ...@@ -318,6 +312,11 @@ static void __init xen_init_capabilities(void)
if (!xen_initial_domain()) if (!xen_initial_domain())
setup_clear_cpu_cap(X86_FEATURE_ACPI); setup_clear_cpu_cap(X86_FEATURE_ACPI);
if (xen_check_mwait())
setup_force_cpu_cap(X86_FEATURE_MWAIT);
else
setup_clear_cpu_cap(X86_FEATURE_MWAIT);
} }
static void xen_set_debugreg(int reg, unsigned long val) static void xen_set_debugreg(int reg, unsigned long val)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment