diff options
author | Ahmad Fatoum <a.fatoum@pengutronix.de> | 2024-03-04 20:00:33 +0100 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2024-03-05 16:28:06 +0100 |
commit | 387d6f9ed9a1e45a3d1659c531f8c578cc626f05 (patch) | |
tree | cccf1c563dd1c7b6f1a3a3d45dde9e5c7dea4cf6 /drivers | |
parent | 009208f801ca5a9d7fa24aec7a819019864faa74 (diff) | |
download | barebox-387d6f9ed9a1e45a3d1659c531f8c578cc626f05.tar.gz barebox-387d6f9ed9a1e45a3d1659c531f8c578cc626f05.tar.xz |
commands: provide efi_handle_dump in both payload and loader
The efi_handle_dump command is currently used when barebox is built as
payload, but it's also useful when running as a loader to list handles
and their protocols. Move the code into a common area to make it
accessible in both configurations.
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
Link: https://lore.barebox.org/20240304190038.3486881-109-a.fatoum@pengutronix.de
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/efi/Makefile | 3 | ||||
-rw-r--r-- | drivers/efi/efi-device.c | 196 | ||||
-rw-r--r-- | drivers/efi/efi-handle.c | 43 |
3 files changed, 47 insertions, 195 deletions
diff --git a/drivers/efi/Makefile b/drivers/efi/Makefile index bd8fadac42..4e3c39e144 100644 --- a/drivers/efi/Makefile +++ b/drivers/efi/Makefile @@ -1,2 +1,3 @@ # SPDX-License-Identifier: GPL-2.0-only -obj-y += efi-device.o +obj-y += efi-handle.o +obj-$(CONFIG_EFI_PAYLOAD) += efi-device.o diff --git a/drivers/efi/efi-device.c b/drivers/efi/efi-device.c index bbc76e9ef7..33c82c81dd 100644 --- a/drivers/efi/efi-device.c +++ b/drivers/efi/efi-device.c @@ -6,7 +6,6 @@ */ #include <bootsource.h> -#include <command.h> #include <common.h> #include <driver.h> #include <malloc.h> @@ -27,30 +26,8 @@ static int efi_locate_handle(enum efi_locate_search_type search_type, unsigned long *no_handles, efi_handle_t **buffer) { - efi_status_t efiret; - unsigned long buffer_size = 0; - efi_handle_t *buf; - - efiret = BS->locate_handle(search_type, protocol, search_key, &buffer_size, - NULL); - if (EFI_ERROR(efiret) && efiret != EFI_BUFFER_TOO_SMALL) - return -efi_errno(efiret); - - buf = malloc(buffer_size); - if (!buf) - return -ENOMEM; - - efiret = BS->locate_handle(search_type, protocol, search_key, &buffer_size, - buf); - if (EFI_ERROR(efiret)) { - free(buf); - return -efi_errno(efiret); - } - - *no_handles = buffer_size / sizeof(efi_handle_t); - *buffer = buf; - - return 0; + return __efi_locate_handle(BS, search_type, protocol, search_key, no_handles, + buffer); } static struct efi_device *efi_find_device(efi_handle_t handle) @@ -499,172 +476,3 @@ void efi_continue_devices(void) efidrv->dev_continue(efidev); } } - -static void efi_devpath(efi_handle_t handle) -{ - efi_status_t efiret; - void *devpath; - char *dev_path_str; - - efiret = BS->open_protocol(handle, &efi_device_path_protocol_guid, - &devpath, NULL, NULL, EFI_OPEN_PROTOCOL_GET_PROTOCOL); - if (EFI_ERROR(efiret)) - return; - - dev_path_str = device_path_to_str(devpath); - if (dev_path_str) { - printf(" Devpath: \n %s\n", dev_path_str); - free(dev_path_str); - } -} - -static void efi_dump(efi_handle_t *handles, unsigned long handle_count) -{ - int i, j; - unsigned long num_guids; - efi_guid_t **guids; - - if (!handles || !handle_count) - return; - - for (i = 0; i < handle_count; i++) { - printf("handle-%p\n", handles[i]); - - BS->protocols_per_handle(handles[i], &guids, &num_guids); - printf(" Protocols:\n"); - for (j = 0; j < num_guids; j++) - printf(" %d: %pUl: %s\n", j, guids[j], - efi_guid_string(guids[j])); - efi_devpath(handles[i]); - } - printf("\n"); -} - -static unsigned char to_digit(unsigned char c) -{ - if (c >= '0' && c <= '9') - c -= '0'; - else if (c >= 'A' && c <= 'F') - c -= 'A' - 10; - else - c -= 'a' - 10; - - return c; -} - -#define read_xbit(src, dest, bit) \ - do { \ - int __i; \ - for (__i = (bit - 4); __i >= 0; __i -= 4, src++) \ - dest |= to_digit(*src) << __i; \ - } while (0) - -static int do_efi_protocol_dump(int argc, char **argv) -{ - unsigned long handle_count = 0; - efi_handle_t *handles = NULL; - int ret; - efi_guid_t guid; - u32 a = 0; - u16 b = 0; - u16 c = 0; - u8 d0 = 0; - u8 d1 = 0; - u8 d2 = 0; - u8 d3 = 0; - u8 d4 = 0; - u8 d5 = 0; - u8 d6 = 0; - u8 d7 = 0; - - /* Format 220e73b6-6bdb-4413-8405-b974b108619a */ - if (argc == 1) { - char *s = argv[0]; - int len = strlen(s); - - if (len != 36) - return -EINVAL; - - read_xbit(s, a, 32); - if (*s != '-') - return -EINVAL; - s++; - read_xbit(s, b, 16); - if (*s != '-') - return -EINVAL; - s++; - read_xbit(s, c, 16); - if (*s != '-') - return -EINVAL; - s++; - read_xbit(s, d0, 8); - read_xbit(s, d1, 8); - if (*s != '-') - return -EINVAL; - s++; - read_xbit(s, d2, 8); - read_xbit(s, d3, 8); - read_xbit(s, d4, 8); - read_xbit(s, d5, 8); - read_xbit(s, d6, 8); - read_xbit(s, d7, 8); - } else if (argc == 11) { - /* Format : - * 220e73b6 6bdb 4413 84 05 b9 74 b1 08 61 9a - * or - * 0x220e73b6 0x6bdb 0x14413 0x84 0x05 0xb9 0x74 0xb1 0x08 0x61 0x9a - */ - a = simple_strtoul(argv[0], NULL, 16); - b = simple_strtoul(argv[1], NULL, 16); - c = simple_strtoul(argv[2], NULL, 16); - d0 = simple_strtoul(argv[3], NULL, 16); - d1 = simple_strtoul(argv[4], NULL, 16); - d2 = simple_strtoul(argv[5], NULL, 16); - d3 = simple_strtoul(argv[6], NULL, 16); - d4 = simple_strtoul(argv[7], NULL, 16); - d5 = simple_strtoul(argv[8], NULL, 16); - d6 = simple_strtoul(argv[9], NULL, 16); - d7 = simple_strtoul(argv[10], NULL, 16); - } else { - return -EINVAL; - } - - guid = EFI_GUID(a, b, c, d0, d1, d2, d3, d4, d5, d6, d7); - - printf("Searching for:\n"); - printf(" %pUl: %s\n", &guid, efi_guid_string(&guid)); - - ret = efi_locate_handle(BY_PROTOCOL, &guid, NULL, &handle_count, &handles); - if (!ret) - efi_dump(handles, handle_count); - - return 0; -} - -static int do_efi_handle_dump(int argc, char *argv[]) -{ - unsigned long handle_count = 0; - efi_handle_t *handles = NULL; - int ret; - - if (argc > 1) - return do_efi_protocol_dump(--argc, ++argv); - - ret = efi_locate_handle(ALL_HANDLES, NULL, NULL, &handle_count, &handles); - if (!ret) - efi_dump(handles, handle_count); - - return 0; -} - -BAREBOX_CMD_HELP_START(efi_handle_dump) -BAREBOX_CMD_HELP_TEXT("Dump all the efi handle with protocol and devpath\n") -BAREBOX_CMD_HELP_END - -BAREBOX_CMD_START(efi_handle_dump) - .cmd = do_efi_handle_dump, - BAREBOX_CMD_DESC("Usage: efi_handle_dump") - BAREBOX_CMD_OPTS("[a-b-c-d0d1-d3d4d5d6d7] or [a b c d0 d1 d2 d3 d4 d5 d6 d7]") - BAREBOX_CMD_GROUP(CMD_GRP_MISC) - BAREBOX_CMD_HELP(cmd_efi_handle_dump_help) -BAREBOX_CMD_END diff --git a/drivers/efi/efi-handle.c b/drivers/efi/efi-handle.c new file mode 100644 index 0000000000..be9013cb64 --- /dev/null +++ b/drivers/efi/efi-handle.c @@ -0,0 +1,43 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (c) 2014 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix + */ + +#include <common.h> +#include <efi.h> +#include <efi/efi-util.h> +#include <efi/efi-device.h> +#include <efi/efi-mode.h> + +int __efi_locate_handle(struct efi_boot_services *bs, + enum efi_locate_search_type search_type, + efi_guid_t *protocol, + void *search_key, + unsigned long *no_handles, + efi_handle_t **buffer) +{ + efi_status_t efiret; + unsigned long buffer_size = 0; + efi_handle_t *buf; + + efiret = bs->locate_handle(search_type, protocol, search_key, &buffer_size, + NULL); + if (EFI_ERROR(efiret) && efiret != EFI_BUFFER_TOO_SMALL) + return -efi_errno(efiret); + + buf = malloc(buffer_size); + if (!buf) + return -ENOMEM; + + efiret = bs->locate_handle(search_type, protocol, search_key, &buffer_size, + buf); + if (EFI_ERROR(efiret)) { + free(buf); + return -efi_errno(efiret); + } + + *no_handles = buffer_size / sizeof(efi_handle_t); + *buffer = buf; + + return 0; +} |