]> git.sur5r.net Git - u-boot/blobdiff - lib/efi_loader/efi_boottime.c
efi_loader: use type bool for event states
[u-boot] / lib / efi_loader / efi_boottime.c
index 7c92a68bf46cf289de1f3273752ffae70953ee6c..cb688e16e93a9a3e02de7b421c0b02e7d52985d4 100644 (file)
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <efi_loader.h>
+#include <environment.h>
 #include <malloc.h>
 #include <asm/global_data.h>
 #include <libfdt_env.h>
@@ -163,14 +164,14 @@ static u64 efi_div10(u64 a)
 void efi_signal_event(struct efi_event *event)
 {
        if (event->notify_function) {
-               event->queued = 1;
+               event->is_queued = true;
                /* Check TPL */
                if (efi_tpl >= event->notify_tpl)
                        return;
                EFI_CALL_VOID(event->notify_function(event,
                                                     event->notify_context));
        }
-       event->queued = 0;
+       event->is_queued = false;
 }
 
 static efi_status_t efi_unsupported(const char *funcname)
@@ -265,6 +266,23 @@ static efi_status_t EFIAPI efi_free_pool_ext(void *buffer)
        return EFI_EXIT(r);
 }
 
+static efi_status_t efi_create_handle(void **handle)
+{
+       struct efi_object *obj;
+       efi_status_t r;
+
+       r = efi_allocate_pool(EFI_ALLOCATE_ANY_PAGES,
+                             sizeof(struct efi_object),
+                             (void **)&obj);
+       if (r != EFI_SUCCESS)
+               return r;
+       memset(obj, 0, sizeof(struct efi_object));
+       obj->handle = obj;
+       list_add_tail(&obj->link, &efi_obj_list);
+       *handle = obj;
+       return r;
+}
+
 /*
  * Our event capabilities are very limited. Only a small limited
  * number of events is allowed to coexist.
@@ -298,8 +316,8 @@ efi_status_t efi_create_event(uint32_t type, UINTN notify_tpl,
                efi_events[i].notify_context = notify_context;
                /* Disable timers on bootup */
                efi_events[i].trigger_next = -1ULL;
-               efi_events[i].queued = 0;
-               efi_events[i].signaled = 0;
+               efi_events[i].is_queued = false;
+               efi_events[i].is_signaled = false;
                *event = &efi_events[i];
                return EFI_SUCCESS;
        }
@@ -332,7 +350,7 @@ void efi_timer_check(void)
        for (i = 0; i < ARRAY_SIZE(efi_events); ++i) {
                if (!efi_events[i].type)
                        continue;
-               if (efi_events[i].queued)
+               if (efi_events[i].is_queued)
                        efi_signal_event(&efi_events[i]);
                if (!(efi_events[i].type & EVT_TIMER) ||
                    now < efi_events[i].trigger_next)
@@ -348,7 +366,7 @@ void efi_timer_check(void)
                default:
                        continue;
                }
-               efi_events[i].signaled = 1;
+               efi_events[i].is_signaled = true;
                efi_signal_event(&efi_events[i]);
        }
        WATCHDOG_RESET();
@@ -385,7 +403,7 @@ efi_status_t efi_set_timer(struct efi_event *event, enum efi_timer_delay type,
                }
                event->trigger_type = type;
                event->trigger_time = trigger_time;
-               event->signaled = 0;
+               event->is_signaled = false;
                return EFI_SUCCESS;
        }
        return EFI_INVALID_PARAMETER;
@@ -422,14 +440,14 @@ static efi_status_t EFIAPI efi_wait_for_event(unsigned long num_events,
 known_event:
                if (!event[i]->type || event[i]->type & EVT_NOTIFY_SIGNAL)
                        return EFI_EXIT(EFI_INVALID_PARAMETER);
-               if (!event[i]->signaled)
+               if (!event[i]->is_signaled)
                        efi_signal_event(event[i]);
        }
 
        /* Wait for signal */
        for (;;) {
                for (i = 0; i < num_events; ++i) {
-                       if (event[i]->signaled)
+                       if (event[i]->is_signaled)
                                goto out;
                }
                /* Allow events to occur. */
@@ -441,7 +459,7 @@ out:
         * Reset the signal which is passed to the caller to allow periodic
         * events to occur.
         */
-       event[i]->signaled = 0;
+       event[i]->is_signaled = false;
        if (index)
                *index = i;
 
@@ -456,9 +474,9 @@ static efi_status_t EFIAPI efi_signal_event_ext(struct efi_event *event)
        for (i = 0; i < ARRAY_SIZE(efi_events); ++i) {
                if (event != &efi_events[i])
                        continue;
-               if (event->signaled)
+               if (event->is_signaled)
                        break;
-               event->signaled = 1;
+               event->is_signaled = true;
                if (event->type & EVT_NOTIFY_SIGNAL)
                        efi_signal_event(event);
                break;
@@ -475,8 +493,8 @@ static efi_status_t EFIAPI efi_close_event(struct efi_event *event)
                if (event == &efi_events[i]) {
                        event->type = 0;
                        event->trigger_next = -1ULL;
-                       event->queued = 0;
-                       event->signaled = 0;
+                       event->is_queued = false;
+                       event->is_signaled = false;
                        return EFI_EXIT(EFI_SUCCESS);
                }
        }
@@ -494,9 +512,9 @@ static efi_status_t EFIAPI efi_check_event(struct efi_event *event)
                        continue;
                if (!event->type || event->type & EVT_NOTIFY_SIGNAL)
                        break;
-               if (!event->signaled)
+               if (!event->is_signaled)
                        efi_signal_event(event);
-               if (event->signaled)
+               if (event->is_signaled)
                        return EFI_EXIT(EFI_SUCCESS);
                return EFI_EXIT(EFI_NOT_READY);
        }
@@ -519,8 +537,9 @@ static efi_status_t EFIAPI efi_install_protocol_interface(void **handle,
 
        /* Create new handle if requested. */
        if (!*handle) {
-               r = EFI_OUT_OF_RESOURCES;
-               goto out;
+               r = efi_create_handle(handle);
+               if (r != EFI_SUCCESS)
+                       goto out;
        }
        /* Find object. */
        list_for_each(lhandle, &efi_obj_list) {
@@ -564,7 +583,7 @@ static efi_status_t EFIAPI efi_install_protocol_interface_ext(void **handle,
                        efi_guid_t *protocol, int protocol_interface_type,
                        void *protocol_interface)
 {
-       EFI_ENTRY("%p, %p, %d, %p", handle, protocol, protocol_interface_type,
+       EFI_ENTRY("%p, %pUl, %d, %p", handle, protocol, protocol_interface_type,
                  protocol_interface);
 
        return EFI_EXIT(efi_install_protocol_interface(handle, protocol,
@@ -576,7 +595,7 @@ static efi_status_t EFIAPI efi_reinstall_protocol_interface(void *handle,
                        efi_guid_t *protocol, void *old_interface,
                        void *new_interface)
 {
-       EFI_ENTRY("%p, %p, %p, %p", handle, protocol, old_interface,
+       EFI_ENTRY("%p, %pUl, %p, %p", handle, protocol, old_interface,
                  new_interface);
        return EFI_EXIT(EFI_ACCESS_DENIED);
 }
@@ -625,7 +644,7 @@ out:
 static efi_status_t EFIAPI efi_uninstall_protocol_interface_ext(void *handle,
                        efi_guid_t *protocol, void *protocol_interface)
 {
-       EFI_ENTRY("%p, %p, %p", handle, protocol, protocol_interface);
+       EFI_ENTRY("%p, %pUl, %p", handle, protocol, protocol_interface);
 
        return EFI_EXIT(efi_uninstall_protocol_interface(handle, protocol,
                                                         protocol_interface));
@@ -635,7 +654,7 @@ static efi_status_t EFIAPI efi_register_protocol_notify(efi_guid_t *protocol,
                                                        struct efi_event *event,
                                                        void **registration)
 {
-       EFI_ENTRY("%p, %p, %p", protocol, event, registration);
+       EFI_ENTRY("%pUl, %p, %p", protocol, event, registration);
        return EFI_EXIT(EFI_OUT_OF_RESOURCES);
 }
 
@@ -705,7 +724,7 @@ static efi_status_t EFIAPI efi_locate_handle_ext(
                        efi_guid_t *protocol, void *search_key,
                        unsigned long *buffer_size, efi_handle_t *buffer)
 {
-       EFI_ENTRY("%d, %p, %p, %p, %p", search_type, protocol, search_key,
+       EFI_ENTRY("%d, %pUl, %p, %p, %p", search_type, protocol, search_key,
                  buffer_size, buffer);
 
        return EFI_EXIT(efi_locate_handle(search_type, protocol, search_key,
@@ -716,8 +735,17 @@ static efi_status_t EFIAPI efi_locate_device_path(efi_guid_t *protocol,
                        struct efi_device_path **device_path,
                        efi_handle_t *device)
 {
-       EFI_ENTRY("%p, %p, %p", protocol, device_path, device);
-       return EFI_EXIT(EFI_NOT_FOUND);
+       struct efi_object *efiobj;
+
+       EFI_ENTRY("%pUl, %p, %p", protocol, device_path, device);
+
+       efiobj = efi_dp_find_obj(*device_path, device_path);
+       if (!efiobj)
+               return EFI_EXIT(EFI_NOT_FOUND);
+
+       *device = efiobj->handle;
+
+       return EFI_EXIT(EFI_SUCCESS);
 }
 
 /* Collapses configuration table entries, removing index i */
@@ -764,10 +792,87 @@ efi_status_t efi_install_configuration_table(const efi_guid_t *guid, void *table
 static efi_status_t EFIAPI efi_install_configuration_table_ext(efi_guid_t *guid,
                                                               void *table)
 {
-       EFI_ENTRY("%p, %p", guid, table);
+       EFI_ENTRY("%pUl, %p", guid, table);
        return EFI_EXIT(efi_install_configuration_table(guid, table));
 }
 
+/* Initialize a loaded_image_info + loaded_image_info object with correct
+ * protocols, boot-device, etc.
+ */
+void efi_setup_loaded_image(struct efi_loaded_image *info, struct efi_object *obj,
+                           struct efi_device_path *device_path,
+                           struct efi_device_path *file_path)
+{
+       obj->handle = info;
+
+       /*
+        * When asking for the device path interface, return
+        * bootefi_device_path
+        */
+       obj->protocols[0].guid = &efi_guid_device_path;
+       obj->protocols[0].protocol_interface = device_path;
+
+       /*
+        * When asking for the loaded_image interface, just
+        * return handle which points to loaded_image_info
+        */
+       obj->protocols[1].guid = &efi_guid_loaded_image;
+       obj->protocols[1].protocol_interface = info;
+
+       obj->protocols[2].guid = &efi_guid_console_control;
+       obj->protocols[2].protocol_interface = (void *)&efi_console_control;
+
+       obj->protocols[3].guid = &efi_guid_device_path_to_text_protocol;
+       obj->protocols[3].protocol_interface =
+               (void *)&efi_device_path_to_text;
+
+       info->file_path = file_path;
+       info->device_handle = efi_dp_find_obj(device_path, NULL);
+
+       list_add_tail(&obj->link, &efi_obj_list);
+}
+
+efi_status_t efi_load_image_from_path(struct efi_device_path *file_path,
+                                     void **buffer)
+{
+       struct efi_file_info *info = NULL;
+       struct efi_file_handle *f;
+       static efi_status_t ret;
+       uint64_t bs;
+
+       f = efi_file_from_path(file_path);
+       if (!f)
+               return EFI_DEVICE_ERROR;
+
+       bs = 0;
+       EFI_CALL(ret = f->getinfo(f, (efi_guid_t *)&efi_file_info_guid,
+                                 &bs, info));
+       if (ret == EFI_BUFFER_TOO_SMALL) {
+               info = malloc(bs);
+               EFI_CALL(ret = f->getinfo(f, (efi_guid_t *)&efi_file_info_guid,
+                                         &bs, info));
+       }
+       if (ret != EFI_SUCCESS)
+               goto error;
+
+       ret = efi_allocate_pool(EFI_LOADER_DATA, info->file_size, buffer);
+       if (ret)
+               goto error;
+
+       EFI_CALL(ret = f->read(f, &info->file_size, *buffer));
+
+error:
+       free(info);
+       EFI_CALL(f->close(f));
+
+       if (ret != EFI_SUCCESS) {
+               efi_free_pool(*buffer);
+               *buffer = NULL;
+       }
+
+       return ret;
+}
+
 static efi_status_t EFIAPI efi_load_image(bool boot_policy,
                                          efi_handle_t parent_image,
                                          struct efi_device_path *file_path,
@@ -775,25 +880,40 @@ static efi_status_t EFIAPI efi_load_image(bool boot_policy,
                                          unsigned long source_size,
                                          efi_handle_t *image_handle)
 {
-       static struct efi_object loaded_image_info_obj = {
-               .protocols = {
-                       {
-                               .guid = &efi_guid_loaded_image,
-                       },
-               },
-       };
        struct efi_loaded_image *info;
        struct efi_object *obj;
 
        EFI_ENTRY("%d, %p, %p, %p, %ld, %p", boot_policy, parent_image,
                  file_path, source_buffer, source_size, image_handle);
-       info = malloc(sizeof(*info));
-       loaded_image_info_obj.protocols[0].protocol_interface = info;
-       obj = malloc(sizeof(loaded_image_info_obj));
-       memset(info, 0, sizeof(*info));
-       memcpy(obj, &loaded_image_info_obj, sizeof(loaded_image_info_obj));
-       obj->handle = info;
-       info->file_path = file_path;
+
+       info = calloc(1, sizeof(*info));
+       obj = calloc(1, sizeof(*obj));
+
+       if (!source_buffer) {
+               struct efi_device_path *dp, *fp;
+               efi_status_t ret;
+
+               ret = efi_load_image_from_path(file_path, &source_buffer);
+               if (ret != EFI_SUCCESS) {
+                       free(info);
+                       free(obj);
+                       return EFI_EXIT(ret);
+               }
+
+               /*
+                * split file_path which contains both the device and
+                * file parts:
+                */
+               efi_dp_split_file_path(file_path, &dp, &fp);
+
+               efi_setup_loaded_image(info, obj, dp, fp);
+       } else {
+               /* In this case, file_path is the "device" path, ie.
+                * something like a HARDWARE_DEVICE:MEMORY_MAPPED
+                */
+               efi_setup_loaded_image(info, obj, file_path, NULL);
+       }
+
        info->reserved = efi_load_pe(source_buffer, info);
        if (!info->reserved) {
                free(info);
@@ -802,7 +922,6 @@ static efi_status_t EFIAPI efi_load_image(bool boot_policy,
        }
 
        *image_handle = info;
-       list_add_tail(&obj->link, &efi_obj_list);
 
        return EFI_EXIT(EFI_SUCCESS);
 }
@@ -900,8 +1019,24 @@ static void efi_exit_caches(void)
 static efi_status_t EFIAPI efi_exit_boot_services(void *image_handle,
                                                  unsigned long map_key)
 {
+       int i;
+
        EFI_ENTRY("%p, %ld", image_handle, map_key);
 
+       /* Notify that ExitBootServices is invoked. */
+       for (i = 0; i < ARRAY_SIZE(efi_events); ++i) {
+               if (efi_events[i].type != EVT_SIGNAL_EXIT_BOOT_SERVICES)
+                       continue;
+               efi_signal_event(&efi_events[i]);
+       }
+       /* Make sure that notification functions are not called anymore */
+       efi_tpl = TPL_HIGH_LEVEL;
+
+#if defined(CONFIG_CMD_SAVEENV) && !defined(CONFIG_ENV_IS_NOWHERE)
+       /* save any EFI variables that have been written: */
+       env_save();
+#endif
+
        board_quiesce_devices();
 
        /* Fix up caches for EFI payloads if necessary */
@@ -966,7 +1101,7 @@ static efi_status_t EFIAPI efi_close_protocol(void *handle,
                                              void *agent_handle,
                                              void *controller_handle)
 {
-       EFI_ENTRY("%p, %p, %p, %p", handle, protocol, agent_handle,
+       EFI_ENTRY("%p, %pUl, %p, %p", handle, protocol, agent_handle,
                  controller_handle);
        return EFI_EXIT(EFI_NOT_FOUND);
 }
@@ -976,7 +1111,7 @@ static efi_status_t EFIAPI efi_open_protocol_information(efi_handle_t handle,
                        struct efi_open_protocol_info_entry **entry_buffer,
                        unsigned long *entry_count)
 {
-       EFI_ENTRY("%p, %p, %p, %p", handle, protocol, entry_buffer,
+       EFI_ENTRY("%p, %pUl, %p, %p", handle, protocol, entry_buffer,
                  entry_count);
        return EFI_EXIT(EFI_NOT_FOUND);
 }
@@ -1042,7 +1177,7 @@ static efi_status_t EFIAPI efi_locate_handle_buffer(
        efi_status_t r;
        unsigned long buffer_size = 0;
 
-       EFI_ENTRY("%d, %p, %p, %p, %p", search_type, protocol, search_key,
+       EFI_ENTRY("%d, %pUl, %p, %p, %p", search_type, protocol, search_key,
                  no_handles, buffer);
 
        if (!no_handles || !buffer) {
@@ -1074,7 +1209,7 @@ static efi_status_t EFIAPI efi_locate_protocol(efi_guid_t *protocol,
        struct list_head *lhandle;
        int i;
 
-       EFI_ENTRY("%p, %p, %p", protocol, registration, protocol_interface);
+       EFI_ENTRY("%pUl, %p, %p", protocol, registration, protocol_interface);
 
        if (!protocol || !protocol_interface)
                return EFI_EXIT(EFI_INVALID_PARAMETER);
@@ -1184,7 +1319,7 @@ static efi_status_t EFIAPI efi_open_protocol(
        int i;
        efi_status_t r = EFI_INVALID_PARAMETER;
 
-       EFI_ENTRY("%p, %p, %p, %p, %p, 0x%x", handle, protocol,
+       EFI_ENTRY("%p, %pUl, %p, %p, %p, 0x%x", handle, protocol,
                  protocol_interface, agent_handle, controller_handle,
                  attributes);