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

Commit 51174d25 authored by Vitaly Kuznetsov's avatar Vitaly Kuznetsov Committed by Greg Kroah-Hartman
Browse files

x86/xen: split xen_smp_prepare_boot_cpu() 




[ Upstream commit a2d1078a35f9a38ae888aa6147e4ca32666154a1 ]

Split xen_smp_prepare_boot_cpu() into xen_pv_smp_prepare_boot_cpu() and
xen_hvm_smp_prepare_boot_cpu() to support further splitting of smp.c.

Signed-off-by: default avatarVitaly Kuznetsov <vkuznets@redhat.com>
Reviewed-by: default avatarJuergen Gross <jgross@suse.com>
Signed-off-by: default avatarJuergen Gross <jgross@suse.com>
Signed-off-by: default avatarSasha Levin <alexander.levin@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f29bc9dc

arch/x86/xen/smp.c

+30 −19
Original line number Diff line number Diff line
@@ -299,12 +299,11 @@ static void __init xen_filter_cpu_maps(void) 


}



static void __init xen_smp_prepare_boot_cpu(void)

static void __init xen_pv_smp_prepare_boot_cpu(void)

{

	BUG_ON(smp_processor_id() != 0);

	native_smp_prepare_boot_cpu();



	if (xen_pv_domain()) {

	if (!xen_feature(XENFEAT_writable_page_tables))

		/* We've switched to the "real" per-cpu gdt, so make

		 * sure the old memory can be recycled. */
@@ -321,12 +320,24 @@ static void __init xen_smp_prepare_boot_cpu(void) 


	xen_filter_cpu_maps();

	xen_setup_vcpu_info_placement();



	/*

	 * The alternative logic (which patches the unlock/lock) runs before

	 * the smp bootup up code is activated. Hence we need to set this up

	 * the core kernel is being patched. Otherwise we will have only

	 * modules patched but not core code.

	 */

	xen_init_spinlocks();

}



static void __init xen_hvm_smp_prepare_boot_cpu(void)

{

	BUG_ON(smp_processor_id() != 0);

	native_smp_prepare_boot_cpu();



	/*

	 * Setup vcpu_info for boot CPU.

	 */

	if (xen_hvm_domain())

	xen_vcpu_setup(0);



	/*
@@ -733,7 +744,7 @@ static irqreturn_t xen_irq_work_interrupt(int irq, void *dev_id) 
}



static const struct smp_ops xen_smp_ops __initconst = {

	.smp_prepare_boot_cpu = xen_smp_prepare_boot_cpu,

	.smp_prepare_boot_cpu = xen_pv_smp_prepare_boot_cpu,

	.smp_prepare_cpus = xen_smp_prepare_cpus,

	.smp_cpus_done = xen_smp_cpus_done,
@@ -772,5 +783,5 @@ void __init xen_hvm_smp_init(void) 
	smp_ops.cpu_die = xen_cpu_die;

	smp_ops.send_call_func_ipi = xen_smp_send_call_function_ipi;

	smp_ops.send_call_func_single_ipi = xen_smp_send_call_function_single_ipi;

	smp_ops.smp_prepare_boot_cpu = xen_smp_prepare_boot_cpu;

	smp_ops.smp_prepare_boot_cpu = xen_hvm_smp_prepare_boot_cpu;

}