lkml.org 
[lkml]   [2013]   [Sep]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 13/18] use efi_get_memory_map() to get final map for x86
Date
Replace the open-coded memory map getting with the
efi_get_memory_map() that is now general enough to use.

Signed-off-by: Roy Franz <roy.franz@linaro.org>
---
arch/x86/boot/compressed/eboot.c | 22 +++++-----------------
1 file changed, 5 insertions(+), 17 deletions(-)

diff --git a/arch/x86/boot/compressed/eboot.c b/arch/x86/boot/compressed/eboot.c
index 4723dc89..05f11c7 100644
--- a/arch/x86/boot/compressed/eboot.c
+++ b/arch/x86/boot/compressed/eboot.c
@@ -526,25 +526,12 @@ static efi_status_t exit_boot(struct boot_params *boot_params,
u8 nr_entries;
int i;

- size = sizeof(*mem_map) * 32;
-
-again:
- size += sizeof(*mem_map) * 2;
- _size = size;
- status = efi_low_alloc(sys_table, size, 1, (unsigned long *)&mem_map);
- if (status != EFI_SUCCESS)
- return status;
-
get_map:
- status = efi_call_phys5(sys_table->boottime->get_memory_map, &size,
- mem_map, &key, &desc_size, &desc_version);
- if (status == EFI_BUFFER_TOO_SMALL) {
- efi_free(sys_table, _size, (unsigned long)mem_map);
- goto again;
- }
+ status = efi_get_memory_map(sys_table, &mem_map, &size, &desc_size,
+ &desc_version, &key);

if (status != EFI_SUCCESS)
- goto free_mem_map;
+ return status;

memcpy(&efi->efi_loader_signature, EFI_LOADER_SIGNATURE, sizeof(__u32));
efi->efi_systab = (unsigned long)sys_table;
@@ -573,6 +560,7 @@ get_map:
goto free_mem_map;

called_exit = true;
+ efi_call_phys1(sys_table->boottime->free_pool, mem_map);
goto get_map;
}

@@ -641,7 +629,7 @@ get_map:
return EFI_SUCCESS;

free_mem_map:
- efi_free(sys_table, _size, (unsigned long)mem_map);
+ efi_call_phys1(sys_table->boottime->free_pool, mem_map);
return status;
}

--
1.7.10.4


\
 
 \ /
  Last update: 2013-09-23 01:01    [W:0.422 / U:0.404 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site