brain-hackers_pepepper-mirror
/
u-boot-brain
mirror of https://github.com/brain-hackers/u-boot-brain
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

efi_loader: simplify accessing variables 

Use efi_get_variable_int() instead of EFI_CALL(RT->get_variable()).
Use efi_set_variable_int() instead of EFI_CALL(efi_set_variable()).

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
Tested-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>
Reviewed-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>
This commit is contained in:
Heinrich Schuchardt 2021-05-24 11:10:59 +02:00
parent 2ecee31017
commit acfe1def3f
1 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
cmd/efidebug.c
View File

@ -12,6 +12,7 @@
#include <efi_load_initrd.h> #include <efi_load_initrd.h>
#include <efi_loader.h> #include <efi_loader.h>
#include <efi_rng.h> #include <efi_rng.h>
#include <efi_variable.h>
#include <exports.h> #include <exports.h>
#include <hexdump.h> #include <hexdump.h>
#include <log.h> #include <log.h>
@ -239,8 +240,9 @@ static int do_efi_capsule_res(struct cmd_tbl *cmdtp, int flag,
guid = efi_guid_capsule_report; guid = efi_guid_capsule_report;
if (argc == 1) { if (argc == 1) {
size = sizeof(var_name16); size = sizeof(var_name16);
ret = EFI_CALL(RT->get_variable(L"CapsuleLast", &guid, NULL, ret = efi_get_variable_int(L"CapsuleLast", &guid, NULL,
&size, var_name16)); &size, var_name16, NULL);
if (ret != EFI_SUCCESS) { if (ret != EFI_SUCCESS) {
if (ret == EFI_NOT_FOUND) if (ret == EFI_NOT_FOUND)
printf("CapsuleLast doesn't exist\n"); printf("CapsuleLast doesn't exist\n");
@ -263,13 +265,13 @@ static int do_efi_capsule_res(struct cmd_tbl *cmdtp, int flag,
} }
size = 0; size = 0;
ret = EFI_CALL(RT->get_variable(var_name16, &guid, NULL, &size, NULL)); ret = efi_get_variable_int(var_name16, &guid, NULL, &size, NULL, NULL);
if (ret == EFI_BUFFER_TOO_SMALL) { if (ret == EFI_BUFFER_TOO_SMALL) {
result = malloc(size); result = malloc(size);
if (!result) if (!result)
return CMD_RET_FAILURE; return CMD_RET_FAILURE;
ret = EFI_CALL(RT->get_variable(var_name16, &guid, NULL, &size, ret = efi_get_variable_int(var_name16, &guid, NULL, &size,
result)); result, NULL);
} }
if (ret != EFI_SUCCESS) { if (ret != EFI_SUCCESS) {
free(result); free(result);
@ -1062,11 +1064,11 @@ static int do_efi_boot_add(struct cmd_tbl *cmdtp, int flag,
goto out; goto out;
} }
ret = EFI_CALL(efi_set_variable(var_name16, &guid, ret = efi_set_variable_int(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,
size, data)); size, data, false);
if (ret != EFI_SUCCESS) { if (ret != EFI_SUCCESS) {
printf("Cannot set %ls\n", var_name16); printf("Cannot set %ls\n", var_name16);
r = CMD_RET_FAILURE; r = CMD_RET_FAILURE;
@ -1117,7 +1119,8 @@ static int do_efi_boot_rm(struct cmd_tbl *cmdtp, int flag,
efi_create_indexed_name(var_name16, sizeof(var_name16), efi_create_indexed_name(var_name16, sizeof(var_name16),
"Boot", id); "Boot", id);
ret = EFI_CALL(efi_set_variable(var_name16, &guid, 0, 0, NULL)); ret = efi_set_variable_int(var_name16, &guid, 0, 0, NULL,
false);
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;
@ -1416,11 +1419,11 @@ static int do_efi_boot_next(struct cmd_tbl *cmdtp, int flag,
guid = efi_global_variable_guid; guid = efi_global_variable_guid;
size = sizeof(u16); size = sizeof(u16);
ret = EFI_CALL(efi_set_variable(L"BootNext", &guid, ret = efi_set_variable_int(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,
size, &bootnext)); size, &bootnext, false);
if (ret != EFI_SUCCESS) { if (ret != EFI_SUCCESS) {
printf("Cannot set BootNext\n"); printf("Cannot set BootNext\n");
r = CMD_RET_FAILURE; r = CMD_RET_FAILURE;
@ -1477,11 +1480,11 @@ static int do_efi_boot_order(struct cmd_tbl *cmdtp, int flag,
} }
guid = efi_global_variable_guid; guid = efi_global_variable_guid;
ret = EFI_CALL(efi_set_variable(L"BootOrder", &guid, ret = efi_set_variable_int(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,
size, bootorder)); size, bootorder, true);
if (ret != EFI_SUCCESS) { if (ret != EFI_SUCCESS) {
printf("Cannot set BootOrder\n"); printf("Cannot set BootOrder\n");
r = CMD_RET_FAILURE; r = CMD_RET_FAILURE;