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

Commit 88f3256f authored by Juergen Gross's avatar Juergen Gross
Browse files

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



When running as pv domain xen_cpuid() is being used instead of
native_cpuid(). In xen_cpuid() the mtrr feature 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 mtrr 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 fd9145fd

arch/x86/xen/enlighten_pv.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -295,8 +295,7 @@ static void __init xen_init_cpuid_mask(void) 
	unsigned int xsave_mask;

	unsigned int xsave_mask;





	cpuid_leaf1_edx_mask =

	cpuid_leaf1_edx_mask =

		~((1 << X86_FEATURE_MTRR) |  /* disable MTRR */

		~(1 << X86_FEATURE_ACC);   /* thermal monitoring */

		  (1 << X86_FEATURE_ACC));   /* thermal monitoring */





	if (!xen_initial_domain())

	if (!xen_initial_domain())

		cpuid_leaf1_edx_mask &=

		cpuid_leaf1_edx_mask &=
@@ -325,6 +324,7 @@ static void __init xen_init_capabilities(void) 
	setup_force_cpu_cap(X86_FEATURE_XENPV);

	setup_force_cpu_cap(X86_FEATURE_XENPV);

	setup_clear_cpu_cap(X86_FEATURE_DCA);

	setup_clear_cpu_cap(X86_FEATURE_DCA);

	setup_clear_cpu_cap(X86_FEATURE_APERFMPERF);

	setup_clear_cpu_cap(X86_FEATURE_APERFMPERF);

	setup_clear_cpu_cap(X86_FEATURE_MTRR);

}

}





static void xen_set_debugreg(int reg, unsigned long val)

static void xen_set_debugreg(int reg, unsigned long val)