V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

efi_loader: Fix some entry/exit points 

When switching between EFI context and U-Boot context we need to swap
the register that "gd" resides in.

Some functions slipped through here, with efi_allocate_pool / efi_free_pool
not doing the switch correctly and efi_return_handle switching too often.

Fix them all up to make sure we always have consistent register state.

Signed-off-by: Alexander Graf <agraf@suse.de>
This commit is contained in:
Alexander Graf 2016-03-24 01:37:37 +01:00 committed by Tom Rini
parent edc498c651
commit 1cd29f0abd
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/efi_loader/efi_boottime.c
View File

@ -137,12 +137,20 @@ efi_status_t EFIAPI efi_get_memory_map_ext(unsigned long *memory_map_size,
static efi_status_t EFIAPI efi_allocate_pool(int pool_type, unsigned long size, static efi_status_t EFIAPI efi_allocate_pool(int pool_type, unsigned long size,
void **buffer) void **buffer)
{ {
return efi_allocate_pages(0, pool_type, (size + 0xfff) >> 12, (void*)buffer); efi_status_t r;
EFI_ENTRY("%d, %ld, %p", pool_type, size, buffer);
r = efi_allocate_pages(0, pool_type, (size + 0xfff) >> 12, (void*)buffer);
return EFI_EXIT(r);
} }
static efi_status_t EFIAPI efi_free_pool(void *buffer) static efi_status_t EFIAPI efi_free_pool(void *buffer)
{ {
return efi_free_pages((ulong)buffer, 0); efi_status_t r;
EFI_ENTRY("%p", buffer);
r = efi_free_pages((ulong)buffer, 0);
return EFI_EXIT(r);
} }
/* /*
@ -706,7 +714,6 @@ static efi_status_t EFIAPI efi_handle_protocol(void *handle,
efi_guid_t *protocol, efi_guid_t *protocol,
void **protocol_interface) void **protocol_interface)
{ {
EFI_ENTRY("%p, %p, %p", handle, protocol, protocol_interface);
return efi_open_protocol(handle, protocol, protocol_interface, return efi_open_protocol(handle, protocol, protocol_interface,
NULL, NULL, 0); NULL, NULL, 0);
} }

5
lib/efi_loader/efi_image_loader.c
View File

@ -22,11 +22,8 @@ efi_status_t EFIAPI efi_return_handle(void *handle, efi_guid_t *protocol,
void **protocol_interface, void *agent_handle, void **protocol_interface, void *agent_handle,
void *controller_handle, uint32_t attributes) void *controller_handle, uint32_t attributes)
{ {
EFI_ENTRY("%p, %p, %p, %p, %p, 0x%x", handle, protocol,
protocol_interface, agent_handle, controller_handle,
attributes);
*protocol_interface = handle; *protocol_interface = handle;
return EFI_EXIT(EFI_SUCCESS); return EFI_SUCCESS;
} }
static void efi_loader_relocate(const IMAGE_BASE_RELOCATION *rel, static void efi_loader_relocate(const IMAGE_BASE_RELOCATION *rel,