dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-27 13:31:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

efi_loader: do not call efi_runtime_detach twice

Browse Source 
Commit 7f95104d91 ("efi_loader: detach runtime in ExitBootServices()")
added a call to efi_runtime_detach() to ExitBootServices() but did not
remove the call in SetVirtualAddressMap().

Remove the superfluous function call.

Correct a comment referring to efi_runtime_detach().

Fixes: 7f95104d91 ("efi_loader: detach runtime in ExitBootServices()")
Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
This commit is contained in:
Heinrich Schuchardt
2019-08-14 06:49:09 +02:00
parent 53e1d8fae8
commit 9f8932d055
1 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/efi_loader/efi_runtime.c
View File

@@ -565,7 +565,10 @@ void efi_runtime_relocate(ulong offset, struct efi_mem_desc *map)
p = (void*)((ulong)rel->offset - base) + gd->relocaddr; p = (void*)((ulong)rel->offset - base) + gd->relocaddr;
/* The runtime services are updated in efi_runtime_detach() */ /*
* The runtime services table is updated in
* efi_relocate_runtime_table()
*/
if (map && efi_is_runtime_service_pointer(p)) if (map && efi_is_runtime_service_pointer(p))
continue; continue;
@@ -724,14 +727,6 @@ static efi_status_t EFIAPI efi_set_virtual_address_map(
} }
} }
/*
* Some runtime services are implemented in a way that we can only offer
* them at boottime. Replace those function pointers.
*
* TODO: move this call to ExitBootServices().
*/
efi_runtime_detach();
/* Relocate the runtime. See TODO above */ /* Relocate the runtime. See TODO above */
for (i = 0; i < n; i++) { for (i = 0; i < n; i++) {
struct efi_mem_desc *map; struct efi_mem_desc *map;