Merge branch 'x86-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'x86-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86, efi: Properly pre-initialize table pointers
  x86, efi: Add infrastructure for UEFI 2.0 runtime services
  x86, efi: Fix argument types for SetVariable()

1 files changed, 49 insertions, 2 deletions

diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c
index cfc588ce115..3ae4128013e 100644
--- a/arch/x86/platform/efi/efi.c
+++ b/arch/x86/platform/efi/efi.c
@@ -51,7 +51,17 @@
 int efi_enabled;
 EXPORT_SYMBOL(efi_enabled);
 
-struct efi efi;
+struct efi __read_mostly efi = {
+        .mps        = EFI_INVALID_TABLE_ADDR,
+        .acpi       = EFI_INVALID_TABLE_ADDR,
+        .acpi20     = EFI_INVALID_TABLE_ADDR,
+        .smbios     = EFI_INVALID_TABLE_ADDR,
+        .sal_systab = EFI_INVALID_TABLE_ADDR,
+        .boot_info  = EFI_INVALID_TABLE_ADDR,
+        .hcdp       = EFI_INVALID_TABLE_ADDR,
+        .uga        = EFI_INVALID_TABLE_ADDR,
+        .uv_systab  = EFI_INVALID_TABLE_ADDR,
+};
 EXPORT_SYMBOL(efi);
 
 struct efi_memory_map memmap;
@@ -146,7 +156,7 @@ static efi_status_t virt_efi_get_next_variable(unsigned long *name_size,
 
 static efi_status_t virt_efi_set_variable(efi_char16_t *name,
                                           efi_guid_t *vendor,
-                                          unsigned long attr,
+                                          u32 attr,
                                           unsigned long data_size,
                                           void *data)
 {
@@ -155,6 +165,18 @@ static efi_status_t virt_efi_set_variable(efi_char16_t *name,
                               data_size, data);
 }
 
+static efi_status_t virt_efi_query_variable_info(u32 attr,
+                                                 u64 *storage_space,
+                                                 u64 *remaining_space,
+                                                 u64 *max_variable_size)
+{
+        if (efi.runtime_version < EFI_2_00_SYSTEM_TABLE_REVISION)
+                return EFI_UNSUPPORTED;
+
+        return efi_call_virt4(query_variable_info, attr, storage_space,
+                              remaining_space, max_variable_size);
+}
+
 static efi_status_t virt_efi_get_next_high_mono_count(u32 *count)
 {
         return efi_call_virt1(get_next_high_mono_count, count);
@@ -169,6 +191,28 @@ static void virt_efi_reset_system(int reset_type,
                        data_size, data);
 }
 
+static efi_status_t virt_efi_update_capsule(efi_capsule_header_t **capsules,
+                                            unsigned long count,
+                                            unsigned long sg_list)
+{
+        if (efi.runtime_version < EFI_2_00_SYSTEM_TABLE_REVISION)
+                return EFI_UNSUPPORTED;
+
+        return efi_call_virt3(update_capsule, capsules, count, sg_list);
+}
+
+static efi_status_t virt_efi_query_capsule_caps(efi_capsule_header_t **capsules,
+                                                unsigned long count,
+                                                u64 *max_size,
+                                                int *reset_type)
+{
+        if (efi.runtime_version < EFI_2_00_SYSTEM_TABLE_REVISION)
+                return EFI_UNSUPPORTED;
+
+        return efi_call_virt4(query_capsule_caps, capsules, count, max_size,
+                              reset_type);
+}
+
 static efi_status_t __init phys_efi_set_virtual_address_map(
         unsigned long memory_map_size,
         unsigned long descriptor_size,
@@ -696,6 +740,9 @@ void __init efi_enter_virtual_mode(void)
         efi.get_next_high_mono_count = virt_efi_get_next_high_mono_count;
         efi.reset_system = virt_efi_reset_system;
         efi.set_virtual_address_map = NULL;
+        efi.query_variable_info = virt_efi_query_variable_info;
+        efi.update_capsule = virt_efi_update_capsule;
+        efi.query_capsule_caps = virt_efi_query_capsule_caps;
         if (__supported_pte_mask & _PAGE_NX)
                 runtime_code_page_mkexec();
         early_iounmap(memmap.map, memmap.nr_map * memmap.desc_size);