leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

efi_loader: simplify detaching

Browse Source 
We do not need any array typed detach list. Let's simply update the
pointers directly.

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
This commit is contained in:
Heinrich Schuchardt 2019-07-05 18:12:21 +02:00
parent 953661a912
commit b23ffcbe02
1 changed files with 8 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
lib/efi_loader/efi_runtime.c
View File

@ -382,26 +382,6 @@ efi_status_t __weak __efi_runtime EFIAPI efi_set_time(struct efi_time *time)
return EFI_UNSUPPORTED; return EFI_UNSUPPORTED;
} }
struct efi_runtime_detach_list_struct {
void *ptr;
void *patchto;
};
static const struct efi_runtime_detach_list_struct efi_runtime_detach_list[] = {
{
/* do_reset is gone */
.ptr = &efi_runtime_services.reset_system,
.patchto = efi_reset_system,
}, {
/* RTC accessors are gone */
.ptr = &efi_runtime_services.get_time,
.patchto = &efi_get_time,
}, {
.ptr = &efi_runtime_services.set_time,
.patchto = &efi_set_time,
}
};
/** /**
* efi_is_runtime_service_pointer() - check if pointer points to runtime table * efi_is_runtime_service_pointer() - check if pointer points to runtime table
* *
@ -415,21 +395,17 @@ static bool efi_is_runtime_service_pointer(void *p)
p <= (void *)&efi_runtime_services.query_variable_info; p <= (void *)&efi_runtime_services.query_variable_info;
} }
/**
* efi_runtime_detach() - detach unimplemented runtime functions
*/
static __efi_runtime void efi_runtime_detach(void) static __efi_runtime void efi_runtime_detach(void)
{ {
int i; efi_runtime_services.reset_system = efi_reset_system;
efi_runtime_services.get_time = efi_get_time;
efi_runtime_services.set_time = efi_set_time;
/* /* Update CRC32 */
* Replace boottime functions by runtime functions efi_update_table_header_crc32(&efi_runtime_services.hdr);
* TODO: move this step to ExitBootServices()
*/
for (i = 0; i < ARRAY_SIZE(efi_runtime_detach_list); i++) {
ulong patchto = (ulong)efi_runtime_detach_list[i].patchto;
ulong *p = efi_runtime_detach_list[i].ptr;
debug("%s: Setting %p to %lx\n", __func__, p, patchto);
*p = patchto;
}
} }
/** /**