Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-28 23:51:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

cmd: efidebug: simplify UEFI protocol calls

Browse source 
We should not to refer to a function via the run-time or boot services
tables if the function is exported.

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
This commit is contained in:
Heinrich Schuchardt 2020-05-02 16:08:37 +02:00
parent 41fd506842
commit a30c72319c
1 changed files with 19 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
cmd/efidebug.c
View file

@ -17,7 +17,6 @@
#include <linux/ctype.h> #include <linux/ctype.h>
#define BS systab.boottime #define BS systab.boottime
#define RT systab.runtime
/** /**
* efi_get_device_handle_info() - get information of UEFI device * efi_get_device_handle_info() - get information of UEFI device
@ -69,7 +68,7 @@ static int do_efi_show_devices(cmd_tbl_t *cmdtp, int flag,
u16 *dev_path_text; u16 *dev_path_text;
efi_status_t ret; efi_status_t ret;
ret = EFI_CALL(BS->locate_handle_buffer(ALL_HANDLES, NULL, NULL, ret = EFI_CALL(efi_locate_handle_buffer(ALL_HANDLES, NULL, NULL,
&num, &handles)); &num, &handles));
if (ret != EFI_SUCCESS) if (ret != EFI_SUCCESS)
return CMD_RET_FAILURE; return CMD_RET_FAILURE;
@ -86,7 +85,7 @@ static int do_efi_show_devices(cmd_tbl_t *cmdtp, int flag,
} }
} }
EFI_CALL(BS->free_pool(handles)); efi_free_pool(handles);
return CMD_RET_SUCCESS; return CMD_RET_SUCCESS;
} }
@ -148,7 +147,7 @@ static int do_efi_show_drivers(cmd_tbl_t *cmdtp, int flag,
u16 *driver_name, *image_path_text; u16 *driver_name, *image_path_text;
efi_status_t ret; efi_status_t ret;
ret = EFI_CALL(BS->locate_handle_buffer( ret = EFI_CALL(efi_locate_handle_buffer(
BY_PROTOCOL, &efi_guid_driver_binding_protocol, BY_PROTOCOL, &efi_guid_driver_binding_protocol,
NULL, &num, &handles)); NULL, &num, &handles));
if (ret != EFI_SUCCESS) if (ret != EFI_SUCCESS)
@ -170,12 +169,12 @@ static int do_efi_show_drivers(cmd_tbl_t *cmdtp, int flag,
else else
printf("%p %-20ls <built-in>\n", printf("%p %-20ls <built-in>\n",
handles[i], driver_name); handles[i], driver_name);
EFI_CALL(BS->free_pool(driver_name)); efi_free_pool(driver_name);
EFI_CALL(BS->free_pool(image_path_text)); efi_free_pool(image_path_text);
} }
} }
EFI_CALL(BS->free_pool(handles)); efi_free_pool(handles);
return CMD_RET_SUCCESS; return CMD_RET_SUCCESS;
} }
@ -321,7 +320,7 @@ static int do_efi_show_handles(cmd_tbl_t *cmdtp, int flag,
const char *guid_text; const char *guid_text;
efi_status_t ret; efi_status_t ret;
ret = EFI_CALL(BS->locate_handle_buffer(ALL_HANDLES, NULL, NULL, ret = EFI_CALL(efi_locate_handle_buffer(ALL_HANDLES, NULL, NULL,
&num, &handles)); &num, &handles));
if (ret != EFI_SUCCESS) if (ret != EFI_SUCCESS)
return CMD_RET_FAILURE; return CMD_RET_FAILURE;
@ -355,7 +354,7 @@ static int do_efi_show_handles(cmd_tbl_t *cmdtp, int flag,
putc('\n'); putc('\n');
} }
EFI_CALL(BS->free_pool(handles)); efi_free_pool(handles);
return CMD_RET_SUCCESS; return CMD_RET_SUCCESS;
} }
@ -463,18 +462,17 @@ static int do_efi_show_memmap(cmd_tbl_t *cmdtp, int flag,
int i; int i;
efi_status_t ret; efi_status_t ret;
ret = EFI_CALL(BS->get_memory_map(&map_size, memmap, NULL, NULL, NULL)); ret = efi_get_memory_map(&map_size, memmap, NULL, NULL, NULL);
if (ret == EFI_BUFFER_TOO_SMALL) { if (ret == EFI_BUFFER_TOO_SMALL) {
map_size += sizeof(struct efi_mem_desc); /* for my own */ map_size += sizeof(struct efi_mem_desc); /* for my own */
ret = EFI_CALL(BS->allocate_pool(EFI_LOADER_DATA, ret = efi_allocate_pool(EFI_LOADER_DATA, map_size,
map_size, (void *)&memmap)); (void *)&memmap);
if (ret != EFI_SUCCESS) if (ret != EFI_SUCCESS)
return CMD_RET_FAILURE; return CMD_RET_FAILURE;
ret = EFI_CALL(BS->get_memory_map(&map_size, memmap, ret = efi_get_memory_map(&map_size, memmap, NULL, NULL, NULL);
NULL, NULL, NULL));
} }
if (ret != EFI_SUCCESS) { if (ret != EFI_SUCCESS) {
EFI_CALL(BS->free_pool(memmap)); efi_free_pool(memmap);
return CMD_RET_FAILURE; return CMD_RET_FAILURE;
} }
@ -501,7 +499,7 @@ static int do_efi_show_memmap(cmd_tbl_t *cmdtp, int flag,
putc('\n'); putc('\n');
} }
EFI_CALL(BS->free_pool(memmap)); efi_free_pool(memmap);
return CMD_RET_SUCCESS; return CMD_RET_SUCCESS;
} }
@ -615,7 +613,7 @@ static int do_efi_boot_add(cmd_tbl_t *cmdtp, int flag,
goto out; goto out;
} }
ret = EFI_CALL(RT->set_variable(var_name16, &guid, ret = EFI_CALL(efi_set_variable(var_name16, &guid,
EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_NON_VOLATILE |
EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_BOOTSERVICE_ACCESS |
EFI_VARIABLE_RUNTIME_ACCESS, EFI_VARIABLE_RUNTIME_ACCESS,
@ -670,7 +668,7 @@ static int do_efi_boot_rm(cmd_tbl_t *cmdtp, int flag,
p = var_name16; p = var_name16;
utf8_utf16_strncpy(&p, var_name, 9); utf8_utf16_strncpy(&p, var_name, 9);
ret = EFI_CALL(RT->set_variable(var_name16, &guid, 0, 0, NULL)); ret = EFI_CALL(efi_set_variable(var_name16, &guid, 0, 0, NULL));
if (ret) { if (ret) {
printf("Cannot remove %ls\n", var_name16); printf("Cannot remove %ls\n", var_name16);
return CMD_RET_FAILURE; return CMD_RET_FAILURE;
@ -864,7 +862,7 @@ static int show_efi_boot_order(void)
efi_status_t ret; efi_status_t ret;
size = 0; size = 0;
ret = EFI_CALL(RT->get_variable(L"BootOrder", &efi_global_variable_guid, ret = EFI_CALL(efi_get_variable(L"BootOrder", &efi_global_variable_guid,
NULL, &size, NULL)); NULL, &size, NULL));
if (ret != EFI_BUFFER_TOO_SMALL) { if (ret != EFI_BUFFER_TOO_SMALL) {
if (ret == EFI_NOT_FOUND) { if (ret == EFI_NOT_FOUND) {
@ -975,7 +973,7 @@ static int do_efi_boot_next(cmd_tbl_t *cmdtp, int flag,
guid = efi_global_variable_guid; guid = efi_global_variable_guid;
size = sizeof(u16); size = sizeof(u16);
ret = EFI_CALL(RT->set_variable(L"BootNext", &guid, ret = EFI_CALL(efi_set_variable(L"BootNext", &guid,
EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_NON_VOLATILE |
EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_BOOTSERVICE_ACCESS |
EFI_VARIABLE_RUNTIME_ACCESS, EFI_VARIABLE_RUNTIME_ACCESS,
@ -1036,7 +1034,7 @@ static int do_efi_boot_order(cmd_tbl_t *cmdtp, int flag,
} }
guid = efi_global_variable_guid; guid = efi_global_variable_guid;
ret = EFI_CALL(RT->set_variable(L"BootOrder", &guid, ret = EFI_CALL(efi_set_variable(L"BootOrder", &guid,
EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_NON_VOLATILE |
EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_BOOTSERVICE_ACCESS |
EFI_VARIABLE_RUNTIME_ACCESS, EFI_VARIABLE_RUNTIME_ACCESS,