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

Commit 8c5e5ac3 authored by Jeremy Fitzhardinge's avatar Jeremy Fitzhardinge Committed by Ingo Molnar
Browse files

xen64: add xen-head code to head_64.S 



Add the Xen entrypoint and ELF notes to head_64.S.  Adapts xen-head.S
to compile either 32-bit or 64-bit.

Signed-off-by: default avatarJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Cc: Stephen Tweedie <sct@redhat.com>
Cc: Eduardo Habkost <ehabkost@redhat.com>
Cc: Mark McLoughlin <markmc@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent c7b75947

arch/x86/kernel/asm-offsets_64.c

+3 −0
Original line number Diff line number Diff line
@@ -131,5 +131,8 @@ int main(void) 
	OFFSET(BP_loadflags, boot_params, hdr.loadflags);

	OFFSET(BP_hardware_subarch, boot_params, hdr.hardware_subarch);

	OFFSET(BP_version, boot_params, hdr.version);



	BLANK();

	DEFINE(PAGE_SIZE_asm, PAGE_SIZE);

	return 0;

}

arch/x86/kernel/head_64.S

+1 −0
Original line number Diff line number Diff line
@@ -401,6 +401,7 @@ ENTRY(phys_base) 
	/* This must match the first entry in level2_kernel_pgt */

	.quad   0x0000000000000000



#include "../../x86/xen/xen-head.S"

	

	.section .bss, "aw", @nobits

	.align L1_CACHE_BYTES

arch/x86/xen/xen-head.S

+13 −2
Original line number Diff line number Diff line
@@ -8,15 +8,21 @@ 


#include <asm/boot.h>

#include <asm/asm.h>

#include <asm/page.h>



#include <xen/interface/elfnote.h>

#include <asm/xen/interface.h>



	__INIT

ENTRY(startup_xen)

	movl %esi,xen_start_info

	cld

	movl $(init_thread_union+THREAD_SIZE),%esp

#ifdef CONFIG_X86_32

	mov %esi,xen_start_info

	mov $init_thread_union+THREAD_SIZE,%esp

#else

	mov %rsi,xen_start_info

	mov $init_thread_union+THREAD_SIZE,%rsp

#endif

	jmp xen_start_kernel



	__FINIT
@@ -30,7 +36,11 @@ ENTRY(hypercall_page) 
	ELFNOTE(Xen, XEN_ELFNOTE_GUEST_OS,       .asciz "linux")

	ELFNOTE(Xen, XEN_ELFNOTE_GUEST_VERSION,  .asciz "2.6")

	ELFNOTE(Xen, XEN_ELFNOTE_XEN_VERSION,    .asciz "xen-3.0")

#ifdef CONFIG_X86_32

	ELFNOTE(Xen, XEN_ELFNOTE_VIRT_BASE,      _ASM_PTR __PAGE_OFFSET)

#else

	ELFNOTE(Xen, XEN_ELFNOTE_VIRT_BASE,      _ASM_PTR __START_KERNEL_map)

#endif

	ELFNOTE(Xen, XEN_ELFNOTE_ENTRY,          _ASM_PTR startup_xen)

	ELFNOTE(Xen, XEN_ELFNOTE_HYPERCALL_PAGE, _ASM_PTR hypercall_page)

	ELFNOTE(Xen, XEN_ELFNOTE_FEATURES,       .asciz "!writable_page_tables|pae_pgdir_above_4gb")
@@ -40,5 +50,6 @@ ENTRY(hypercall_page) 
		.quad _PAGE_PRESENT; .quad _PAGE_PRESENT)

	ELFNOTE(Xen, XEN_ELFNOTE_SUSPEND_CANCEL, .long 1)

	ELFNOTE(Xen, XEN_ELFNOTE_HV_START_LOW,   _ASM_PTR __HYPERVISOR_VIRT_START)

	ELFNOTE(Xen, XEN_ELFNOTE_PADDR_OFFSET,   _ASM_PTR 0)



#endif /*CONFIG_XEN */