github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-09-23 17:58:30 +00:00
Code Issues Projects Releases Wiki Activity

hv: pgtable: fix 'Use of function like macro'

Browse Source 
Convert HPA2HVA, HVA2HPA, GPA2HVA and HVA2GPA to inline functions.

v1 -> v2:
 * Modify the following statement.
   rsdp = biosacpi_search_rsdp((char *)hpa2hva((uint64_t)(*addr << 4)),
                                                                0x400);
   Instead of "(uint64_t)(*addr << 4)", "(uint64_t)(*addr) << 4U" would
   be clearer.

Tracked-On: #861
Signed-off-by: Shiqing Gao <shiqing.gao@intel.com>
Reviewed-by: Junjie Mao <junjie.mao@intel.com>
This commit is contained in:
Shiqing Gao
2018-09-06 13:50:10 +08:00
committed by lijinxia
parent 6ee9321bd8
commit 97aeb7f4ff
24 changed files with 142 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
hypervisor/boot/acpi.c
View File

@@ -144,15 +144,16 @@ static void *get_rsdp(void)
#endif
/* EBDA is addressed by the 16 bit pointer at 0x40E */
addr = (uint16_t *)HPA2HVA(0x40E);
addr = (uint16_t *)hpa2hva(0x40eUL);
rsdp = biosacpi_search_rsdp((char *)HPA2HVA((uint64_t)(*addr << 4)), 0x400);
rsdp = biosacpi_search_rsdp((char *)hpa2hva((uint64_t)(*addr) << 4U),
0x400);
if (rsdp != NULL) {
return rsdp;
}
/* Check the upper memory BIOS space, 0xe0000 - 0xfffff. */
rsdp = biosacpi_search_rsdp((char *)HPA2HVA(0xe0000), 0x20000);
rsdp = biosacpi_search_rsdp((char *)hpa2hva(0xe0000UL), 0x20000);
if (rsdp != NULL) {
return rsdp;
}
@@ -163,7 +164,7 @@ static void *get_rsdp(void)
static int
probe_table(uint64_t address, const char *sig)
{
void *va = HPA2HVA(address);
void *va = hpa2hva(address);
struct acpi_table_header *table = (struct acpi_table_header *)va;
if (strncmp(table->signature, sig, ACPI_NAME_SIZE) != 0) {
@@ -189,7 +190,8 @@ static void *get_acpi_tbl(const char *sig)
* the version 1.0 portion of the RSDP. Version 2.0 has
* an additional checksum that we verify first.
*/
xsdt = (struct acpi_table_xsdt *)HPA2HVA(rsdp->xsdt_physical_address);
xsdt = (struct acpi_table_xsdt *)
hpa2hva(rsdp->xsdt_physical_address);
count = (xsdt->header.length -
sizeof(struct acpi_table_header)) /
sizeof(uint64_t);
@@ -203,7 +205,7 @@ static void *get_acpi_tbl(const char *sig)
} else {
/* Root table is an RSDT (32-bit physical addresses) */
rsdt = (struct acpi_table_rsdt *)
HPA2HVA((uint64_t)rsdp->rsdt_physical_address);
hpa2hva((uint64_t)rsdp->rsdt_physical_address);
count = (rsdt->header.length -
sizeof(struct acpi_table_header)) /
sizeof(uint32_t);
@@ -216,7 +218,7 @@ static void *get_acpi_tbl(const char *sig)
}
}
return HPA2HVA(addr);
return hpa2hva(addr);
}
static uint16_t local_parse_madt(void *madt, uint8_t lapic_id_array[MAX_PCPU_NUM])

24
hypervisor/boot/reloc.c
View File

@@ -141,7 +141,7 @@ uint64_t read_trampoline_sym(void *sym)
{
uint64_t *hva;
hva = HPA2HVA(trampoline_start16_paddr) + trampoline_relo_addr(sym);
hva = hpa2hva(trampoline_start16_paddr) + trampoline_relo_addr(sym);
return *hva;
}
@@ -149,7 +149,7 @@ void write_trampoline_sym(void *sym, uint64_t val)
{
uint64_t *hva;
hva = HPA2HVA(trampoline_start16_paddr) + trampoline_relo_addr(sym);
hva = hpa2hva(trampoline_start16_paddr) + trampoline_relo_addr(sym);
*hva = val;
}
@@ -168,41 +168,41 @@ static void update_trampoline_code_refs(uint64_t dest_pa)
*/
val = dest_pa + trampoline_relo_addr(&trampoline_fixup_target);
ptr = HPA2HVA(dest_pa + trampoline_relo_addr(&trampoline_fixup_cs));
ptr = hpa2hva(dest_pa + trampoline_relo_addr(&trampoline_fixup_cs));
*(uint16_t *)(ptr) = (uint16_t)((val >> 4) & 0xFFFFU);
ptr = HPA2HVA(dest_pa + trampoline_relo_addr(&trampoline_fixup_ip));
ptr = hpa2hva(dest_pa + trampoline_relo_addr(&trampoline_fixup_ip));
*(uint16_t *)(ptr) = (uint16_t)(val & 0xfU);
/* Update temporary page tables */
ptr = HPA2HVA(dest_pa +
ptr = hpa2hva(dest_pa +
trampoline_relo_addr(&CPU_Boot_Page_Tables_ptr));
*(uint32_t *)(ptr) += (uint32_t)dest_pa;
ptr = HPA2HVA(dest_pa +
ptr = hpa2hva(dest_pa +
trampoline_relo_addr(&CPU_Boot_Page_Tables_Start));
*(uint64_t *)(ptr) += dest_pa;
ptr = HPA2HVA(dest_pa + trampoline_relo_addr(&trampoline_pdpt_addr));
ptr = hpa2hva(dest_pa + trampoline_relo_addr(&trampoline_pdpt_addr));
for (i = 0; i < 4; i++) {
*(uint64_t *)(ptr + sizeof(uint64_t) * i) += dest_pa;
}
/* update the gdt base pointer with relocated offset */
ptr = HPA2HVA(dest_pa + trampoline_relo_addr(&trampoline_gdt_ptr));
ptr = hpa2hva(dest_pa + trampoline_relo_addr(&trampoline_gdt_ptr));
*(uint64_t *)(ptr + 2) += dest_pa;
/* update trampoline jump pointer with relocated offset */
ptr = HPA2HVA(dest_pa +
ptr = hpa2hva(dest_pa +
trampoline_relo_addr(&trampoline_start64_fixup));
*(uint32_t *)ptr += dest_pa;
/* update trampoline's main entry pointer */
ptr = HPA2HVA(dest_pa + trampoline_relo_addr(main_entry));
ptr = hpa2hva(dest_pa + trampoline_relo_addr(main_entry));
*(uint64_t *)ptr += get_hv_image_delta();
/* update trampoline's spinlock pointer */
ptr = HPA2HVA(dest_pa + trampoline_relo_addr(&trampoline_spinlock_ptr));
ptr = hpa2hva(dest_pa + trampoline_relo_addr(&trampoline_spinlock_ptr));
*(uint64_t *)ptr += get_hv_image_delta();
}
@@ -220,7 +220,7 @@ uint64_t prepare_trampoline(void)
pr_dbg("trampoline code: %llx size %x", dest_pa, size);
/* Copy segment for AP initialization code below 1MB */
(void)memcpy_s(HPA2HVA(dest_pa), (size_t)size, &_ld_trampoline_load,
(void)memcpy_s(hpa2hva(dest_pa), (size_t)size, &_ld_trampoline_load,
(size_t)size);
update_trampoline_code_refs(dest_pa);
trampoline_start16_paddr = dest_pa;

33
hypervisor/boot/sbl/multiboot.c
View File

@@ -40,9 +40,9 @@ static void parse_other_modules(struct vm *vm,
for (i = 0U; i < mods_count; i++) {
uint32_t type_len;
const char *start = HPA2HVA((uint64_t)mods[i].mm_string);
const char *start = hpa2hva((uint64_t)mods[i].mm_string);
const char *end;
void *mod_addr = HPA2HVA((uint64_t)mods[i].mm_mod_start);
void *mod_addr = hpa2hva((uint64_t)mods[i].mm_mod_start);
uint32_t mod_size = mods[i].mm_mod_end - mods[i].mm_mod_start;
dev_dbg(ACRN_DBG_BOOT, "other mod-%d start=0x%x, end=0x%x",
@@ -62,7 +62,7 @@ static void parse_other_modules(struct vm *vm,
type_len = end - start;
if (strncmp("FIRMWARE", start, type_len) == 0) {
char dyn_bootargs[100] = {'\0'};
void *load_addr = GPA2HVA(vm,
void *load_addr = gpa2hva(vm,
(uint64_t)vm->sw.linux_info.bootargs_load_addr);
uint32_t args_size = vm->sw.linux_info.bootargs_size;
static int copy_once = 1;
@@ -154,12 +154,12 @@ static void *parse_image_boot_params(struct vm *vm, char *cmdline)
}
param = arg + len;
boot_params = (struct image_boot_params *)HPA2HVA(strtoul_hex(param));
boot_params = (struct image_boot_params *)hpa2hva(strtoul_hex(param));
if (boot_params == NULL) {
goto fail;
}
parse_seed_list((struct seed_list_hob *)HPA2HVA(
parse_seed_list((struct seed_list_hob *)hpa2hva(
boot_params->p_seed_list));
/*
@@ -198,7 +198,7 @@ int init_vm_boot_info(struct vm *vm)
return -EINVAL;
}
mbi = HPA2HVA((uint64_t)boot_regs[1]);
mbi = hpa2hva((uint64_t)boot_regs[1]);
dev_dbg(ACRN_DBG_BOOT, "Multiboot detected, flag=0x%x", mbi->mi_flags);
if ((mbi->mi_flags & MULTIBOOT_INFO_HAS_MODS) == 0U) {
@@ -218,7 +218,7 @@ int init_vm_boot_info(struct vm *vm)
vm->sw.kernel_type = VM_LINUX_GUEST;
vm->sw.kernel_info.kernel_src_addr =
HPA2HVA((uint64_t)mods[0].mm_mod_start);
hpa2hva((uint64_t)mods[0].mm_mod_start);
vm->sw.kernel_info.kernel_size =
mods[0].mm_mod_end - mods[0].mm_mod_start;
@@ -253,7 +253,7 @@ int init_vm_boot_info(struct vm *vm)
return -EINVAL;
}
mbi = HPA2HVA((uint64_t)boot_regs[1]);
mbi = hpa2hva((uint64_t)boot_regs[1]);
dev_dbg(ACRN_DBG_BOOT, "Multiboot detected, flag=0x%x", mbi->mi_flags);
if ((mbi->mi_flags & MULTIBOOT_INFO_HAS_MODS) == 0U) {
@@ -264,7 +264,7 @@ int init_vm_boot_info(struct vm *vm)
dev_dbg(ACRN_DBG_BOOT, "mod counts=%d\n", mbi->mi_mods_count);
/* mod[0] is for kernel&cmdline, other mod for ramdisk/firmware info*/
mods = (struct multiboot_module *)HPA2HVA((uint64_t)mbi->mi_mods_addr);
mods = (struct multiboot_module *)hpa2hva((uint64_t)mbi->mi_mods_addr);
dev_dbg(ACRN_DBG_BOOT, "mod0 start=0x%x, end=0x%x",
mods[0].mm_mod_start, mods[0].mm_mod_end);
@@ -273,10 +273,10 @@ int init_vm_boot_info(struct vm *vm)
vm->sw.kernel_type = VM_LINUX_GUEST;
vm->sw.kernel_info.kernel_src_addr =
HPA2HVA((uint64_t)mods[0].mm_mod_start);
hpa2hva((uint64_t)mods[0].mm_mod_start);
vm->sw.kernel_info.kernel_size =
mods[0].mm_mod_end - mods[0].mm_mod_start;
vm->sw.kernel_info.kernel_load_addr = (void *)HVA2GPA(vm,
vm->sw.kernel_info.kernel_load_addr = (void *)hva2gpa(vm,
get_kernel_load_addr(vm->sw.kernel_info.kernel_src_addr));
/*
@@ -290,7 +290,7 @@ int init_vm_boot_info(struct vm *vm)
char buf[MAX_BOOT_PARAMS_LEN];
cmd_dst = kernel_cmdline;
cmd_src = HPA2HVA((uint64_t)mbi->mi_cmdline);
cmd_src = hpa2hva((uint64_t)mbi->mi_cmdline);
boot_params_addr = parse_image_boot_params(vm, cmd_src);
/*
@@ -300,8 +300,7 @@ int init_vm_boot_info(struct vm *vm)
if (boot_params_addr != NULL) {
(void)memset(buf, 0U, sizeof(buf));
snprintf(buf, MAX_BOOT_PARAMS_LEN, "%s0x%X ",
boot_params_arg,
HVA2GPA(vm, (uint64_t)boot_params_addr));
boot_params_arg, hva2gpa(vm, boot_params_addr));
(void)strncpy_s(cmd_dst, MEM_2K, buf,
MAX_BOOT_PARAMS_LEN);
off = strnlen_s(cmd_dst, MEM_2K);
@@ -315,7 +314,7 @@ int init_vm_boot_info(struct vm *vm)
off += 1U;
cmd_dst += off;
cmd_src = HPA2HVA((uint64_t)mods[0].mm_string);
cmd_src = hpa2hva((uint64_t)mods[0].mm_string);
(void)strncpy_s(cmd_dst, MEM_2K - off, cmd_src,
strnlen_s(cmd_src, MEM_2K - off));
@@ -324,9 +323,9 @@ int init_vm_boot_info(struct vm *vm)
strnlen_s(kernel_cmdline, MEM_2K);
} else {
vm->sw.linux_info.bootargs_src_addr =
HPA2HVA((uint64_t)mods[0].mm_string);
hpa2hva((uint64_t)mods[0].mm_string);
vm->sw.linux_info.bootargs_size =
strnlen_s(HPA2HVA((uint64_t)mods[0].mm_string),
strnlen_s(hpa2hva((uint64_t)mods[0].mm_string),
MEM_2K);
}