p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

efi: use efi_get_memory_map() to get final map for x86 

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>
Signed-off-by: Matt Fleming <matt.fleming@intel.com>
This commit is contained in:
Roy Franz 2013-09-22 15:45:37 -07:00 committed by Matt Fleming
parent 1c089c65f5
commit ae8e9060a3
1 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
arch/x86/boot/compressed/eboot.c
View File

@ -527,26 +527,13 @@ static efi_status_t exit_boot(struct boot_params *boot_params,
u8 nr_entries;
int i;
size = sizeof(*mem_map) * 32;
get_map:
status = efi_get_memory_map(sys_table, &mem_map, &size, &desc_size,
&desc_version, &key);
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;
}
if (status != EFI_SUCCESS)
goto free_mem_map;
memcpy(&efi->efi_loader_signature, EFI_LOADER_SIGNATURE, sizeof(__u32));
efi->efi_systab = (unsigned long)sys_table;
efi->efi_memdesc_size = desc_size;
@ -574,6 +561,7 @@ static efi_status_t exit_boot(struct boot_params *boot_params,
goto free_mem_map;
called_exit = true;
efi_call_phys1(sys_table->boottime->free_pool, mem_map);
goto get_map;
}
@ -642,7 +630,7 @@ static efi_status_t exit_boot(struct boot_params *boot_params,
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;
}