efi_loader: Add an EFI_CALL() macro

Rather than open-coding EFI_EXIT() + callback + EFI_ENTRY(), introduce
an EFI_CALL() macro.  This makes callbacks into UEFI world (of which
there will be more in the future) more concise and easier to locate in
the code.

Signed-off-by: Rob Clark <robdclark@gmail.com>
Signed-off-by: Alexander Graf <agraf@suse.de>

diff --git a/include/efi_loader.h b/include/efi_loader.h
index 9700a88d6998fb6b0331e45fb0975486a4ca0f9d..eb16c14b6995ca60852859c6b12be5a4bbba9537 100644 (file)
--- a/include/efi_loader.h
+++ b/include/efi_loader.h
@@ -15,17 +15,34 @@
 
 #include <linux/list.h>
 
+/*
+ * Enter the u-boot world from UEFI:
+ */
 #define EFI_ENTRY(format, ...) do { \
        efi_restore_gd(); \
        debug("EFI: Entry %s(" format ")\n", __func__, ##__VA_ARGS__); \
        } while(0)
 
+/*
+ * Exit the u-boot world back to UEFI:
+ */
 #define EFI_EXIT(ret) ({ \
        efi_status_t _r = ret; \
        debug("EFI: Exit: %s: %u\n", __func__, (u32)(_r & ~EFI_ERROR_MASK)); \
        efi_exit_func(_r); \
        })
 
+/*
+ * Callback into UEFI world from u-boot:
+ */
+#define EFI_CALL(exp) do { \
+       debug("EFI: Call: %s\n", #exp); \
+       efi_exit_func(EFI_SUCCESS); \
+       exp; \
+       efi_restore_gd(); \
+       debug("EFI: Return From: %s\n", #exp); \
+       } while(0)
+
 extern struct efi_runtime_services efi_runtime_services;
 extern struct efi_system_table systab;
 

diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c
index 17c531a480e145dcc31acccbb5eec78990b067cc..849d2298213b0490d7dbc4a2fc02a086d2e92464 100644 (file)
--- a/lib/efi_loader/efi_boottime.c
+++ b/lib/efi_loader/efi_boottime.c
@@ -120,9 +120,7 @@ void efi_signal_event(struct efi_event *event)
                return;
        event->signaled = 1;
        if (event->type & EVT_NOTIFY_SIGNAL) {
-               EFI_EXIT(EFI_SUCCESS);
-               event->notify_function(event, event->notify_context);
-               EFI_ENTRY("returning from notification function");
+               EFI_CALL(event->notify_function(event, event->notify_context));
        }
 }