renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-19 10:44:14 +08:00
Code

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

Browse Source 
When running as pv domain xen_cpuid() is being used instead of
native_cpuid(). In xen_cpuid() the acpi feature is indicated as not
being present by special casing the related cpuid leaf in case we
are not the initial domain.

Instead of delivering fake cpuid values clear the cpu capability bit
for acpi 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>
This commit is contained in:
Juergen Gross 2017-04-12 09:27:47 +02:00
parent aa10715629
commit b778d6bf63
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
arch/x86/xen/enlighten_pv.c
View File

@ -165,7 +165,6 @@ xen_running_on_version_or_later(unsigned int major, unsigned int minor)
return false; return false;
} }
static __read_mostly unsigned int cpuid_leaf1_edx_mask = ~0;
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_leaf1_ecx_set_mask;
@ -177,7 +176,6 @@ static void xen_cpuid(unsigned int *ax, unsigned int *bx,
{ {
unsigned maskebx = ~0; unsigned maskebx = ~0;
unsigned maskecx = ~0; unsigned maskecx = ~0;
unsigned maskedx = ~0;
unsigned setecx = 0; unsigned setecx = 0;
/* /*
* Mask out inconvenient features, to try and disable as many * Mask out inconvenient features, to try and disable as many
@ -187,7 +185,6 @@ static void xen_cpuid(unsigned int *ax, unsigned int *bx,
case 1: case 1:
maskecx = cpuid_leaf1_ecx_mask; maskecx = cpuid_leaf1_ecx_mask;
setecx = cpuid_leaf1_ecx_set_mask; setecx = cpuid_leaf1_ecx_set_mask;
maskedx = cpuid_leaf1_edx_mask;
break; break;
case CPUID_MWAIT_LEAF: case CPUID_MWAIT_LEAF:
@ -214,7 +211,6 @@ static void xen_cpuid(unsigned int *ax, unsigned int *bx,
*bx &= maskebx; *bx &= maskebx;
*cx &= maskecx; *cx &= maskecx;
*cx |= setecx; *cx |= setecx;
*dx &= maskedx;
} }
STACK_FRAME_NON_STANDARD(xen_cpuid); /* XEN_EMULATE_PREFIX */ STACK_FRAME_NON_STANDARD(xen_cpuid); /* XEN_EMULATE_PREFIX */
@ -294,10 +290,6 @@ static void __init xen_init_cpuid_mask(void)
unsigned int ax, bx, cx, dx; unsigned int ax, bx, cx, dx;
unsigned int xsave_mask; unsigned int xsave_mask;
if (!xen_initial_domain())
cpuid_leaf1_edx_mask &=
~((1 << X86_FEATURE_ACPI)); /* disable ACPI */
cpuid_leaf1_ecx_mask &= ~(1 << (X86_FEATURE_X2APIC % 32)); cpuid_leaf1_ecx_mask &= ~(1 << (X86_FEATURE_X2APIC % 32));
ax = 1; ax = 1;
@ -323,6 +315,9 @@ static void __init xen_init_capabilities(void)
setup_clear_cpu_cap(X86_FEATURE_APERFMPERF); setup_clear_cpu_cap(X86_FEATURE_APERFMPERF);
setup_clear_cpu_cap(X86_FEATURE_MTRR); setup_clear_cpu_cap(X86_FEATURE_MTRR);
setup_clear_cpu_cap(X86_FEATURE_ACC); setup_clear_cpu_cap(X86_FEATURE_ACC);
if (!xen_initial_domain())
setup_clear_cpu_cap(X86_FEATURE_ACPI);
} }
static void xen_set_debugreg(int reg, unsigned long val) static void xen_set_debugreg(int reg, unsigned long val)