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

Pull x86 EFI update from Peter Anvin:
 "EFI tree, from Matt Fleming.  Most of the patches are the new efivarfs
  filesystem by Matt Garrett & co.  The balance are support for EFI
  wallclock in the absence of a hardware-specific driver, and various
  fixes and cleanups."

* 'core-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (24 commits)
  efivarfs: Make efivarfs_fill_super() static
  x86, efi: Check table header length in efi_bgrt_init()
  efivarfs: Use query_variable_info() to limit kmalloc()
  efivarfs: Fix return value of efivarfs_file_write()
  efivarfs: Return a consistent error when efivarfs_get_inode() fails
  efivarfs: Make 'datasize' unsigned long
  efivarfs: Add unique magic number
  efivarfs: Replace magic number with sizeof(attributes)
  efivarfs: Return an error if we fail to read a variable
  efi: Clarify GUID length calculations
  efivarfs: Implement exclusive access for {get,set}_variable
  efivarfs: efivarfs_fill_super() ensure we clean up correctly on error
  efivarfs: efivarfs_fill_super() ensure we free our temporary name
  efivarfs: efivarfs_fill_super() fix inode reference counts
  efivarfs: efivarfs_create() ensure we drop our reference on inode on error
  efivarfs: efivarfs_file_read ensure we free data in error paths
  x86-64/efi: Use EFI to deal with platform wall clock (again)
  x86/kernel: remove tboot 1:1 page table creation code
  x86, efi: 1:1 pagetable mapping for virtual EFI calls
  x86, mm: Include the entire kernel memory map in trampoline_pgd
  ...

3 files changed, 21 insertions, 26 deletions

diff --git a/arch/x86/platform/efi/efi-bgrt.c b/arch/x86/platform/efi/efi-bgrt.c
index f6a0c1b8e518..d9c1b95af17c 100644
--- a/arch/x86/platform/efi/efi-bgrt.c
+++ b/arch/x86/platform/efi/efi-bgrt.c
@@ -39,6 +39,8 @@ void efi_bgrt_init(void)
         if (ACPI_FAILURE(status))
                 return;
 
+        if (bgrt_tab->header.length < sizeof(*bgrt_tab))
+                return;
         if (bgrt_tab->version != 1)
                 return;
         if (bgrt_tab->image_type != 0 || !bgrt_tab->image_address)
diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c
index ad4439145f85..0a34d9e9c263 100644
--- a/arch/x86/platform/efi/efi.c
+++ b/arch/x86/platform/efi/efi.c
@@ -239,22 +239,7 @@ static efi_status_t __init phys_efi_set_virtual_address_map(
         return status;
 }
 
-static efi_status_t __init phys_efi_get_time(efi_time_t *tm,
-                                             efi_time_cap_t *tc)
-{
-        unsigned long flags;
-        efi_status_t status;
-
-        spin_lock_irqsave(&rtc_lock, flags);
-        efi_call_phys_prelog();
-        status = efi_call_phys2(efi_phys.get_time, virt_to_phys(tm),
-                                virt_to_phys(tc));
-        efi_call_phys_epilog();
-        spin_unlock_irqrestore(&rtc_lock, flags);
-        return status;
-}
-
-int efi_set_rtc_mmss(unsigned long nowtime)
+static int efi_set_rtc_mmss(unsigned long nowtime)
 {
         int real_seconds, real_minutes;
         efi_status_t    status;
@@ -283,7 +268,7 @@ int efi_set_rtc_mmss(unsigned long nowtime)
         return 0;
 }
 
-unsigned long efi_get_time(void)
+static unsigned long efi_get_time(void)
 {
         efi_status_t status;
         efi_time_t eft;
@@ -639,18 +624,13 @@ static int __init efi_runtime_init(void)
         }
         /*
          * We will only need *early* access to the following
-         * two EFI runtime services before set_virtual_address_map
+         * EFI runtime service before set_virtual_address_map
          * is invoked.
          */
-        efi_phys.get_time = (efi_get_time_t *)runtime->get_time;
         efi_phys.set_virtual_address_map =
                 (efi_set_virtual_address_map_t *)
                 runtime->set_virtual_address_map;
-        /*
-         * Make efi_get_time can be called before entering
-         * virtual mode.
-         */
-        efi.get_time = phys_efi_get_time;
+
         early_iounmap(runtime, sizeof(efi_runtime_services_t));
 
         return 0;
@@ -736,12 +716,10 @@ void __init efi_init(void)
                 efi_enabled = 0;
                 return;
         }
-#ifdef CONFIG_X86_32
         if (efi_is_native()) {
                 x86_platform.get_wallclock = efi_get_time;
                 x86_platform.set_wallclock = efi_set_rtc_mmss;
         }
-#endif
 
 #if EFI_DEBUG
         print_efi_memmap();
diff --git a/arch/x86/platform/efi/efi_64.c b/arch/x86/platform/efi/efi_64.c
index 95fd505dfeb6..06c8b2e662ab 100644
--- a/arch/x86/platform/efi/efi_64.c
+++ b/arch/x86/platform/efi/efi_64.c
@@ -58,6 +58,21 @@ static void __init early_code_mapping_set_exec(int executable)
         }
 }
 
+unsigned long efi_call_virt_prelog(void)
+{
+        unsigned long saved;
+
+        saved = read_cr3();
+        write_cr3(real_mode_header->trampoline_pgd);
+
+        return saved;
+}
+
+void efi_call_virt_epilog(unsigned long saved)
+{
+        write_cr3(saved);
+}
+
 void __init efi_call_phys_prelog(void)
 {
         unsigned long vaddress;