efi/runtime-wrappers: Remove duplicated macro for service returning void

__efi_call_virt() exists as an alternative for efi_call_virt() for the
sole reason that ResetSystem() returns void, and so we cannot use a call
to it in the RHS of an assignment.

Given that there is only a single user, let's drop the macro, and expand
it into the caller. That way, the remaining macro can be tightened
somewhat in terms of type safety too.

Note that the use of typeof() on the runtime service invocation does not
result in an actual call being made, but it does require a few pointer
types to be fixed up and converted into the proper function pointer
prototypes.

Signed-off-by: Ard Biesheuvel <ardb@kernel.org>

diff --git a/arch/x86/include/asm/uv/bios.h b/arch/x86/include/asm/uv/bios.h
index 1b6455f881f90e9c948ceeb07b8c4c697a45bebf..6989b824fd321b539a07ba932225c6eb288a8876 100644 (file)
--- a/arch/x86/include/asm/uv/bios.h
+++ b/arch/x86/include/asm/uv/bios.h
@@ -10,6 +10,7 @@
  * Copyright (c) Russ Anderson <rja@sgi.com>
  */
 
+#include <linux/efi.h>
 #include <linux/rtc.h>
 
 /*
@@ -115,7 +116,8 @@ struct uv_arch_type_entry {
 struct uv_systab {
        char signature[4];      /* must be UV_SYSTAB_SIG */
        u32 revision;           /* distinguish different firmware revs */
-       u64 function;           /* BIOS runtime callback function ptr */
+       u64 (__efiapi *function)(enum uv_bios_cmd, ...);
+                               /* BIOS runtime callback function ptr */
        u32 size;               /* systab size (starting with _VERSION_UV4) */
        struct {
                u32 type:8;     /* type of entry */

diff --git a/drivers/acpi/prmt.c b/drivers/acpi/prmt.c
index 3d4c4620f9f953096dcf265ccf9c36c8c1cf15da..71b9adaaf33b93cf19f52b85c10cf93b84f3700e 100644 (file)
--- a/drivers/acpi/prmt.c
+++ b/drivers/acpi/prmt.c
@@ -53,7 +53,7 @@ static LIST_HEAD(prm_module_list);
 
 struct prm_handler_info {
        guid_t guid;
-       void *handler_addr;
+       efi_status_t (__efiapi *handler_addr)(u64, void *);
        u64 static_data_buffer_addr;
        u64 acpi_param_buffer_addr;
 

diff --git a/drivers/firmware/efi/runtime-wrappers.c b/drivers/firmware/efi/runtime-wrappers.c
index ee5c9a3e506043982292d8ae6dea16b5802f577f..c5e0c73cc000ed25972dcbb671e269b9101eb20c 100644 (file)
--- a/drivers/firmware/efi/runtime-wrappers.c
+++ b/drivers/firmware/efi/runtime-wrappers.c
@@ -41,8 +41,6 @@
  */
 #define efi_call_virt(f, args...)   \
        efi_call_virt_pointer(efi.runtime, f, args)
-#define __efi_call_virt(f, args...) \
-       __efi_call_virt_pointer(efi.runtime, f, args)
 
 union efi_rts_args {
        struct {
@@ -491,8 +489,13 @@ static void virt_efi_reset_system(int reset_type,
                        "could not get exclusive access to the firmware\n");
                return;
        }
+
+       arch_efi_call_virt_setup();
        efi_rts_work.efi_rts_id = EFI_RESET_SYSTEM;
-       __efi_call_virt(reset_system, reset_type, status, data_size, data);
+       arch_efi_call_virt(efi.runtime, reset_system, reset_type, status,
+                          data_size, data);
+       arch_efi_call_virt_teardown();
+
        up(&efi_runtime_lock);
 }
 

diff --git a/include/linux/efi.h b/include/linux/efi.h
index 9d09dba116ce21abdfeaabf117809e3a20878eb7..28ac4e4a725d32a91ac75fc0ba9dccf2d7b19b32 100644 (file)
--- a/include/linux/efi.h
+++ b/include/linux/efi.h
@@ -1170,8 +1170,7 @@ static inline void efi_check_for_embedded_firmwares(void) { }
 #define arch_efi_call_virt(p, f, args...)      ((p)->f(args))
 
 /*
- * Arch code can implement the following three template macros, avoiding
- * reptition for the void/non-void return cases of {__,}efi_call_virt():
+ * Arch code must implement the following three routines:
  *
  *  * arch_efi_call_virt_setup()
  *
@@ -1180,9 +1179,8 @@ static inline void efi_check_for_embedded_firmwares(void) { }
  *
  *  * arch_efi_call_virt()
  *
- *    Performs the call. The last expression in the macro must be the call
- *    itself, allowing the logic to be shared by the void and non-void
- *    cases.
+ *    Performs the call. This routine takes a variable number of arguments so
+ *    it must be implemented as a variadic preprocessor macro.
  *
  *  * arch_efi_call_virt_teardown()
  *
@@ -1191,7 +1189,7 @@ static inline void efi_check_for_embedded_firmwares(void) { }
 
 #define efi_call_virt_pointer(p, f, args...)                           \
 ({                                                                     \
-       efi_status_t __s;                                               \
+       typeof((p)->f(args)) __s;                                       \
        unsigned long __flags;                                          \
                                                                        \
        arch_efi_call_virt_setup();                                     \
@@ -1205,19 +1203,6 @@ static inline void efi_check_for_embedded_firmwares(void) { }
        __s;                                                            \
 })
 
-#define __efi_call_virt_pointer(p, f, args...)                         \
-({                                                                     \
-       unsigned long __flags;                                          \
-                                                                       \
-       arch_efi_call_virt_setup();                                     \
-                                                                       \
-       __flags = efi_call_virt_save_flags();                           \
-       arch_efi_call_virt(p, f, args);                                 \
-       efi_call_virt_check_flags(__flags, __stringify(f));             \
-                                                                       \
-       arch_efi_call_virt_teardown();                                  \
-})
-
 #define EFI_RANDOM_SEED_SIZE           32U // BLAKE2S_HASH_SIZE
 
 struct linux_efi_random_seed {