github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-06-22 21:47:22 +00:00
Code Issues Projects Releases Wiki Activity

hv: modularization: multiboot private header

Browse Source 
Create multiboot_pri.h and move the relevant declarations into this
file.

Tracked-On: #5661
Signed-off-by: Vijay Dhanraj <vijay.dhanraj@intel.com>
Reviewed-by: Jason Chen CJ <jason.cj.chen@intel.com>
This commit is contained in:
Liang Yi 2021-01-18 03:28:39 +08:00 committed by wenlingz
parent 0ace40b679
commit 153e83a19e
5 changed files with 103 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
hypervisor/boot/include/boot.h
View File

@ -52,32 +52,6 @@ extern uint32_t boot_regs[2];
extern char *efiloader_sig; extern char *efiloader_sig;
static inline bool boot_from_multiboot1(void)
{
return ((boot_regs[0] == MULTIBOOT_INFO_MAGIC) && (boot_regs[1] != 0U));
}
#ifdef CONFIG_MULTIBOOT2
/*
* @post boot_regs[1] stores the address pointer that point to a valid multiboot2 info
*/
static inline bool boot_from_multiboot2(void)
{
/*
* Multiboot spec states that the Multiboot information structure may be placed
* anywhere in memory by the boot loader.
*
* Seems both SBL and GRUB won't place multiboot1 MBI structure at 0 address,
* but GRUB could place Multiboot2 MBI structure at 0 address until commit
* 0f3f5b7c13fa9b67 ("multiboot2: Set min address for mbi allocation to 0x1000")
* which dates on Dec 26 2019.
*/
return (boot_regs[0] == MULTIBOOT2_INFO_MAGIC);
}
int32_t multiboot2_to_acrn_mbi(struct acrn_multiboot_info *mbi, void *mb2_info);
#endif
/* /*
* The extern declaration for acrn_mbi is for cmdline.c use only, other functions should use * The extern declaration for acrn_mbi is for cmdline.c use only, other functions should use
* get_multiboot_info() API to access struct acrn_mbi because it has explict @post condition * get_multiboot_info() API to access struct acrn_mbi because it has explict @post condition

65
hypervisor/boot/include/multiboot2.h
View File

@ -79,69 +79,4 @@
#define MULTIBOOT2_ARCHITECTURE_I386 0 #define MULTIBOOT2_ARCHITECTURE_I386 0
#define MULTIBOOT2_ARCHITECTURE_MIPS32 4 #define MULTIBOOT2_ARCHITECTURE_MIPS32 4
#ifndef ASSEMBLER
struct multiboot2_mmap_entry
{
uint64_t addr;
uint64_t len;
uint32_t type;
uint32_t zero;
};
struct multiboot2_tag
{
uint32_t type;
uint32_t size;
};
struct multiboot2_tag_string
{
uint32_t type;
uint32_t size;
char string[0];
};
struct multiboot2_tag_module
{
uint32_t type;
uint32_t size;
uint32_t mod_start;
uint32_t mod_end;
char cmdline[0];
};
struct multiboot2_tag_mmap
{
uint32_t type;
uint32_t size;
uint32_t entry_size;
uint32_t entry_version;
struct multiboot2_mmap_entry entries[0];
};
struct multiboot2_tag_new_acpi
{
uint32_t type;
uint32_t size;
uint8_t rsdp[0];
};
struct multiboot2_tag_efi64
{
uint32_t type;
uint32_t size;
uint64_t pointer;
};
struct multiboot2_tag_efi_mmap
{
uint32_t type;
uint32_t size;
uint32_t descr_size;
uint32_t descr_vers;
uint8_t efi_mmap[0];
};
#endif /* ASSEMBLER */
#endif /* MULTIBOOT2_H */ #endif /* MULTIBOOT2_H */

1
hypervisor/boot/multiboot/multiboot.c
View File

@ -10,6 +10,7 @@
#include <boot.h> #include <boot.h>
#include <rtl.h> #include <rtl.h>
#include <logmsg.h> #include <logmsg.h>
#include "multiboot_priv.h"
struct acrn_multiboot_info acrn_mbi = { 0U }; struct acrn_multiboot_info acrn_mbi = { 0U };

1
hypervisor/boot/multiboot/multiboot2.c
View File

@ -8,6 +8,7 @@
#include <errno.h> #include <errno.h>
#include <boot.h> #include <boot.h>
#include <pgtable.h> #include <pgtable.h>
#include "multiboot_priv.h"
/** /**
* @pre mbi != NULL && mb2_tag_mmap != NULL * @pre mbi != NULL && mb2_tag_mmap != NULL

101
hypervisor/boot/multiboot/multiboot_priv.h Normal file
View File

@ -0,0 +1,101 @@
/*
* Copyright (C) 2020 Intel Corporation. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
#ifndef MULTIBOOT_PRIV_H
#define MULTIBOOT_PRIV_H
#ifdef CONFIG_MULTIBOOT2
#include <multiboot2.h>
struct multiboot2_mmap_entry
{
uint64_t addr;
uint64_t len;
uint32_t type;
uint32_t zero;
};
struct multiboot2_tag
{
uint32_t type;
uint32_t size;
};
struct multiboot2_tag_string
{
uint32_t type;
uint32_t size;
char string[0];
};
struct multiboot2_tag_module
{
uint32_t type;
uint32_t size;
uint32_t mod_start;
uint32_t mod_end;
char cmdline[0];
};
struct multiboot2_tag_mmap
{
uint32_t type;
uint32_t size;
uint32_t entry_size;
uint32_t entry_version;
struct multiboot2_mmap_entry entries[0];
};
struct multiboot2_tag_new_acpi
{
uint32_t type;
uint32_t size;
uint8_t rsdp[0];
};
struct multiboot2_tag_efi64
{
uint32_t type;
uint32_t size;
uint64_t pointer;
};
struct multiboot2_tag_efi_mmap
{
uint32_t type;
uint32_t size;
uint32_t descr_size;
uint32_t descr_vers;
uint8_t efi_mmap[0];
};
/*
* @post boot_regs[1] stores the address pointer that point to a valid multiboot2 info
*/
static inline bool boot_from_multiboot2(void)
{
/*
* Multiboot spec states that the Multiboot information structure may be placed
* anywhere in memory by the boot loader.
*
* Seems both SBL and GRUB won't place multiboot1 MBI structure at 0 address,
* but GRUB could place Multiboot2 MBI structure at 0 address until commit
* 0f3f5b7c13fa9b67 ("multiboot2: Set min address for mbi allocation to 0x1000")
* which dates on Dec 26 2019.
*/
return (boot_regs[0] == MULTIBOOT2_INFO_MAGIC);
}
int32_t multiboot2_to_acrn_mbi(struct acrn_multiboot_info *mbi, void *mb2_info);
#endif
static inline bool boot_from_multiboot1(void)
{
return ((boot_regs[0] == MULTIBOOT_INFO_MAGIC) && (boot_regs[1] != 0U));
}
#endif /* MULTIBOOT_PRIV_H */