Merge tag 'x86_fpu_for_v5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

[linux-2.6-microblaze.git] / arch / x86 / platform / efi / efi_64.c

diff --git a/arch/x86/platform/efi/efi_64.c b/arch/x86/platform/efi/efi_64.c
index cf7b3bf..1b82d77 100644 (file)
--- a/arch/x86/platform/efi/efi_64.c
+++ b/arch/x86/platform/efi/efi_64.c
@@ -54,10 +54,7 @@
  * 0xffff_ffff_0000_0000 and limit EFI VA mapping space to 64G.
  */
 static u64 efi_va = EFI_VA_START;
-
-struct efi_scratch efi_scratch;
-
-EXPORT_SYMBOL_GPL(efi_mm);
+static struct mm_struct *efi_prev_mm;
 
 /*
  * We need our own copy of the higher levels of the page tables
@@ -115,31 +112,12 @@ void efi_sync_low_kernel_mappings(void)
        pud_t *pud_k, *pud_efi;
        pgd_t *efi_pgd = efi_mm.pgd;
 
-       /*
-        * We can share all PGD entries apart from the one entry that
-        * covers the EFI runtime mapping space.
-        *
-        * Make sure the EFI runtime region mappings are guaranteed to
-        * only span a single PGD entry and that the entry also maps
-        * other important kernel regions.
-        */
-       MAYBE_BUILD_BUG_ON(pgd_index(EFI_VA_END) != pgd_index(MODULES_END));
-       MAYBE_BUILD_BUG_ON((EFI_VA_START & PGDIR_MASK) !=
-                       (EFI_VA_END & PGDIR_MASK));
-
        pgd_efi = efi_pgd + pgd_index(PAGE_OFFSET);
        pgd_k = pgd_offset_k(PAGE_OFFSET);
 
        num_entries = pgd_index(EFI_VA_END) - pgd_index(PAGE_OFFSET);
        memcpy(pgd_efi, pgd_k, sizeof(pgd_t) * num_entries);
 
-       /*
-        * As with PGDs, we share all P4D entries apart from the one entry
-        * that covers the EFI runtime mapping space.
-        */
-       BUILD_BUG_ON(p4d_index(EFI_VA_END) != p4d_index(MODULES_END));
-       BUILD_BUG_ON((EFI_VA_START & P4D_MASK) != (EFI_VA_END & P4D_MASK));
-
        pgd_efi = efi_pgd + pgd_index(EFI_VA_END);
        pgd_k = pgd_offset_k(EFI_VA_END);
        p4d_efi = p4d_offset(pgd_efi, 0);
@@ -256,7 +234,7 @@ int __init efi_setup_page_tables(unsigned long pa_memmap, unsigned num_pages)
                return 1;
        }
 
-       efi_scratch.phys_stack = page_to_phys(page + 1); /* stack grows down */
+       efi_mixed_mode_stack_pa = page_to_phys(page + 1); /* stack grows down */
 
        npages = (_etext - _text) >> PAGE_SHIFT;
        text = __pa(_text);
@@ -481,11 +459,17 @@ void __init efi_dump_pagetable(void)
  * can not change under us.
  * It should be ensured that there are no concurent calls to this function.
  */
-void efi_switch_mm(struct mm_struct *mm)
+void efi_enter_mm(void)
+{
+       efi_prev_mm = current->active_mm;
+       current->active_mm = &efi_mm;
+       switch_mm(efi_prev_mm, &efi_mm, NULL);
+}
+
+void efi_leave_mm(void)
 {
-       efi_scratch.prev_mm = current->active_mm;
-       current->active_mm = mm;
-       switch_mm(efi_scratch.prev_mm, mm, NULL);
+       current->active_mm = efi_prev_mm;
+       switch_mm(&efi_mm, efi_prev_mm, NULL);
 }
 
 static DEFINE_SPINLOCK(efi_runtime_lock);
@@ -549,12 +533,12 @@ efi_thunk_set_virtual_address_map(unsigned long memory_map_size,
        efi_sync_low_kernel_mappings();
        local_irq_save(flags);
 
-       efi_switch_mm(&efi_mm);
+       efi_enter_mm();
 
        status = __efi_thunk(set_virtual_address_map, memory_map_size,
                             descriptor_size, descriptor_version, virtual_map);
 
-       efi_switch_mm(efi_scratch.prev_mm);
+       efi_leave_mm();
        local_irq_restore(flags);
 
        return status;
@@ -848,7 +832,7 @@ efi_set_virtual_address_map(unsigned long memory_map_size,
                                                         descriptor_size,
                                                         descriptor_version,
                                                         virtual_map);
-       efi_switch_mm(&efi_mm);
+       efi_enter_mm();
 
        efi_fpu_begin();
 
@@ -864,7 +848,7 @@ efi_set_virtual_address_map(unsigned long memory_map_size,
        /* grab the virtually remapped EFI runtime services table pointer */
        efi.runtime = READ_ONCE(systab->runtime);
 
-       efi_switch_mm(efi_scratch.prev_mm);
+       efi_leave_mm();
 
        return status;
 }