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

Commit bb70de1f authored by Juergen Gross's avatar Juergen Gross Committed by Greg Kroah-Hartman
Browse files

xen: set cpu capabilities from xen_start_kernel() 



Upstream commit: 0808e80cb760de2733c0527d2090ed2205a1eef8 ("xen: set
cpu capabilities from xen_start_kernel()")

There is no need to set the same capabilities for each cpu
individually. This can easily be done for all cpus when starting the
kernel.

Signed-off-by: default avatarJuergen Gross <jgross@suse.com>
Reviewed-by: default avatarBoris Ostrovsky <boris.ostrovsky@oracle.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 474928b8

arch/x86/xen/enlighten.c

+9 −9
Original line number Diff line number Diff line
@@ -472,6 +472,14 @@ static void __init xen_init_cpuid_mask(void) 
		cpuid_leaf1_ecx_set_mask = (1 << (X86_FEATURE_MWAIT % 32));

}



static void __init xen_init_capabilities(void)

{

	if (xen_pv_domain()) {

		setup_clear_cpu_cap(X86_BUG_SYSRET_SS_ATTRS);

		setup_force_cpu_cap(X86_FEATURE_XENPV);

	}

}



static void xen_set_debugreg(int reg, unsigned long val)

{

	HYPERVISOR_set_debugreg(reg, val);
@@ -1634,6 +1642,7 @@ asmlinkage __visible void __init xen_start_kernel(void) 


	xen_init_irq_ops();

	xen_init_cpuid_mask();

	xen_init_capabilities();



#ifdef CONFIG_X86_LOCAL_APIC

	/*
@@ -1978,14 +1987,6 @@ bool xen_hvm_need_lapic(void) 
}

EXPORT_SYMBOL_GPL(xen_hvm_need_lapic);



static void xen_set_cpu_features(struct cpuinfo_x86 *c)

{

	if (xen_pv_domain()) {

		clear_cpu_bug(c, X86_BUG_SYSRET_SS_ATTRS);

		set_cpu_cap(c, X86_FEATURE_XENPV);

	}

}



static void xen_pin_vcpu(int cpu)

{

	static bool disable_pinning;
@@ -2032,7 +2033,6 @@ const struct hypervisor_x86 x86_hyper_xen = { 
	.init_platform		= xen_hvm_guest_init,

#endif

	.x2apic_available	= xen_x2apic_para_available,

	.set_cpu_features       = xen_set_cpu_features,

	.pin_vcpu               = xen_pin_vcpu,

};

EXPORT_SYMBOL(x86_hyper_xen);