hv: a few fixes for multiboot2 boot

- need to specify the load_addr in the multiboot2 address tag. GRUB needs
  it to correctly calculate the ACRN binary's load size if load_end_addr is
  a non-zero value.

- multiboot2 can be enabled if hypervisor relocation is disabled.

- print the name of the boot loader. This might be helpful if the boot
  loader, e.g. GRUB, inludes its version in the name string.

Tracked-On: #4441
Signed-off-by: Victor Sun <victor.sun@intel.com>
Signed-off-by: Zide Chen <zide.chen@intel.com>
Reviewed-by: Yin Fengwei <fengwei.yin@intel.com>
This commit is contained in:
Victor Sun
2020-03-11 13:51:48 +08:00
committed by wenlingz
parent e928ca4b3a
commit 52f26cba8a
5 changed files with 14 additions and 4 deletions

View File

@@ -71,13 +71,14 @@ info_req_tag_start:
.long MULTIBOOT2_TAG_TYPE_EFI_MMAP /* EFI memory map, to be passed to guest Linux */
info_req_tag_end:
#ifdef CONFIG_RELOC
.align MULTIBOOT2_TAG_ALIGN
address_tag_start:
.short MULTIBOOT2_HEADER_TAG_ADDRESS
.short 0
.long address_tag_end - address_tag_start
.long mb2_header_start /* address corresponding to the beginning of the Multiboot2 header */
.long -1 /* load_addr: the file to be loaded from its beginning */
.long _ld_ram_start /* load_addr: load from the binary's beginning */
/*
* load_end_addr: this includes .bss so that boot loader could reserve the
* memory that .bss occupies to avoid placing boot modules or other data in that area.
@@ -107,13 +108,14 @@ relocatable_tag_start:
.long 0x200000 /* image alignment */
.long 1 /* preference: lowest possible address */
relocatable_tag_end:
#endif /* CONFIG_RELOC */
.align MULTIBOOT2_TAG_ALIGN
.short MULTIBOOT2_HEADER_TAG_END
.short 0
.long 8
mb2_header_end:
#endif
#endif /* CONFIG_MULTIBOOT2 */
/*
* The page tables are aligned to 4KB, which implicitly aligns this section at