[U-Boot] [PATCH 2/4] efi_loader: Add an EFI_CALL() macro

Rob Clark
2017-07-27T12:04:17Z

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>
---
include/efi_loader.h | 17 +++++++++++++++++
lib/efi_loader/efi_boottime.c | 4 +---
2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/include/efi_loader.h b/include/efi_loader.h
index 9700a88d69..eb16c14b69 100644
--- 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 17c531a480..849d229821 100644
--- 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));
}
}

--
2.13.0