diff options
Diffstat (limited to 'drivers/efi/efi-device.c')
-rw-r--r-- | drivers/efi/efi-device.c | 256 |
1 files changed, 30 insertions, 226 deletions
diff --git a/drivers/efi/efi-device.c b/drivers/efi/efi-device.c index f91d09e8ea..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,35 +26,13 @@ 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) +static struct efi_device *efi_find_device(efi_handle_t handle) { - struct device_d *dev; + struct device *dev; struct efi_device *efidev; bus_for_each_device(&efi_bus, dev) { @@ -68,7 +45,7 @@ static struct efi_device *efi_find_device(efi_handle_t *handle) return NULL; } -static void efi_devinfo(struct device_d *dev) +static void efi_devinfo(struct device *dev) { struct efi_device *efidev = to_efi_device(dev); int i; @@ -80,10 +57,10 @@ static void efi_devinfo(struct device_d *dev) efi_guid_string(&efidev->guids[i])); } -static efi_handle_t *efi_find_parent(efi_handle_t *handle) +static efi_handle_t efi_find_parent(efi_handle_t handle) { unsigned long handle_count = 0; - efi_handle_t *handles = NULL, *parent; + efi_handle_t *handles = NULL, parent; unsigned long num_guids; efi_guid_t **guids; int ret, i, j, k; @@ -91,7 +68,7 @@ static efi_handle_t *efi_find_parent(efi_handle_t *handle) struct efi_open_protocol_information_entry *entry_buffer; unsigned long entry_count; - ret = efi_locate_handle(by_protocol, &efi_device_path_protocol_guid, + ret = efi_locate_handle(BY_PROTOCOL, &efi_device_path_protocol_guid, NULL, &handle_count, &handles); if (ret) return NULL; @@ -134,7 +111,7 @@ out: return parent; } -static struct efi_device *efi_add_device(efi_handle_t *handle, efi_guid_t **guids, +static struct efi_device *efi_add_device(efi_handle_t handle, efi_guid_t **guids, int num_guids) { struct efi_device *efidev; @@ -192,10 +169,11 @@ static int efi_register_device(struct efi_device *efidev) * of the main MAC messaging device. Don't register these in barebox as * they would show up as duplicate ethernet devices. */ - if (device_path_to_type(efidev->devpath) == MESSAGING_DEVICE_PATH) { + if (device_path_to_type(efidev->devpath) == DEVICE_PATH_TYPE_MESSAGING_DEVICE) { u8 subtype = device_path_to_subtype(efidev->devpath); - if (subtype == MSG_IPv4_DP || subtype == MSG_IPv6_DP) + if (subtype == DEVICE_PATH_SUB_TYPE_MSG_IPv4 || + subtype == DEVICE_PATH_SUB_TYPE_MSG_IPv6) return -EINVAL; } @@ -238,14 +216,14 @@ static int efi_register_device(struct efi_device *efidev) void efi_register_devices(void) { unsigned long handle_count = 0; - efi_handle_t *handles = NULL; + efi_handle_t *handles = NULL; unsigned long num_guids; efi_guid_t **guids; int ret, i; struct efi_device **efidevs; int registered; - ret = efi_locate_handle(by_protocol, &efi_device_path_protocol_guid, + ret = efi_locate_handle(BY_PROTOCOL, &efi_device_path_protocol_guid, NULL, &handle_count, &handles); if (ret) return; @@ -290,7 +268,7 @@ int efi_connect_all(void) efi_handle_t *handle_buffer; int i; - efiret = BS->locate_handle_buffer(all_handles, NULL, NULL, &handle_count, + efiret = BS->locate_handle_buffer(ALL_HANDLES, NULL, NULL, &handle_count, &handle_buffer); if (EFI_ERROR(efiret)) return -efi_errno(efiret); @@ -304,7 +282,7 @@ int efi_connect_all(void) return 0; } -static int efi_bus_match(struct device_d *dev, struct driver_d *drv) +static int efi_bus_match(struct device *dev, struct driver *drv) { struct efi_driver *efidrv = to_efi_driver(drv); struct efi_device *efidev = to_efi_device(dev); @@ -321,7 +299,7 @@ static int efi_bus_match(struct device_d *dev, struct driver_d *drv) return 1; } -static int efi_bus_probe(struct device_d *dev) +static int efi_bus_probe(struct device *dev) { struct efi_driver *efidrv = to_efi_driver(dev->driver); struct efi_device *efidev = to_efi_device(dev); @@ -329,7 +307,7 @@ static int efi_bus_probe(struct device_d *dev) return efidrv->probe(efidev); } -static void efi_bus_remove(struct device_d *dev) +static void efi_bus_remove(struct device *dev) { struct efi_driver *efidrv = to_efi_driver(dev->driver); struct efi_device *efidev = to_efi_device(dev); @@ -345,15 +323,14 @@ struct bus_type efi_bus = { .remove = efi_bus_remove, }; -static void efi_businfo(struct device_d *dev) +static void efi_businfo(struct device *dev) { - int i; + struct efi_config_table *t; + int i = 0; printf("Tables:\n"); - for (i = 0; i < efi_sys_table->nr_tables; i++) { - efi_config_table_t *t = &efi_sys_table->tables[i]; - - printf(" %d: %pUl: %s\n", i, &t->guid, + for_each_efi_config_table(t) { + printf(" %d: %pUl: %s\n", i++, &t->guid, efi_guid_string(&t->guid)); } } @@ -403,10 +380,7 @@ static void efi_set_bootsource(void) enum bootsource src = BOOTSOURCE_UNKNOWN; int instance = BOOTSOURCE_INSTANCE_UNKNOWN; - efi_handle_t *efi_parent; - - if (!efi_loaded_image->parent_handle) - goto out; + efi_handle_t efi_parent; efi_parent = efi_find_parent(efi_loaded_image->device_handle); @@ -426,8 +400,7 @@ static void efi_set_bootsource(void) out: - bootsource_set(src); - bootsource_set_instance(instance); + bootsource_set_raw(src, instance); } static int efi_init_devices(void) @@ -464,14 +437,14 @@ static int efi_init_devices(void) return 0; } -core_initcall(efi_init_devices); +core_efi_initcall(efi_init_devices); void efi_pause_devices(void) { - struct device_d *dev; + struct device *dev; bus_for_each_device(&efi_bus, dev) { - struct driver_d *drv = dev->driver; + struct driver *drv = dev->driver; struct efi_device *efidev = to_efi_device(dev); struct efi_driver *efidrv; @@ -487,10 +460,10 @@ void efi_pause_devices(void) void efi_continue_devices(void) { - struct device_d *dev; + struct device *dev; bus_for_each_device(&efi_bus, dev) { - struct driver_d *drv = dev->driver; + struct driver *drv = dev->driver; struct efi_device *efidev = to_efi_device(dev); struct efi_driver *efidrv; @@ -503,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 |