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

cmd: efidebug: rework "boot dump" sub-command using GetNextVariableName()

Browse Source 
Currently in do_efi_boot_dump(), we directly read EFI variables from
related environment variables. To accommodate alternative storage
backends, we should switch to using the UEFI API instead.

Signed-off-by: AKASHI Takahiro <takahiro.akashi@linaro.org>
Reviewed-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
This commit is contained in:
AKASHI Takahiro
2019-04-26 09:44:18 +09:00
committed by Heinrich Schuchardt
parent d40e05ae95
commit ffe2157447
1 changed files with 55 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
cmd/efidebug.c
View File

@@ -693,6 +693,17 @@ static void show_efi_boot_opt(int id)
free(data); free(data);
} }
static int u16_tohex(u16 c)
{
if (c >= '0' && c <= '9')
return c - '0';
if (c >= 'A' && c <= 'F')
return c - 'A' + 10;
/* not hexadecimal */
return -1;
}
/** /**
* show_efi_boot_dump() - dump all UEFI load options * show_efi_boot_dump() - dump all UEFI load options
* *
@@ -709,38 +720,58 @@ static void show_efi_boot_opt(int id)
static int do_efi_boot_dump(cmd_tbl_t *cmdtp, int flag, static int do_efi_boot_dump(cmd_tbl_t *cmdtp, int flag,
int argc, char * const argv[]) int argc, char * const argv[])
{ {
char regex[256]; u16 *var_name16, *p;
char * const regexlist[] = {regex}; efi_uintn_t buf_size, size;
char *variables = NULL, *boot, *value; efi_guid_t guid;
int len; int id, i, digit;
int id; efi_status_t ret;
if (argc > 1) if (argc > 1)
return CMD_RET_USAGE; return CMD_RET_USAGE;
snprintf(regex, 256, "efi_.*-.*-.*-.*-.*_Boot[0-9A-F]+"); buf_size = 128;
var_name16 = malloc(buf_size);
/* TODO: use GetNextVariableName? */ if (!var_name16)
len = hexport_r(&env_htab, '\n', H_MATCH_REGEX | H_MATCH_KEY,
&variables, 0, 1, regexlist);
if (!len)
return CMD_RET_SUCCESS;
if (len < 0)
return CMD_RET_FAILURE; return CMD_RET_FAILURE;
boot = variables; var_name16[0] = 0;
while (*boot) { for (;;) {
value = strstr(boot, "Boot") + 4; size = buf_size;
id = (int)simple_strtoul(value, NULL, 16); ret = EFI_CALL(efi_get_next_variable_name(&size, var_name16,
show_efi_boot_opt(id); &guid));
boot = strchr(boot, '\n'); if (ret == EFI_NOT_FOUND)
if (!*boot)
break; break;
boot++; if (ret == EFI_BUFFER_TOO_SMALL) {
buf_size = size;
p = realloc(var_name16, buf_size);
if (!p) {
free(var_name16);
return CMD_RET_FAILURE;
} }
free(variables); var_name16 = p;
ret = EFI_CALL(efi_get_next_variable_name(&size,
var_name16,
&guid));
}
if (ret != EFI_SUCCESS) {
free(var_name16);
return CMD_RET_FAILURE;
}
if (memcmp(var_name16, L"Boot", 8))
continue;
for (id = 0, i = 0; i < 4; i++) {
digit = u16_tohex(var_name16[4 + i]);
if (digit < 0)
break;
id = (id << 4) + digit;
}
if (i == 4 && !var_name16[8])
show_efi_boot_opt(id);
}
free(var_name16);
return CMD_RET_SUCCESS; return CMD_RET_SUCCESS;
} }