github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-09-21 08:50:27 +00:00
Code Issues Projects Releases Wiki Activity

Revert "HV: Make AP trampoline code relocatable"

Browse Source 
This reverts commit 31bf2befbf.
This commit is contained in:
lijinxia
2018-05-09 10:28:17 +00:00
committed by Jack Ren
parent 0c5956beb1
commit f8fbdbe7ec
6 changed files with 18 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
hypervisor/include/arch/x86/cpu.h
View File

@@ -157,17 +157,11 @@ int cpu_find_logical_id(uint32_t lapic_id);
/**********************************/
extern const uint8_t _ld_cpu_secondary_reset_load[];
extern uint8_t _ld_cpu_secondary_reset_start[];
extern uint8_t _ld_cpu_secondary_reset_end[];
extern const uint64_t _ld_cpu_secondary_reset_size;
extern uint8_t _ld_bss_start[];
extern uint8_t _ld_bss_end[];
extern uint8_t _ld_cpu_data_start[];
extern uint8_t _ld_cpu_data_start[];
extern uint8_t _ld_cpu_data_end[];
extern uint8_t CPU_Boot_Page_Tables_Start[];
extern uint8_t CPU_Boot_Page_Tables_ptr[];
extern uint8_t cpu_secondary_pdpt_addr[];
extern uint8_t cpu_secondary_gdt_ptr[];
extern uint8_t ap_long_mode_jump_ref[];
extern int ibrs_type;

2
hypervisor/include/common/acrn_efi.h
View File

@@ -39,7 +39,6 @@ typedef struct {
struct efi_ctx {
uint64_t rip;
void *rsdp;
void *ap_trampoline_buf;
dt_addr_t gdt;
dt_addr_t idt;
uint16_t tr_sel;
@@ -75,6 +74,5 @@ struct efi_ctx {
}__attribute__((packed));
void *get_rsdp_from_uefi(void);
void *get_ap_trampoline_buf(void);
#endif /* UEFI_H*/