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

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

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



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

arch/x86/xen/enlighten_pv.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -286,8 +286,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;





	cpuid_leaf1_ecx_mask &= ~(1 << (X86_FEATURE_X2APIC % 32));



	ax = 1;

	ax = 1;

	cx = 0;

	cx = 0;

	cpuid(1, &ax, &bx, &cx, &dx);

	cpuid(1, &ax, &bx, &cx, &dx);
@@ -309,6 +307,7 @@ 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);

	setup_clear_cpu_cap(X86_FEATURE_X2APIC);





	if (!xen_initial_domain())

	if (!xen_initial_domain())

		setup_clear_cpu_cap(X86_FEATURE_ACPI);

		setup_clear_cpu_cap(X86_FEATURE_ACPI);