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

Revert "HV: added memory allocation functions for AP trampoline code relocation"

Browse Source 
This reverts commit 41b83bb20b.
This commit is contained in:
lijinxia 2018-05-09 10:28:17 +00:00 committed by GitHub
parent d932d6397a
commit 035d3c2e19
5 changed files with 1 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
arch/x86/guest/guest.c
View File

@ -341,54 +341,6 @@ int prepare_vm0_memmap_and_e820(struct vm *vm)
return 0;
}
uint64_t e820_alloc_low_memory(uint32_t size)
{
uint32_t i;
struct e820_entry *entry, *new_entry;
/* We want memory in page boundary and want integral multiple of pages */
size = ROUND_PAGE_UP(size);
for (i = 0; i < e820_entries; i++) {
entry = &e820[i];
uint64_t start, end, length;
start = ROUND_PAGE_UP(entry->baseaddr);
end = ROUND_PAGE_DOWN(entry->baseaddr + entry->length);
length = end - start;
length = (end > start) ? (end - start) : 0;
if ((entry->type != E820_TYPE_RAM)
|| (length < size)
|| (start >= MEM_1M)
|| (start + size > MEM_1M)) {
continue;
}
/* Found available memory */
e820_mem.total_mem_size -= size;
/* found exact size of e820 entry */
if (length == size) {
entry->type = E820_TYPE_RESERVED;
return start;
}
/* create a new entry for the allocated memory */
new_entry = &e820[e820_entries];
new_entry->type = E820_TYPE_RESERVED;
new_entry->baseaddr = end - size;
new_entry->length = entry->baseaddr + entry->length - new_entry->baseaddr;
entry->length -= new_entry->length;
e820_entries++;
return new_entry->baseaddr;
}
pr_fatal("Can't allocate memory under 1M from E820\n");
return ACRN_INVALID_HPA;
}
/*******************************************************************
* GUEST initial page table
*

2
bsp/sbl/include/bsp/bsp_cfg.h
View File

@ -41,7 +41,7 @@
#define HEAP_SIZE 0x100000
#define CONSOLE_LOGLEVEL_DEFAULT 2
#define MEM_LOGLEVEL_DEFAULT 4
#define CONFIG_LOW_RAM_SIZE 0x00010000
#define CONFIG_LOW_RAM_SIZE 0x000CF000
#define CONFIG_RAM_START 0x6E000000
#define CONFIG_RAM_SIZE 0x02000000 /* 32M */
#define CONFIG_CMA

61
bsp/uefi/efi/malloc.c
View File

@ -164,67 +164,6 @@ fail:
return err;
}
EFI_STATUS emalloc_for_low_mem(EFI_PHYSICAL_ADDRESS *addr, UINTN size)
{
UINTN map_size, map_key, desc_size;
EFI_MEMORY_DESCRIPTOR *map_buf;
UINTN d, map_end;
UINT32 desc_version;
EFI_STATUS err;
UINTN nr_pages = EFI_SIZE_TO_PAGES(size);
err = memory_map(&map_buf, &map_size, &map_key,
&desc_size, &desc_version);
if (err != EFI_SUCCESS)
goto fail;
d = (UINTN)map_buf;
map_end = (UINTN)map_buf + map_size;
for (; d < map_end; d += desc_size) {
EFI_MEMORY_DESCRIPTOR *desc;
EFI_PHYSICAL_ADDRESS start, end, aligned;
desc = (EFI_MEMORY_DESCRIPTOR *)d;
if (desc->Type != EfiConventionalMemory)
continue;
if (desc->NumberOfPages < nr_pages)
continue;
start = desc->PhysicalStart;
end = start + (desc->NumberOfPages << EFI_PAGE_SHIFT);
size = (size + EFI_PAGE_SIZE - 1) & ~(EFI_PAGE_SIZE - 1);
/* allocate in low memory only */
if (start >= 1 << 20)
continue;
if (end > 1 << 20) {
size -= end - (1 << 20);
end = (1 << 20);
}
if (end - start >= size) {
aligned = end - size;
err = allocate_pages(AllocateAddress, EfiReservedMemoryType,
nr_pages, &aligned);
if (err == EFI_SUCCESS) {
*addr = aligned;
break;
}
}
}
if (d == map_end)
err = EFI_OUT_OF_RESOURCES;
free_pool(map_buf);
fail:
return err;
}
/* FIXME: This function cannot guarantee to return address under 4G,
* and the hypervisor cannot handle params, which address is above 4G,
* delivered from efi stub.

1
bsp/uefi/efi/stdlib.h
View File

@ -50,7 +50,6 @@ extern void *calloc(UINTN nmemb, UINTN size);
extern EFI_STATUS emalloc(UINTN, UINTN, EFI_PHYSICAL_ADDRESS *);
extern EFI_STATUS __emalloc(UINTN, UINTN, EFI_PHYSICAL_ADDRESS *, EFI_MEMORY_TYPE);
extern EFI_STATUS emalloc_for_low_mem(EFI_PHYSICAL_ADDRESS *addr, UINTN size);
extern void efree(EFI_PHYSICAL_ADDRESS, UINTN);
static inline void memset(void *dstv, char ch, UINTN size)

1
include/arch/x86/guest/guest.h
View File

@ -68,7 +68,6 @@ struct e820_mem_params {
};
int prepare_vm0_memmap_and_e820(struct vm *vm);
uint64_t e820_alloc_low_memory(uint32_t size);
/* Definition for a mem map lookup */
struct vm_lu_mem_map {