| Message ID | 1480976718-12198-2-git-send-email-daniel.kiper@oracle.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 12/5/16 4:25 PM, Daniel Kiper wrote: > Add multiboot2 protocol support. Alter min memory limit handling as we > now may not find it from either multiboot (v1) or multiboot2. > > This way we are laying the foundation for EFI + GRUB2 + Xen development. > > Signed-off-by: Daniel Kiper <daniel.kiper@oracle.com> > Reviewed-by: Jan Beulich <jbeulich@suse.com> > --- > v9 - suggestions/fixes: > - use .L label instead of numeric one in multiboot2 data scanning loop; > I hope that this change does not invalidate Jan's Reviewed-by > (suggested by Jan Beulich). > > v8 - suggestions/fixes: > - use sizeof(<var>/<expr>) instead of sizeof(<type>) > if it is possible > (suggested by Jan Beulich). > > v7 - suggestions/fixes: > - rename mbi_mbi/mbi2_mbi to mbi_reloc/mbi2_reloc respectively > (suggested by Jan Beulich), > - initialize mbi_out->flags using "|=" instead of "=" > (suggested by Jan Beulich), > - use sizeof(*mmap_dst) instead of sizeof(memory_map_t) > if it makes sense > (suggested by Jan Beulich). > > v6 - suggestions/fixes: > - properly index multiboot2_tag_mmap_t.entries[] > (suggested by Jan Beulich), > - do not index mbi_out_mods[] beyond its end > (suggested by Andrew Cooper), > - reduce number of casts > (suggested by Andrew Cooper and Jan Beulich), > - add braces to increase code readability > (suggested by Andrew Cooper). > > v5 - suggestions/fixes: > - check multiboot2_tag_mmap_t.entry_size before > multiboot2_tag_mmap_t.entries[] use > (suggested by Jan Beulich), > - properly index multiboot2_tag_mmap_t.entries[] > (suggested by Jan Beulich), > - use "type name[]" instad of "type name[0]" > in xen/include/xen/multiboot2.h > (suggested by Jan Beulich), > - remove unneeded comment > (suggested by Jan Beulich). > > v4 - suggestions/fixes: > - avoid assembly usage in xen/arch/x86/boot/reloc.c, > - fix boundary check issue and optimize > for() loops in mbi2_mbi(), > - move to stdcall calling convention, > - remove unneeded typeof() from ALIGN_UP() macro > (suggested by Jan Beulich), > - add and use NULL definition in xen/arch/x86/boot/reloc.c > (suggested by Jan Beulich), > - do not read data beyond the end of multiboot2 > information in xen/arch/x86/boot/head.S > (suggested by Jan Beulich), > - add :req to some .macro arguments > (suggested by Jan Beulich), > - use cmovcc if possible, > - add .L to multiboot2_header_end label > (suggested by Jan Beulich), > - add .L to multiboot2_proto label > (suggested by Jan Beulich), > - improve label names > (suggested by Jan Beulich). > > v3 - suggestions/fixes: > - reorder reloc() arguments > (suggested by Jan Beulich), > - remove .L from multiboot2 header labels > (suggested by Andrew Cooper, Jan Beulich and Konrad Rzeszutek Wilk), > - take into account alignment when skipping multiboot2 fixed part > (suggested by Konrad Rzeszutek Wilk), > - create modules data if modules count != 0 > (suggested by Jan Beulich), > - improve macros > (suggested by Jan Beulich), > - reduce number of casts > (suggested by Jan Beulich), > - use const if possible > (suggested by Jan Beulich), > - drop static and __used__ attribute from reloc() > (suggested by Jan Beulich), > - remove isolated/stray __packed attribute from > multiboot2_memory_map_t type definition > (suggested by Jan Beulich), > - reformat xen/include/xen/multiboot2.h > (suggested by Konrad Rzeszutek Wilk), > - improve comments > (suggested by Konrad Rzeszutek Wilk), > - remove hard tabs > (suggested by Jan Beulich and Konrad Rzeszutek Wilk). > > v2 - suggestions/fixes: > - generate multiboot2 header using macros > (suggested by Jan Beulich), > - improve comments > (suggested by Jan Beulich), > - simplify assembly in xen/arch/x86/boot/head.S > (suggested by Jan Beulich), > - do not include include/xen/compiler.h > in xen/arch/x86/boot/reloc.c > (suggested by Jan Beulich), > - do not read data beyond the end of multiboot2 information > (suggested by Jan Beulich). > > v2 - not fixed yet: > - dynamic dependency generation for xen/arch/x86/boot/reloc.S; > this requires more work; I am not sure that it pays because > potential patch requires more changes than addition of just > multiboot2.h to Makefile > (suggested by Jan Beulich), > - isolated/stray __packed attribute usage for multiboot2_memory_map_t > (suggested by Jan Beulich). > --- > xen/arch/x86/boot/Makefile | 3 +- > xen/arch/x86/boot/head.S | 107 ++++++++++++++++++++++- > xen/arch/x86/boot/reloc.c | 148 ++++++++++++++++++++++++++++++-- > xen/arch/x86/x86_64/asm-offsets.c | 9 ++ > xen/include/xen/multiboot2.h | 169 +++++++++++++++++++++++++++++++++++++ > 5 files changed, 426 insertions(+), 10 deletions(-) > create mode 100644 xen/include/xen/multiboot2.h > > diff --git a/xen/arch/x86/boot/Makefile b/xen/arch/x86/boot/Makefile > index 5fdb5ae..06893d8 100644 > --- a/xen/arch/x86/boot/Makefile > +++ b/xen/arch/x86/boot/Makefile > @@ -1,6 +1,7 @@ > obj-bin-y += head.o > > -RELOC_DEPS = $(BASEDIR)/include/asm-x86/config.h $(BASEDIR)/include/xen/multiboot.h > +RELOC_DEPS = $(BASEDIR)/include/asm-x86/config.h $(BASEDIR)/include/xen/multiboot.h \ > + $(BASEDIR)/include/xen/multiboot2.h > > head.o: reloc.S > > diff --git a/xen/arch/x86/boot/head.S b/xen/arch/x86/boot/head.S > index 6f2c668..d423fd8 100644 > --- a/xen/arch/x86/boot/head.S > +++ b/xen/arch/x86/boot/head.S > @@ -1,5 +1,6 @@ > #include <xen/config.h> > #include <xen/multiboot.h> > +#include <xen/multiboot2.h> > #include <public/xen.h> > #include <asm/asm_defns.h> > #include <asm/desc.h> > @@ -19,6 +20,28 @@ > #define BOOT_PSEUDORM_CS 0x0020 > #define BOOT_PSEUDORM_DS 0x0028 > > +#define MB2_HT(name) (MULTIBOOT2_HEADER_TAG_##name) > +#define MB2_TT(name) (MULTIBOOT2_TAG_TYPE_##name) > + > + .macro mb2ht_args arg:req, args:vararg > + .long \arg > + .ifnb \args > + mb2ht_args \args > + .endif > + .endm > + > + .macro mb2ht_init type:req, req:req, args:vararg > + .align MULTIBOOT2_TAG_ALIGN > +.Lmb2ht_init_start\@: > + .short \type > + .short \req > + .long .Lmb2ht_init_end\@ - .Lmb2ht_init_start\@ > + .ifnb \args > + mb2ht_args \args > + .endif > +.Lmb2ht_init_end\@: > + .endm > + > ENTRY(start) > jmp __start > > @@ -34,6 +57,42 @@ multiboot1_header_start: /*** MULTIBOOT1 HEADER ****/ > .long -(MULTIBOOT_HEADER_MAGIC + MULTIBOOT_HEADER_FLAGS) > multiboot1_header_end: > > +/*** MULTIBOOT2 HEADER ****/ > +/* Some ideas are taken from grub-2.00/grub-core/tests/boot/kernel-i386.S file. */ > + .align MULTIBOOT2_HEADER_ALIGN > + > +multiboot2_header_start: > + /* Magic number indicating a Multiboot2 header. */ > + .long MULTIBOOT2_HEADER_MAGIC > + /* Architecture: i386. */ > + .long MULTIBOOT2_ARCHITECTURE_I386 > + /* Multiboot2 header length. */ > + .long .Lmultiboot2_header_end - multiboot2_header_start > + /* Multiboot2 header checksum. */ > + .long -(MULTIBOOT2_HEADER_MAGIC + MULTIBOOT2_ARCHITECTURE_I386 + \ > + (.Lmultiboot2_header_end - multiboot2_header_start)) > + > + /* Multiboot2 information request tag. */ > + mb2ht_init MB2_HT(INFORMATION_REQUEST), MB2_HT(REQUIRED), \ > + MB2_TT(BASIC_MEMINFO), MB2_TT(MMAP) > + > + /* Align modules at page boundry. */ > + mb2ht_init MB2_HT(MODULE_ALIGN), MB2_HT(REQUIRED) > + > + /* Console flags tag. */ > + mb2ht_init MB2_HT(CONSOLE_FLAGS), MB2_HT(OPTIONAL), \ > + MULTIBOOT2_CONSOLE_FLAGS_EGA_TEXT_SUPPORTED > + > + /* Framebuffer tag. */ > + mb2ht_init MB2_HT(FRAMEBUFFER), MB2_HT(OPTIONAL), \ > + 0, /* Number of the columns - no preference. */ \ > + 0, /* Number of the lines - no preference. */ \ > + 0 /* Number of bits per pixel - no preference. */ > + > + /* Multiboot2 header end tag. */ > + mb2ht_init MB2_HT(END), MB2_HT(REQUIRED) > +.Lmultiboot2_header_end: > + > .section .init.rodata, "a", @progbits > .align 4 > > @@ -82,10 +141,52 @@ __start: > mov %ecx,%es > mov %ecx,%ss > > - /* Check for Multiboot bootloader */ > + /* Bootloaders may set multiboot{1,2}.mem_lower to a nonzero value. */ > + xor %edx,%edx > + > + /* Check for Multiboot2 bootloader. */ > + cmp $MULTIBOOT2_BOOTLOADER_MAGIC,%eax > + je .Lmultiboot2_proto > + > + /* Check for Multiboot bootloader. */ > cmp $MULTIBOOT_BOOTLOADER_MAGIC,%eax > jne not_multiboot > > + /* Get mem_lower from Multiboot information. */ > + testb $MBI_MEMLIMITS,MB_flags(%ebx) > + > + /* Not available? BDA value will be fine. */ > + cmovnz MB_mem_lower(%ebx),%edx > + jmp trampoline_setup > + > +.Lmultiboot2_proto: > + /* Skip Multiboot2 information fixed part. */ > + lea (MB2_fixed_sizeof+MULTIBOOT2_TAG_ALIGN-1)(%ebx),%ecx > + and $~(MULTIBOOT2_TAG_ALIGN-1),%ecx > + > +.Lmb2_tsize: > + /* Check Multiboot2 information total size. */ > + mov %ecx,%edi > + sub %ebx,%edi > + cmp %edi,MB2_fixed_total_size(%ebx) > + jbe trampoline_setup > + > + /* Get mem_lower from Multiboot2 information. */ > + cmpl $MULTIBOOT2_TAG_TYPE_BASIC_MEMINFO,MB2_tag_type(%ecx) > + cmove MB2_mem_lower(%ecx),%edx > + je trampoline_setup > + > + /* Is it the end of Multiboot2 information? */ > + cmpl $MULTIBOOT2_TAG_TYPE_END,MB2_tag_type(%ecx) > + je trampoline_setup > + > + /* Go to next Multiboot2 information tag. */ > + add MB2_tag_size(%ecx),%ecx > + add $(MULTIBOOT2_TAG_ALIGN-1),%ecx > + and $~(MULTIBOOT2_TAG_ALIGN-1),%ecx > + jmp .Lmb2_tsize > + > +trampoline_setup: > /* Set up trampoline segment 64k below EBDA */ > movzwl 0x40e,%ecx /* EBDA segment */ > cmp $0xa000,%ecx /* sanity check (high) */ > @@ -100,9 +201,6 @@ __start: > * Compare the value in the BDA with the information from the > * multiboot structure (if available) and use the smallest. > */ > - testb $MBI_MEMLIMITS,(%ebx) > - jz 2f /* not available? BDA value will be fine */ > - mov MB_mem_lower(%ebx),%edx > cmp $0x100,%edx /* is the multiboot value too small? */ > jb 2f /* if so, do not use it */ > shl $10-4,%edx > @@ -121,6 +219,7 @@ __start: > mov $sym_phys(cpu0_stack)+1024,%esp > push %ecx /* Boot trampoline address. */ > push %ebx /* Multiboot information address. */ > + push %eax /* Multiboot magic. */ > call reloc > mov %eax,sym_phys(multiboot_ptr) > > diff --git a/xen/arch/x86/boot/reloc.c b/xen/arch/x86/boot/reloc.c > index ea8cb37..b22bf1e 100644 > --- a/xen/arch/x86/boot/reloc.c > +++ b/xen/arch/x86/boot/reloc.c > @@ -5,15 +5,18 @@ > * and modules. This is most easily done early with paging disabled. > * > * Copyright (c) 2009, Citrix Systems, Inc. > + * Copyright (c) 2013-2016 Oracle and/or its affiliates. All rights reserved. > * > * Authors: > * Keir Fraser <keir@xen.org> > + * Daniel Kiper <daniel.kiper@oracle.com> > */ > > /* > * This entry point is entered from xen/arch/x86/boot/head.S with: > - * - 0x4(%esp) = MULTIBOOT_INFORMATION_ADDRESS, > - * - 0x8(%esp) = BOOT_TRAMPOLINE_ADDRESS. > + * - 0x4(%esp) = MULTIBOOT_MAGIC, > + * - 0x8(%esp) = MULTIBOOT_INFORMATION_ADDRESS, > + * - 0xc(%esp) = BOOT_TRAMPOLINE_ADDRESS. > */ > asm ( > " .text \n" > @@ -23,7 +26,12 @@ asm ( > ); > > typedef unsigned int u32; > +typedef unsigned long long u64; > + > #include "../../../include/xen/multiboot.h" > +#include "../../../include/xen/multiboot2.h" > + > +#define NULL ((void *)0) > > #define __stdcall __attribute__((__stdcall__)) > > @@ -32,6 +40,9 @@ typedef unsigned int u32; > > #define _p(val) ((void *)(unsigned long)(val)) > > +#define get_mb2_data(tag, type, member) (((multiboot2_tag_##type##_t *)(tag))->member) > +#define get_mb2_string(tag, type, member) ((u32)get_mb2_data(tag, type, member)) > + > static u32 alloc; > > static u32 alloc_mem(u32 bytes) > @@ -39,6 +50,12 @@ static u32 alloc_mem(u32 bytes) > return alloc -= ALIGN_UP(bytes, 16); > } > > +static void zero_mem(u32 s, u32 bytes) > +{ > + while ( bytes-- ) > + *(char *)s++ = 0; > +} > + > static u32 copy_mem(u32 src, u32 bytes) > { > u32 dst, dst_ret; > @@ -65,13 +82,11 @@ static u32 copy_string(u32 src) > return copy_mem(src, p - src + 1); > } > > -multiboot_info_t __stdcall *reloc(u32 mbi_in, u32 trampoline) > +static multiboot_info_t *mbi_reloc(u32 mbi_in) > { > int i; > multiboot_info_t *mbi_out; > > - alloc = trampoline; > - > mbi_out = _p(copy_mem(mbi_in, sizeof(*mbi_out))); > > if ( mbi_out->flags & MBI_CMDLINE ) > @@ -108,3 +123,126 @@ multiboot_info_t __stdcall *reloc(u32 mbi_in, u32 trampoline) > > return mbi_out; > } > + > +static multiboot_info_t *mbi2_reloc(u32 mbi_in) > +{ > + const multiboot2_fixed_t *mbi_fix = _p(mbi_in); > + const multiboot2_memory_map_t *mmap_src; > + const multiboot2_tag_t *tag; > + module_t *mbi_out_mods = NULL; > + memory_map_t *mmap_dst; > + multiboot_info_t *mbi_out; > + u32 ptr; > + unsigned int i, mod_idx = 0; > + > + ptr = alloc_mem(sizeof(*mbi_out)); > + mbi_out = _p(ptr); > + zero_mem(ptr, sizeof(*mbi_out)); > + > + /* Skip Multiboot2 information fixed part. */ > + ptr = ALIGN_UP(mbi_in + sizeof(*mbi_fix), MULTIBOOT2_TAG_ALIGN); > + > + /* Get the number of modules. */ > + for ( tag = _p(ptr); (u32)tag - mbi_in < mbi_fix->total_size; > + tag = _p(ALIGN_UP((u32)tag + tag->size, MULTIBOOT2_TAG_ALIGN)) ) > + { > + if ( tag->type == MULTIBOOT2_TAG_TYPE_MODULE ) > + ++mbi_out->mods_count; > + else if ( tag->type == MULTIBOOT2_TAG_TYPE_END ) > + break; > + } > + > + if ( mbi_out->mods_count ) > + { > + mbi_out->flags |= MBI_MODULES; > + mbi_out->mods_addr = alloc_mem(mbi_out->mods_count * sizeof(*mbi_out_mods)); > + mbi_out_mods = _p(mbi_out->mods_addr); > + } > + > + /* Skip Multiboot2 information fixed part. */ > + ptr = ALIGN_UP(mbi_in + sizeof(*mbi_fix), MULTIBOOT2_TAG_ALIGN); > + > + /* Put all needed data into mbi_out. */ > + for ( tag = _p(ptr); (u32)tag - mbi_in < mbi_fix->total_size; > + tag = _p(ALIGN_UP((u32)tag + tag->size, MULTIBOOT2_TAG_ALIGN)) ) > + switch ( tag->type ) > + { > + case MULTIBOOT2_TAG_TYPE_BOOT_LOADER_NAME: > + mbi_out->flags |= MBI_LOADERNAME; > + ptr = get_mb2_string(tag, string, string); > + mbi_out->boot_loader_name = copy_string(ptr); > + break; > + > + case MULTIBOOT2_TAG_TYPE_CMDLINE: > + mbi_out->flags |= MBI_CMDLINE; > + ptr = get_mb2_string(tag, string, string); > + mbi_out->cmdline = copy_string(ptr); > + break; > + > + case MULTIBOOT2_TAG_TYPE_BASIC_MEMINFO: > + mbi_out->flags |= MBI_MEMLIMITS; > + mbi_out->mem_lower = get_mb2_data(tag, basic_meminfo, mem_lower); > + mbi_out->mem_upper = get_mb2_data(tag, basic_meminfo, mem_upper); > + break; > + > + case MULTIBOOT2_TAG_TYPE_MMAP: > + if ( get_mb2_data(tag, mmap, entry_size) < sizeof(*mmap_src) ) > + break; > + > + mbi_out->flags |= MBI_MEMMAP; > + mbi_out->mmap_length = get_mb2_data(tag, mmap, size); > + mbi_out->mmap_length -= sizeof(multiboot2_tag_mmap_t); > + mbi_out->mmap_length /= get_mb2_data(tag, mmap, entry_size); > + mbi_out->mmap_length *= sizeof(*mmap_dst); > + > + mbi_out->mmap_addr = alloc_mem(mbi_out->mmap_length); > + > + mmap_src = get_mb2_data(tag, mmap, entries); > + mmap_dst = _p(mbi_out->mmap_addr); > + > + for ( i = 0; i < mbi_out->mmap_length / sizeof(*mmap_dst); i++ ) > + { > + /* Init size member properly. */ > + mmap_dst[i].size = sizeof(*mmap_dst); > + mmap_dst[i].size -= sizeof(mmap_dst[i].size); > + /* Now copy a given region data. */ > + mmap_dst[i].base_addr_low = (u32)mmap_src->addr; > + mmap_dst[i].base_addr_high = (u32)(mmap_src->addr >> 32); > + mmap_dst[i].length_low = (u32)mmap_src->len; > + mmap_dst[i].length_high = (u32)(mmap_src->len >> 32); > + mmap_dst[i].type = mmap_src->type; > + mmap_src = _p(mmap_src) + get_mb2_data(tag, mmap, entry_size); > + } > + break; > + > + case MULTIBOOT2_TAG_TYPE_MODULE: > + if ( mod_idx >= mbi_out->mods_count ) > + break; > + > + mbi_out_mods[mod_idx].mod_start = get_mb2_data(tag, module, mod_start); > + mbi_out_mods[mod_idx].mod_end = get_mb2_data(tag, module, mod_end); > + ptr = get_mb2_string(tag, module, cmdline); > + mbi_out_mods[mod_idx].string = copy_string(ptr); > + mbi_out_mods[mod_idx].reserved = 0; > + ++mod_idx; > + break; > + > + case MULTIBOOT2_TAG_TYPE_END: > + return mbi_out; > + > + default: > + break; > + } > + > + return mbi_out; > +} > + > +multiboot_info_t __stdcall *reloc(u32 mb_magic, u32 mbi_in, u32 trampoline) > +{ > + alloc = trampoline; > + > + if ( mb_magic == MULTIBOOT2_BOOTLOADER_MAGIC ) > + return mbi2_reloc(mbi_in); > + else > + return mbi_reloc(mbi_in); > +} > diff --git a/xen/arch/x86/x86_64/asm-offsets.c b/xen/arch/x86/x86_64/asm-offsets.c > index 64905c6..b437a8f 100644 > --- a/xen/arch/x86/x86_64/asm-offsets.c > +++ b/xen/arch/x86/x86_64/asm-offsets.c > @@ -13,6 +13,7 @@ > #include <asm/fixmap.h> > #include <asm/hardirq.h> > #include <xen/multiboot.h> > +#include <xen/multiboot2.h> > > #define DEFINE(_sym, _val) \ > asm volatile ("\n.ascii\"==>#define " #_sym " %0 /* " #_val " */<==\"" \ > @@ -167,6 +168,14 @@ void __dummy__(void) > OFFSET(MB_flags, multiboot_info_t, flags); > OFFSET(MB_cmdline, multiboot_info_t, cmdline); > OFFSET(MB_mem_lower, multiboot_info_t, mem_lower); > + BLANK(); > + > + DEFINE(MB2_fixed_sizeof, sizeof(multiboot2_fixed_t)); > + OFFSET(MB2_fixed_total_size, multiboot2_fixed_t, total_size); > + OFFSET(MB2_tag_type, multiboot2_tag_t, type); > + OFFSET(MB2_tag_size, multiboot2_tag_t, size); > + OFFSET(MB2_mem_lower, multiboot2_tag_basic_meminfo_t, mem_lower); > + BLANK(); > > OFFSET(DOMAIN_vm_assist, struct domain, vm_assist); > } > diff --git a/xen/include/xen/multiboot2.h b/xen/include/xen/multiboot2.h > new file mode 100644 > index 0000000..8dd5800 > --- /dev/null > +++ b/xen/include/xen/multiboot2.h > @@ -0,0 +1,169 @@ > +/* > + * Copyright (C) 1999,2003,2007,2008,2009,2010 Free Software Foundation, Inc. > + * > + * multiboot2.h - Multiboot 2 header file. > + * > + * Based on grub-2.00/include/multiboot2.h file. > + * > + * Permission is hereby granted, free of charge, to any person obtaining a copy > + * of this software and associated documentation files (the "Software"), to > + * deal in the Software without restriction, including without limitation the > + * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or > + * sell copies of the Software, and to permit persons to whom the Software is > + * furnished to do so, subject to the following conditions: > + * > + * The above copyright notice and this permission notice shall be included in > + * all copies or substantial portions of the Software. > + * > + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR > + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, > + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL ANY > + * DEVELOPER OR DISTRIBUTOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, > + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR > + * IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. > + */ > + > +#ifndef __MULTIBOOT2_H__ > +#define __MULTIBOOT2_H__ > + > +/* The magic field should contain this. */ > +#define MULTIBOOT2_HEADER_MAGIC 0xe85250d6 > + > +/* This should be in %eax on x86 architecture. */ > +#define MULTIBOOT2_BOOTLOADER_MAGIC 0x36d76289 > + > +/* How many bytes from the start of the file we search for the header. */ > +#define MULTIBOOT2_SEARCH 32768 > + > +/* Multiboot 2 header alignment. */ > +#define MULTIBOOT2_HEADER_ALIGN 8 > + > +/* Alignment of multiboot 2 modules. */ > +#define MULTIBOOT2_MOD_ALIGN 0x00001000 > + > +/* Alignment of the multiboot 2 info structure. */ > +#define MULTIBOOT2_INFO_ALIGN 0x00000008 > + > +/* Multiboot 2 architectures. */ > +#define MULTIBOOT2_ARCHITECTURE_I386 0 > +#define MULTIBOOT2_ARCHITECTURE_MIPS32 4 > + > +/* Header tag types. */ > +#define MULTIBOOT2_HEADER_TAG_END 0 > +#define MULTIBOOT2_HEADER_TAG_INFORMATION_REQUEST 1 > +#define MULTIBOOT2_HEADER_TAG_ADDRESS 2 > +#define MULTIBOOT2_HEADER_TAG_ENTRY_ADDRESS 3 > +#define MULTIBOOT2_HEADER_TAG_CONSOLE_FLAGS 4 > +#define MULTIBOOT2_HEADER_TAG_FRAMEBUFFER 5 > +#define MULTIBOOT2_HEADER_TAG_MODULE_ALIGN 6 > +#define MULTIBOOT2_HEADER_TAG_EFI_BS 7 > +#define MULTIBOOT2_HEADER_TAG_ENTRY_ADDRESS_EFI32 8 > +#define MULTIBOOT2_HEADER_TAG_ENTRY_ADDRESS_EFI64 9 > + > +/* Header tag flags. */ > +#define MULTIBOOT2_HEADER_TAG_REQUIRED 0 > +#define MULTIBOOT2_HEADER_TAG_OPTIONAL 1 > + > +/* Header console tag console_flags. */ > +#define MULTIBOOT2_CONSOLE_FLAGS_CONSOLE_REQUIRED 1 > +#define MULTIBOOT2_CONSOLE_FLAGS_EGA_TEXT_SUPPORTED 2 > + > +/* Flags set in the 'flags' member of the multiboot header. */ > +#define MULTIBOOT2_TAG_TYPE_END 0 > +#define MULTIBOOT2_TAG_TYPE_CMDLINE 1 > +#define MULTIBOOT2_TAG_TYPE_BOOT_LOADER_NAME 2 > +#define MULTIBOOT2_TAG_TYPE_MODULE 3 > +#define MULTIBOOT2_TAG_TYPE_BASIC_MEMINFO 4 > +#define MULTIBOOT2_TAG_TYPE_BOOTDEV 5 > +#define MULTIBOOT2_TAG_TYPE_MMAP 6 > +#define MULTIBOOT2_TAG_TYPE_VBE 7 > +#define MULTIBOOT2_TAG_TYPE_FRAMEBUFFER 8 > +#define MULTIBOOT2_TAG_TYPE_ELF_SECTIONS 9 > +#define MULTIBOOT2_TAG_TYPE_APM 10 Nitpicky but it would be nice if these lined up. > +#define MULTIBOOT2_TAG_TYPE_EFI32 11 > +#define MULTIBOOT2_TAG_TYPE_EFI64 12 > +#define MULTIBOOT2_TAG_TYPE_SMBIOS 13 > +#define MULTIBOOT2_TAG_TYPE_ACPI_OLD 14 > +#define MULTIBOOT2_TAG_TYPE_ACPI_NEW 15 > +#define MULTIBOOT2_TAG_TYPE_NETWORK 16 > +#define MULTIBOOT2_TAG_TYPE_EFI_MMAP 17 > +#define MULTIBOOT2_TAG_TYPE_EFI_BS 18 > +#define MULTIBOOT2_TAG_TYPE_EFI32_IH 19 > +#define MULTIBOOT2_TAG_TYPE_EFI64_IH 20 > + > +/* Multiboot 2 tag alignment. */ > +#define MULTIBOOT2_TAG_ALIGN 8 > + > +/* Memory types. */ > +#define MULTIBOOT2_MEMORY_AVAILABLE 1 > +#define MULTIBOOT2_MEMORY_RESERVED 2 > +#define MULTIBOOT2_MEMORY_ACPI_RECLAIMABLE 3 > +#define MULTIBOOT2_MEMORY_NVS 4 > +#define MULTIBOOT2_MEMORY_BADRAM 5 > + > +/* Framebuffer types. */ > +#define MULTIBOOT2_FRAMEBUFFER_TYPE_INDEXED 0 > +#define MULTIBOOT2_FRAMEBUFFER_TYPE_RGB 1 > +#define MULTIBOOT2_FRAMEBUFFER_TYPE_EGA_TEXT 2 > + > +#ifndef __ASSEMBLY__ > +typedef struct { > + u32 total_size; > + u32 reserved; > +} multiboot2_fixed_t; > + > +typedef struct { > + u32 type; > + u32 size; > +} multiboot2_tag_t; > + > +typedef struct { > + u32 type; > + u32 size; > + char string[]; > +} multiboot2_tag_string_t; > + > +typedef struct { > + u32 type; > + u32 size; > + u32 mem_lower; > + u32 mem_upper; > +} multiboot2_tag_basic_meminfo_t; > + > +typedef struct { > + u64 addr; > + u64 len; > + u32 type; > + u32 zero; > +} multiboot2_memory_map_t; > + > +typedef struct { > + u32 type; > + u32 size; > + u32 entry_size; > + u32 entry_version; > + multiboot2_memory_map_t entries[]; > +} multiboot2_tag_mmap_t; > + > +typedef struct { > + u32 type; > + u32 size; > + u64 pointer; > +} multiboot2_tag_efi64_t; > + > +typedef struct { > + u32 type; > + u32 size; > + u64 pointer; > +} multiboot2_tag_efi64_ih_t; > + > +typedef struct { > + u32 type; > + u32 size; > + u32 mod_start; > + u32 mod_end; > + char cmdline[]; > +} multiboot2_tag_module_t; > +#endif /* __ASSEMBLY__ */ > + > +#endif /* __MULTIBOOT2_H__ */ >
>>> On 10.01.17 at 02:21, <cardoe@cardoe.com> wrote: > On 12/5/16 4:25 PM, Daniel Kiper wrote: >> +/* Flags set in the 'flags' member of the multiboot header. */ >> +#define MULTIBOOT2_TAG_TYPE_END 0 >> +#define MULTIBOOT2_TAG_TYPE_CMDLINE 1 >> +#define MULTIBOOT2_TAG_TYPE_BOOT_LOADER_NAME 2 >> +#define MULTIBOOT2_TAG_TYPE_MODULE 3 >> +#define MULTIBOOT2_TAG_TYPE_BASIC_MEMINFO 4 >> +#define MULTIBOOT2_TAG_TYPE_BOOTDEV 5 >> +#define MULTIBOOT2_TAG_TYPE_MMAP 6 >> +#define MULTIBOOT2_TAG_TYPE_VBE 7 >> +#define MULTIBOOT2_TAG_TYPE_FRAMEBUFFER 8 >> +#define MULTIBOOT2_TAG_TYPE_ELF_SECTIONS 9 >> +#define MULTIBOOT2_TAG_TYPE_APM 10 > > Nitpicky but it would be nice if these lined up. Well, the question is what tab width you expect them to line up with - with tab == 8 spaces they do line up for me. Also - please trim your quotes in replies. Jan
On 1/10/17 2:38 AM, Jan Beulich wrote: >>>> On 10.01.17 at 02:21, <cardoe@cardoe.com> wrote: >> On 12/5/16 4:25 PM, Daniel Kiper wrote: >>> +/* Flags set in the 'flags' member of the multiboot header. */ >>> +#define MULTIBOOT2_TAG_TYPE_END 0 >>> +#define MULTIBOOT2_TAG_TYPE_CMDLINE 1 >>> +#define MULTIBOOT2_TAG_TYPE_BOOT_LOADER_NAME 2 >>> +#define MULTIBOOT2_TAG_TYPE_MODULE 3 >>> +#define MULTIBOOT2_TAG_TYPE_BASIC_MEMINFO 4 >>> +#define MULTIBOOT2_TAG_TYPE_BOOTDEV 5 >>> +#define MULTIBOOT2_TAG_TYPE_MMAP 6 >>> +#define MULTIBOOT2_TAG_TYPE_VBE 7 >>> +#define MULTIBOOT2_TAG_TYPE_FRAMEBUFFER 8 >>> +#define MULTIBOOT2_TAG_TYPE_ELF_SECTIONS 9 >>> +#define MULTIBOOT2_TAG_TYPE_APM 10 >> >> Nitpicky but it would be nice if these lined up. > > Well, the question is what tab width you expect them to line up > with - with tab == 8 spaces they do line up for me. > > Also - please trim your quotes in replies. > > Jan > Well given that this is a new file and CODING_STYLE says spaces over tabs and to treat indent level as 4 spaces. That was what my assumption was.
diff --git a/xen/arch/x86/boot/Makefile b/xen/arch/x86/boot/Makefile index 5fdb5ae..06893d8 100644 --- a/xen/arch/x86/boot/Makefile +++ b/xen/arch/x86/boot/Makefile @@ -1,6 +1,7 @@ obj-bin-y += head.o -RELOC_DEPS = $(BASEDIR)/include/asm-x86/config.h $(BASEDIR)/include/xen/multiboot.h +RELOC_DEPS = $(BASEDIR)/include/asm-x86/config.h $(BASEDIR)/include/xen/multiboot.h \ + $(BASEDIR)/include/xen/multiboot2.h head.o: reloc.S diff --git a/xen/arch/x86/boot/head.S b/xen/arch/x86/boot/head.S index 6f2c668..d423fd8 100644 --- a/xen/arch/x86/boot/head.S +++ b/xen/arch/x86/boot/head.S @@ -1,5 +1,6 @@ #include <xen/config.h> #include <xen/multiboot.h> +#include <xen/multiboot2.h> #include <public/xen.h> #include <asm/asm_defns.h> #include <asm/desc.h> @@ -19,6 +20,28 @@ #define BOOT_PSEUDORM_CS 0x0020 #define BOOT_PSEUDORM_DS 0x0028 +#define MB2_HT(name) (MULTIBOOT2_HEADER_TAG_##name) +#define MB2_TT(name) (MULTIBOOT2_TAG_TYPE_##name) + + .macro mb2ht_args arg:req, args:vararg + .long \arg + .ifnb \args + mb2ht_args \args + .endif + .endm + + .macro mb2ht_init type:req, req:req, args:vararg + .align MULTIBOOT2_TAG_ALIGN +.Lmb2ht_init_start\@: + .short \type + .short \req + .long .Lmb2ht_init_end\@ - .Lmb2ht_init_start\@ + .ifnb \args + mb2ht_args \args + .endif +.Lmb2ht_init_end\@: + .endm + ENTRY(start) jmp __start @@ -34,6 +57,42 @@ multiboot1_header_start: /*** MULTIBOOT1 HEADER ****/ .long -(MULTIBOOT_HEADER_MAGIC + MULTIBOOT_HEADER_FLAGS) multiboot1_header_end: +/*** MULTIBOOT2 HEADER ****/ +/* Some ideas are taken from grub-2.00/grub-core/tests/boot/kernel-i386.S file. */ + .align MULTIBOOT2_HEADER_ALIGN + +multiboot2_header_start: + /* Magic number indicating a Multiboot2 header. */ + .long MULTIBOOT2_HEADER_MAGIC + /* Architecture: i386. */ + .long MULTIBOOT2_ARCHITECTURE_I386 + /* Multiboot2 header length. */ + .long .Lmultiboot2_header_end - multiboot2_header_start + /* Multiboot2 header checksum. */ + .long -(MULTIBOOT2_HEADER_MAGIC + MULTIBOOT2_ARCHITECTURE_I386 + \ + (.Lmultiboot2_header_end - multiboot2_header_start)) + + /* Multiboot2 information request tag. */ + mb2ht_init MB2_HT(INFORMATION_REQUEST), MB2_HT(REQUIRED), \ + MB2_TT(BASIC_MEMINFO), MB2_TT(MMAP) + + /* Align modules at page boundry. */ + mb2ht_init MB2_HT(MODULE_ALIGN), MB2_HT(REQUIRED) + + /* Console flags tag. */ + mb2ht_init MB2_HT(CONSOLE_FLAGS), MB2_HT(OPTIONAL), \ + MULTIBOOT2_CONSOLE_FLAGS_EGA_TEXT_SUPPORTED + + /* Framebuffer tag. */ + mb2ht_init MB2_HT(FRAMEBUFFER), MB2_HT(OPTIONAL), \ + 0, /* Number of the columns - no preference. */ \ + 0, /* Number of the lines - no preference. */ \ + 0 /* Number of bits per pixel - no preference. */ + + /* Multiboot2 header end tag. */ + mb2ht_init MB2_HT(END), MB2_HT(REQUIRED) +.Lmultiboot2_header_end: + .section .init.rodata, "a", @progbits .align 4 @@ -82,10 +141,52 @@ __start: mov %ecx,%es mov %ecx,%ss - /* Check for Multiboot bootloader */ + /* Bootloaders may set multiboot{1,2}.mem_lower to a nonzero value. */ + xor %edx,%edx + + /* Check for Multiboot2 bootloader. */ + cmp $MULTIBOOT2_BOOTLOADER_MAGIC,%eax + je .Lmultiboot2_proto + + /* Check for Multiboot bootloader. */ cmp $MULTIBOOT_BOOTLOADER_MAGIC,%eax jne not_multiboot + /* Get mem_lower from Multiboot information. */ + testb $MBI_MEMLIMITS,MB_flags(%ebx) + + /* Not available? BDA value will be fine. */ + cmovnz MB_mem_lower(%ebx),%edx + jmp trampoline_setup + +.Lmultiboot2_proto: + /* Skip Multiboot2 information fixed part. */ + lea (MB2_fixed_sizeof+MULTIBOOT2_TAG_ALIGN-1)(%ebx),%ecx + and $~(MULTIBOOT2_TAG_ALIGN-1),%ecx + +.Lmb2_tsize: + /* Check Multiboot2 information total size. */ + mov %ecx,%edi + sub %ebx,%edi + cmp %edi,MB2_fixed_total_size(%ebx) + jbe trampoline_setup + + /* Get mem_lower from Multiboot2 information. */ + cmpl $MULTIBOOT2_TAG_TYPE_BASIC_MEMINFO,MB2_tag_type(%ecx) + cmove MB2_mem_lower(%ecx),%edx + je trampoline_setup + + /* Is it the end of Multiboot2 information? */ + cmpl $MULTIBOOT2_TAG_TYPE_END,MB2_tag_type(%ecx) + je trampoline_setup + + /* Go to next Multiboot2 information tag. */ + add MB2_tag_size(%ecx),%ecx + add $(MULTIBOOT2_TAG_ALIGN-1),%ecx + and $~(MULTIBOOT2_TAG_ALIGN-1),%ecx + jmp .Lmb2_tsize + +trampoline_setup: /* Set up trampoline segment 64k below EBDA */ movzwl 0x40e,%ecx /* EBDA segment */ cmp $0xa000,%ecx /* sanity check (high) */ @@ -100,9 +201,6 @@ __start: * Compare the value in the BDA with the information from the * multiboot structure (if available) and use the smallest. */ - testb $MBI_MEMLIMITS,(%ebx) - jz 2f /* not available? BDA value will be fine */ - mov MB_mem_lower(%ebx),%edx cmp $0x100,%edx /* is the multiboot value too small? */ jb 2f /* if so, do not use it */ shl $10-4,%edx @@ -121,6 +219,7 @@ __start: mov $sym_phys(cpu0_stack)+1024,%esp push %ecx /* Boot trampoline address. */ push %ebx /* Multiboot information address. */ + push %eax /* Multiboot magic. */ call reloc mov %eax,sym_phys(multiboot_ptr) diff --git a/xen/arch/x86/boot/reloc.c b/xen/arch/x86/boot/reloc.c index ea8cb37..b22bf1e 100644 --- a/xen/arch/x86/boot/reloc.c +++ b/xen/arch/x86/boot/reloc.c @@ -5,15 +5,18 @@ * and modules. This is most easily done early with paging disabled. * * Copyright (c) 2009, Citrix Systems, Inc. + * Copyright (c) 2013-2016 Oracle and/or its affiliates. All rights reserved. * * Authors: * Keir Fraser <keir@xen.org> + * Daniel Kiper <daniel.kiper@oracle.com> */ /* * This entry point is entered from xen/arch/x86/boot/head.S with: - * - 0x4(%esp) = MULTIBOOT_INFORMATION_ADDRESS, - * - 0x8(%esp) = BOOT_TRAMPOLINE_ADDRESS. + * - 0x4(%esp) = MULTIBOOT_MAGIC, + * - 0x8(%esp) = MULTIBOOT_INFORMATION_ADDRESS, + * - 0xc(%esp) = BOOT_TRAMPOLINE_ADDRESS. */ asm ( " .text \n" @@ -23,7 +26,12 @@ asm ( ); typedef unsigned int u32; +typedef unsigned long long u64; + #include "../../../include/xen/multiboot.h" +#include "../../../include/xen/multiboot2.h" + +#define NULL ((void *)0) #define __stdcall __attribute__((__stdcall__)) @@ -32,6 +40,9 @@ typedef unsigned int u32; #define _p(val) ((void *)(unsigned long)(val)) +#define get_mb2_data(tag, type, member) (((multiboot2_tag_##type##_t *)(tag))->member) +#define get_mb2_string(tag, type, member) ((u32)get_mb2_data(tag, type, member)) + static u32 alloc; static u32 alloc_mem(u32 bytes) @@ -39,6 +50,12 @@ static u32 alloc_mem(u32 bytes) return alloc -= ALIGN_UP(bytes, 16); } +static void zero_mem(u32 s, u32 bytes) +{ + while ( bytes-- ) + *(char *)s++ = 0; +} + static u32 copy_mem(u32 src, u32 bytes) { u32 dst, dst_ret; @@ -65,13 +82,11 @@ static u32 copy_string(u32 src) return copy_mem(src, p - src + 1); } -multiboot_info_t __stdcall *reloc(u32 mbi_in, u32 trampoline) +static multiboot_info_t *mbi_reloc(u32 mbi_in) { int i; multiboot_info_t *mbi_out; - alloc = trampoline; - mbi_out = _p(copy_mem(mbi_in, sizeof(*mbi_out))); if ( mbi_out->flags & MBI_CMDLINE ) @@ -108,3 +123,126 @@ multiboot_info_t __stdcall *reloc(u32 mbi_in, u32 trampoline) return mbi_out; } + +static multiboot_info_t *mbi2_reloc(u32 mbi_in) +{ + const multiboot2_fixed_t *mbi_fix = _p(mbi_in); + const multiboot2_memory_map_t *mmap_src; + const multiboot2_tag_t *tag; + module_t *mbi_out_mods = NULL; + memory_map_t *mmap_dst; + multiboot_info_t *mbi_out; + u32 ptr; + unsigned int i, mod_idx = 0; + + ptr = alloc_mem(sizeof(*mbi_out)); + mbi_out = _p(ptr); + zero_mem(ptr, sizeof(*mbi_out)); + + /* Skip Multiboot2 information fixed part. */ + ptr = ALIGN_UP(mbi_in + sizeof(*mbi_fix), MULTIBOOT2_TAG_ALIGN); + + /* Get the number of modules. */ + for ( tag = _p(ptr); (u32)tag - mbi_in < mbi_fix->total_size; + tag = _p(ALIGN_UP((u32)tag + tag->size, MULTIBOOT2_TAG_ALIGN)) ) + { + if ( tag->type == MULTIBOOT2_TAG_TYPE_MODULE ) + ++mbi_out->mods_count; + else if ( tag->type == MULTIBOOT2_TAG_TYPE_END ) + break; + } + + if ( mbi_out->mods_count ) + { + mbi_out->flags |= MBI_MODULES; + mbi_out->mods_addr = alloc_mem(mbi_out->mods_count * sizeof(*mbi_out_mods)); + mbi_out_mods = _p(mbi_out->mods_addr); + } + + /* Skip Multiboot2 information fixed part. */ + ptr = ALIGN_UP(mbi_in + sizeof(*mbi_fix), MULTIBOOT2_TAG_ALIGN); + + /* Put all needed data into mbi_out. */ + for ( tag = _p(ptr); (u32)tag - mbi_in < mbi_fix->total_size; + tag = _p(ALIGN_UP((u32)tag + tag->size, MULTIBOOT2_TAG_ALIGN)) ) + switch ( tag->type ) + { + case MULTIBOOT2_TAG_TYPE_BOOT_LOADER_NAME: + mbi_out->flags |= MBI_LOADERNAME; + ptr = get_mb2_string(tag, string, string); + mbi_out->boot_loader_name = copy_string(ptr); + break; + + case MULTIBOOT2_TAG_TYPE_CMDLINE: + mbi_out->flags |= MBI_CMDLINE; + ptr = get_mb2_string(tag, string, string); + mbi_out->cmdline = copy_string(ptr); + break; + + case MULTIBOOT2_TAG_TYPE_BASIC_MEMINFO: + mbi_out->flags |= MBI_MEMLIMITS; + mbi_out->mem_lower = get_mb2_data(tag, basic_meminfo, mem_lower); + mbi_out->mem_upper = get_mb2_data(tag, basic_meminfo, mem_upper); + break; + + case MULTIBOOT2_TAG_TYPE_MMAP: + if ( get_mb2_data(tag, mmap, entry_size) < sizeof(*mmap_src) ) + break; + + mbi_out->flags |= MBI_MEMMAP; + mbi_out->mmap_length = get_mb2_data(tag, mmap, size); + mbi_out->mmap_length -= sizeof(multiboot2_tag_mmap_t); + mbi_out->mmap_length /= get_mb2_data(tag, mmap, entry_size); + mbi_out->mmap_length *= sizeof(*mmap_dst); + + mbi_out->mmap_addr = alloc_mem(mbi_out->mmap_length); + + mmap_src = get_mb2_data(tag, mmap, entries); + mmap_dst = _p(mbi_out->mmap_addr); + + for ( i = 0; i < mbi_out->mmap_length / sizeof(*mmap_dst); i++ ) + { + /* Init size member properly. */ + mmap_dst[i].size = sizeof(*mmap_dst); + mmap_dst[i].size -= sizeof(mmap_dst[i].size); + /* Now copy a given region data. */ + mmap_dst[i].base_addr_low = (u32)mmap_src->addr; + mmap_dst[i].base_addr_high = (u32)(mmap_src->addr >> 32); + mmap_dst[i].length_low = (u32)mmap_src->len; + mmap_dst[i].length_high = (u32)(mmap_src->len >> 32); + mmap_dst[i].type = mmap_src->type; + mmap_src = _p(mmap_src) + get_mb2_data(tag, mmap, entry_size); + } + break; + + case MULTIBOOT2_TAG_TYPE_MODULE: + if ( mod_idx >= mbi_out->mods_count ) + break; + + mbi_out_mods[mod_idx].mod_start = get_mb2_data(tag, module, mod_start); + mbi_out_mods[mod_idx].mod_end = get_mb2_data(tag, module, mod_end); + ptr = get_mb2_string(tag, module, cmdline); + mbi_out_mods[mod_idx].string = copy_string(ptr); + mbi_out_mods[mod_idx].reserved = 0; + ++mod_idx; + break; + + case MULTIBOOT2_TAG_TYPE_END: + return mbi_out; + + default: + break; + } + + return mbi_out; +} + +multiboot_info_t __stdcall *reloc(u32 mb_magic, u32 mbi_in, u32 trampoline) +{ + alloc = trampoline; + + if ( mb_magic == MULTIBOOT2_BOOTLOADER_MAGIC ) + return mbi2_reloc(mbi_in); + else + return mbi_reloc(mbi_in); +} diff --git a/xen/arch/x86/x86_64/asm-offsets.c b/xen/arch/x86/x86_64/asm-offsets.c index 64905c6..b437a8f 100644 --- a/xen/arch/x86/x86_64/asm-offsets.c +++ b/xen/arch/x86/x86_64/asm-offsets.c @@ -13,6 +13,7 @@ #include <asm/fixmap.h> #include <asm/hardirq.h> #include <xen/multiboot.h> +#include <xen/multiboot2.h> #define DEFINE(_sym, _val) \ asm volatile ("\n.ascii\"==>#define " #_sym " %0 /* " #_val " */<==\"" \ @@ -167,6 +168,14 @@ void __dummy__(void) OFFSET(MB_flags, multiboot_info_t, flags); OFFSET(MB_cmdline, multiboot_info_t, cmdline); OFFSET(MB_mem_lower, multiboot_info_t, mem_lower); + BLANK(); + + DEFINE(MB2_fixed_sizeof, sizeof(multiboot2_fixed_t)); + OFFSET(MB2_fixed_total_size, multiboot2_fixed_t, total_size); + OFFSET(MB2_tag_type, multiboot2_tag_t, type); + OFFSET(MB2_tag_size, multiboot2_tag_t, size); + OFFSET(MB2_mem_lower, multiboot2_tag_basic_meminfo_t, mem_lower); + BLANK(); OFFSET(DOMAIN_vm_assist, struct domain, vm_assist); } diff --git a/xen/include/xen/multiboot2.h b/xen/include/xen/multiboot2.h new file mode 100644 index 0000000..8dd5800 --- /dev/null +++ b/xen/include/xen/multiboot2.h @@ -0,0 +1,169 @@ +/* + * Copyright (C) 1999,2003,2007,2008,2009,2010 Free Software Foundation, Inc. + * + * multiboot2.h - Multiboot 2 header file. + * + * Based on grub-2.00/include/multiboot2.h file. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to + * deal in the Software without restriction, including without limitation the + * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL ANY + * DEVELOPER OR DISTRIBUTOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR + * IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + +#ifndef __MULTIBOOT2_H__ +#define __MULTIBOOT2_H__ + +/* The magic field should contain this. */ +#define MULTIBOOT2_HEADER_MAGIC 0xe85250d6 + +/* This should be in %eax on x86 architecture. */ +#define MULTIBOOT2_BOOTLOADER_MAGIC 0x36d76289 + +/* How many bytes from the start of the file we search for the header. */ +#define MULTIBOOT2_SEARCH 32768 + +/* Multiboot 2 header alignment. */ +#define MULTIBOOT2_HEADER_ALIGN 8 + +/* Alignment of multiboot 2 modules. */ +#define MULTIBOOT2_MOD_ALIGN 0x00001000 + +/* Alignment of the multiboot 2 info structure. */ +#define MULTIBOOT2_INFO_ALIGN 0x00000008 + +/* Multiboot 2 architectures. */ +#define MULTIBOOT2_ARCHITECTURE_I386 0 +#define MULTIBOOT2_ARCHITECTURE_MIPS32 4 + +/* Header tag types. */ +#define MULTIBOOT2_HEADER_TAG_END 0 +#define MULTIBOOT2_HEADER_TAG_INFORMATION_REQUEST 1 +#define MULTIBOOT2_HEADER_TAG_ADDRESS 2 +#define MULTIBOOT2_HEADER_TAG_ENTRY_ADDRESS 3 +#define MULTIBOOT2_HEADER_TAG_CONSOLE_FLAGS 4 +#define MULTIBOOT2_HEADER_TAG_FRAMEBUFFER 5 +#define MULTIBOOT2_HEADER_TAG_MODULE_ALIGN 6 +#define MULTIBOOT2_HEADER_TAG_EFI_BS 7 +#define MULTIBOOT2_HEADER_TAG_ENTRY_ADDRESS_EFI32 8 +#define MULTIBOOT2_HEADER_TAG_ENTRY_ADDRESS_EFI64 9 + +/* Header tag flags. */ +#define MULTIBOOT2_HEADER_TAG_REQUIRED 0 +#define MULTIBOOT2_HEADER_TAG_OPTIONAL 1 + +/* Header console tag console_flags. */ +#define MULTIBOOT2_CONSOLE_FLAGS_CONSOLE_REQUIRED 1 +#define MULTIBOOT2_CONSOLE_FLAGS_EGA_TEXT_SUPPORTED 2 + +/* Flags set in the 'flags' member of the multiboot header. */ +#define MULTIBOOT2_TAG_TYPE_END 0 +#define MULTIBOOT2_TAG_TYPE_CMDLINE 1 +#define MULTIBOOT2_TAG_TYPE_BOOT_LOADER_NAME 2 +#define MULTIBOOT2_TAG_TYPE_MODULE 3 +#define MULTIBOOT2_TAG_TYPE_BASIC_MEMINFO 4 +#define MULTIBOOT2_TAG_TYPE_BOOTDEV 5 +#define MULTIBOOT2_TAG_TYPE_MMAP 6 +#define MULTIBOOT2_TAG_TYPE_VBE 7 +#define MULTIBOOT2_TAG_TYPE_FRAMEBUFFER 8 +#define MULTIBOOT2_TAG_TYPE_ELF_SECTIONS 9 +#define MULTIBOOT2_TAG_TYPE_APM 10 +#define MULTIBOOT2_TAG_TYPE_EFI32 11 +#define MULTIBOOT2_TAG_TYPE_EFI64 12 +#define MULTIBOOT2_TAG_TYPE_SMBIOS 13 +#define MULTIBOOT2_TAG_TYPE_ACPI_OLD 14 +#define MULTIBOOT2_TAG_TYPE_ACPI_NEW 15 +#define MULTIBOOT2_TAG_TYPE_NETWORK 16 +#define MULTIBOOT2_TAG_TYPE_EFI_MMAP 17 +#define MULTIBOOT2_TAG_TYPE_EFI_BS 18 +#define MULTIBOOT2_TAG_TYPE_EFI32_IH 19 +#define MULTIBOOT2_TAG_TYPE_EFI64_IH 20 + +/* Multiboot 2 tag alignment. */ +#define MULTIBOOT2_TAG_ALIGN 8 + +/* Memory types. */ +#define MULTIBOOT2_MEMORY_AVAILABLE 1 +#define MULTIBOOT2_MEMORY_RESERVED 2 +#define MULTIBOOT2_MEMORY_ACPI_RECLAIMABLE 3 +#define MULTIBOOT2_MEMORY_NVS 4 +#define MULTIBOOT2_MEMORY_BADRAM 5 + +/* Framebuffer types. */ +#define MULTIBOOT2_FRAMEBUFFER_TYPE_INDEXED 0 +#define MULTIBOOT2_FRAMEBUFFER_TYPE_RGB 1 +#define MULTIBOOT2_FRAMEBUFFER_TYPE_EGA_TEXT 2 + +#ifndef __ASSEMBLY__ +typedef struct { + u32 total_size; + u32 reserved; +} multiboot2_fixed_t; + +typedef struct { + u32 type; + u32 size; +} multiboot2_tag_t; + +typedef struct { + u32 type; + u32 size; + char string[]; +} multiboot2_tag_string_t; + +typedef struct { + u32 type; + u32 size; + u32 mem_lower; + u32 mem_upper; +} multiboot2_tag_basic_meminfo_t; + +typedef struct { + u64 addr; + u64 len; + u32 type; + u32 zero; +} multiboot2_memory_map_t; + +typedef struct { + u32 type; + u32 size; + u32 entry_size; + u32 entry_version; + multiboot2_memory_map_t entries[]; +} multiboot2_tag_mmap_t; + +typedef struct { + u32 type; + u32 size; + u64 pointer; +} multiboot2_tag_efi64_t; + +typedef struct { + u32 type; + u32 size; + u64 pointer; +} multiboot2_tag_efi64_ih_t; + +typedef struct { + u32 type; + u32 size; + u32 mod_start; + u32 mod_end; + char cmdline[]; +} multiboot2_tag_module_t; +#endif /* __ASSEMBLY__ */ + +#endif /* __MULTIBOOT2_H__ */