efi/libstub: Enable reset attack mitigation

[linux.git] / include / linux / efi.h

diff --git a/include/linux/efi.h b/include/linux/efi.h
index 8269bcb8ccf7961bd01f52e39fc4d34d370f25d3..c241acca0b15414bac9ce824d6638eb75f4fcda5 100644 (file)
--- a/include/linux/efi.h
+++ b/include/linux/efi.h
@@ -985,7 +985,7 @@ static inline void efi_esrt_init(void) { }
 extern int efi_config_parse_tables(void *config_tables, int count, int sz,
                                   efi_config_table_type_t *arch_tables);
 extern u64 efi_get_iobase (void);
 extern int efi_config_parse_tables(void *config_tables, int count, int sz,
                                   efi_config_table_type_t *arch_tables);
 extern u64 efi_get_iobase (void);

-extern u32 efi_mem_type (unsigned long phys_addr);
+extern int efi_mem_type(unsigned long phys_addr);

 extern u64 efi_mem_attributes (unsigned long phys_addr);
 extern u64 efi_mem_attribute (unsigned long phys_addr, unsigned long size);
 extern int __init efi_uart_console_only (void);
 extern u64 efi_mem_attributes (unsigned long phys_addr);
 extern u64 efi_mem_attribute (unsigned long phys_addr, unsigned long size);
 extern int __init efi_uart_console_only (void);


@@ -1091,6 +1091,8 @@ static inline bool efi_enabled(int feature)
        return test_bit(feature, &efi.flags) != 0;
 }
 extern void efi_reboot(enum reboot_mode reboot_mode, const char *__unused);
        return test_bit(feature, &efi.flags) != 0;
 }
 extern void efi_reboot(enum reboot_mode reboot_mode, const char *__unused);

+
+extern bool efi_is_table_address(unsigned long phys_addr);

 #else
 static inline bool efi_enabled(int feature)
 {
 #else
 static inline bool efi_enabled(int feature)
 {


@@ -1104,6 +1106,11 @@ efi_capsule_pending(int *reset_type)
 {
        return false;
 }
 {
        return false;
 }

+
+static inline bool efi_is_table_address(unsigned long phys_addr)
+{
+       return false;
+}

 #endif
 
 extern int efi_status_to_err(efi_status_t status);
 #endif
 
 extern int efi_status_to_err(efi_status_t status);


@@ -1497,6 +1504,13 @@ enum efi_secureboot_mode {
 };
 enum efi_secureboot_mode efi_get_secureboot(efi_system_table_t *sys_table);
 
 };
 enum efi_secureboot_mode efi_get_secureboot(efi_system_table_t *sys_table);
 

+#ifdef CONFIG_RESET_ATTACK_MITIGATION
+void efi_enable_reset_attack_mitigation(efi_system_table_t *sys_table_arg);
+#else
+static inline void
+efi_enable_reset_attack_mitigation(efi_system_table_t *sys_table_arg) { }
+#endif
+

 /*
  * Arch code can implement the following three template macros, avoiding
  * reptition for the void/non-void return cases of {__,}efi_call_virt():
 /*
  * Arch code can implement the following three template macros, avoiding
  * reptition for the void/non-void return cases of {__,}efi_call_virt():