Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aa107156 authored by Juergen Gross's avatar Juergen Gross
Browse files

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: 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 88f3256f

arch/x86/xen/enlighten_pv.c

+1 −3
Original line number Diff line number Diff line
@@ -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)