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

Commit dacd45f4 authored by Konrad Rzeszutek Wilk's avatar Konrad Rzeszutek Wilk
Browse files

xen/smp: Move the common CPU init code a bit to prep for PVH patch. 



The PV and PVH code CPU init code share some functionality. The
PVH code ("xen/pvh: Extend vcpu_guest_context, p2m, event, and XenBus")
sets some of these up, but not all. To make it easier to read, this
patch removes the PV specific out of the generic way.

No functional change - just code movement.

Acked-by: default avatarStefano Stabellini <stefano.stabellini@eu.citrix.com>
[v2: Fixed compile errors noticed by Fengguang Wu build system]
Signed-off-by: default avatarKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
parent 949db153

arch/x86/xen/smp.c

+23 −19
Original line number Diff line number Diff line
@@ -300,8 +300,6 @@ cpu_initialize_context(unsigned int cpu, struct task_struct *idle) 
	gdt = get_cpu_gdt_table(cpu);



	ctxt->flags = VGCF_IN_KERNEL;

	ctxt->user_regs.ds = __USER_DS;

	ctxt->user_regs.es = __USER_DS;

	ctxt->user_regs.ss = __KERNEL_DS;

#ifdef CONFIG_X86_32

	ctxt->user_regs.fs = __KERNEL_PERCPU;
@@ -310,10 +308,14 @@ cpu_initialize_context(unsigned int cpu, struct task_struct *idle) 
	ctxt->gs_base_kernel = per_cpu_offset(cpu);

#endif

	ctxt->user_regs.eip = (unsigned long)cpu_bringup_and_idle;

	ctxt->user_regs.eflags = 0x1000; /* IOPL_RING1 */



	memset(&ctxt->fpu_ctxt, 0, sizeof(ctxt->fpu_ctxt));



	{

		ctxt->user_regs.eflags = 0x1000; /* IOPL_RING1 */

		ctxt->user_regs.ds = __USER_DS;

		ctxt->user_regs.es = __USER_DS;



		xen_copy_trap_info(ctxt->trap_ctxt);



		ctxt->ldt_ents = 0;
@@ -327,9 +329,6 @@ cpu_initialize_context(unsigned int cpu, struct task_struct *idle) 
		ctxt->gdt_frames[0] = gdt_mfn;

		ctxt->gdt_ents      = GDT_ENTRIES;



	ctxt->user_regs.cs = __KERNEL_CS;

	ctxt->user_regs.esp = idle->thread.sp0 - sizeof(struct pt_regs);



		ctxt->kernel_ss = __KERNEL_DS;

		ctxt->kernel_sp = idle->thread.sp0;
@@ -337,8 +336,13 @@ cpu_initialize_context(unsigned int cpu, struct task_struct *idle) 
		ctxt->event_callback_cs     = __KERNEL_CS;

		ctxt->failsafe_callback_cs  = __KERNEL_CS;

#endif

	ctxt->event_callback_eip    = (unsigned long)xen_hypervisor_callback;

	ctxt->failsafe_callback_eip = (unsigned long)xen_failsafe_callback;

		ctxt->event_callback_eip    =

					(unsigned long)xen_hypervisor_callback;

		ctxt->failsafe_callback_eip =

					(unsigned long)xen_failsafe_callback;

	}

	ctxt->user_regs.cs = __KERNEL_CS;

	ctxt->user_regs.esp = idle->thread.sp0 - sizeof(struct pt_regs);



	per_cpu(xen_cr3, cpu) = __pa(swapper_pg_dir);

	ctxt->ctrlreg[3] = xen_pfn_to_cr3(virt_to_mfn(swapper_pg_dir));