efi_loader: eliminate sandbox addresses
Do not use the sandbox's virtual address space for the internal structures of the memory map. This way we can eliminate a whole lot of unnecessary conversions. The only conversion remaining is the one when adding known memory. Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de> Signed-off-by: Alexander Graf <agraf@suse.de>
This commit is contained in:
parent
5e2f039107
commit
49759743bf
@ -384,7 +384,7 @@ efi_status_t efi_allocate_pages(int type, int memory_type,
|
|||||||
/* Reserve that map in our memory maps */
|
/* Reserve that map in our memory maps */
|
||||||
ret = efi_add_memory_map(addr, pages, memory_type, true);
|
ret = efi_add_memory_map(addr, pages, memory_type, true);
|
||||||
if (ret == addr) {
|
if (ret == addr) {
|
||||||
*memory = (uintptr_t)map_sysmem(addr, len);
|
*memory = addr;
|
||||||
} else {
|
} else {
|
||||||
/* Map would overlap, bail out */
|
/* Map would overlap, bail out */
|
||||||
r = EFI_OUT_OF_RESOURCES;
|
r = EFI_OUT_OF_RESOURCES;
|
||||||
@ -418,12 +418,11 @@ void *efi_alloc(uint64_t len, int memory_type)
|
|||||||
efi_status_t efi_free_pages(uint64_t memory, efi_uintn_t pages)
|
efi_status_t efi_free_pages(uint64_t memory, efi_uintn_t pages)
|
||||||
{
|
{
|
||||||
uint64_t r = 0;
|
uint64_t r = 0;
|
||||||
uint64_t addr = map_to_sysmem((void *)(uintptr_t)memory);
|
|
||||||
|
|
||||||
r = efi_add_memory_map(addr, pages, EFI_CONVENTIONAL_MEMORY, false);
|
r = efi_add_memory_map(memory, pages, EFI_CONVENTIONAL_MEMORY, false);
|
||||||
/* Merging of adjacent free regions is missing */
|
/* Merging of adjacent free regions is missing */
|
||||||
|
|
||||||
if (r == addr)
|
if (r == memory)
|
||||||
return EFI_SUCCESS;
|
return EFI_SUCCESS;
|
||||||
|
|
||||||
return EFI_NOT_FOUND;
|
return EFI_NOT_FOUND;
|
||||||
@ -562,7 +561,7 @@ __weak void efi_add_known_memory(void)
|
|||||||
for (i = 0; i < CONFIG_NR_DRAM_BANKS; i++) {
|
for (i = 0; i < CONFIG_NR_DRAM_BANKS; i++) {
|
||||||
u64 ram_end, ram_start, pages;
|
u64 ram_end, ram_start, pages;
|
||||||
|
|
||||||
ram_start = gd->bd->bi_dram[i].start;
|
ram_start = (uintptr_t)map_sysmem(gd->bd->bi_dram[i].start, 0);
|
||||||
ram_end = ram_start + gd->bd->bi_dram[i].size;
|
ram_end = ram_start + gd->bd->bi_dram[i].size;
|
||||||
|
|
||||||
/* Remove partial pages */
|
/* Remove partial pages */
|
||||||
|
Loading…
Reference in New Issue
Block a user