Merge branch 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6

[linux-2.6] / arch / x86 / kernel / efi_64.c

diff --git a/arch/x86/kernel/efi_64.c b/arch/x86/kernel/efi_64.c
index f2000dbc719511fd26da6199e69f97603d97885a..09d5c23309342779ca955e641a408657a7395ec8 100644 (file)
--- a/arch/x86/kernel/efi_64.c
+++ b/arch/x86/kernel/efi_64.c
@@ -33,26 +33,18 @@
 #include <asm/e820.h>
 #include <asm/pgtable.h>
 #include <asm/tlbflush.h>
-#include <asm/cacheflush.h>
 #include <asm/proto.h>
 #include <asm/efi.h>
 
 static pgd_t save_pgd __initdata;
 static unsigned long efi_flags __initdata;
 
-static int __init setup_noefi(char *arg)
-{
-       efi_enabled = 0;
-       return 0;
-}
-early_param("noefi", setup_noefi);
-
 static void __init early_mapping_set_exec(unsigned long start,
                                          unsigned long end,
                                          int executable)
 {
        pte_t *kpte;
-       int level;
+       unsigned int level;
 
        while (start < end) {
                kpte = lookup_address((unsigned long)__va(start), &level);
@@ -62,10 +54,10 @@ static void __init early_mapping_set_exec(unsigned long start,
                else
                        set_pte(kpte, __pte((pte_val(*kpte) | _PAGE_NX) & \
                                            __supported_pte_mask));
-               if (pte_huge(*kpte))
-                       start = (start + PMD_SIZE) & PMD_MASK;
-               else
+               if (level == PG_LEVEL_4K)
                        start = (start + PAGE_SIZE) & PAGE_MASK;
+               else
+                       start = (start + PMD_SIZE) & PMD_MASK;
        }
 }
 
@@ -74,6 +66,9 @@ static void __init early_runtime_code_mapping_set_exec(int executable)
        efi_memory_desc_t *md;
        void *p;
 
+       if (!(__supported_pte_mask & _PAGE_NX))
+               return;
+
        /* Make EFI runtime service code area executable */
        for (p = memmap.map; p < memmap.map_end; p += memmap.desc_size) {
                md = p;
@@ -92,7 +87,7 @@ void __init efi_call_phys_prelog(void)
        local_irq_save(efi_flags);
        early_runtime_code_mapping_set_exec(1);
        vaddress = (unsigned long)__va(0x0UL);
-       pgd_val(save_pgd) = pgd_val(*pgd_offset_k(0x0UL));
+       save_pgd = *pgd_offset_k(0x0UL);
        set_pgd(pgd_offset_k(0x0UL), *pgd_offset_k(vaddress));
        __flush_tlb_all();
 }
@@ -108,54 +103,29 @@ void __init efi_call_phys_epilog(void)
        local_irq_restore(efi_flags);
 }
 
-/*
- * We need to map the EFI memory map again after init_memory_mapping().
- */
-void __init efi_map_memmap(void)
-{
-       memmap.map = __va(memmap.phys_map);
-       memmap.map_end = memmap.map + (memmap.nr_map * memmap.desc_size);
-}
-
 void __init efi_reserve_bootmem(void)
 {
        reserve_bootmem_generic((unsigned long)memmap.phys_map,
                                memmap.nr_map * memmap.desc_size);
 }
 
-void __init runtime_code_page_mkexec(void)
-{
-       efi_memory_desc_t *md;
-       void *p;
-
-       /* Make EFI runtime service code area executable */
-       for (p = memmap.map; p < memmap.map_end; p += memmap.desc_size) {
-               md = p;
-               if (md->type == EFI_RUNTIME_SERVICES_CODE)
-                       change_page_attr_addr(md->virt_addr,
-                                             md->num_pages,
-                                             PAGE_KERNEL_EXEC);
-       }
-       __flush_tlb_all();
-}
-
-void __iomem * __init efi_ioremap(unsigned long offset,
-                                 unsigned long size)
+void __iomem * __init efi_ioremap(unsigned long phys_addr, unsigned long size)
 {
        static unsigned pages_mapped;
-       unsigned long last_addr;
        unsigned i, pages;
 
-       last_addr = offset + size - 1;
-       offset &= PAGE_MASK;
-       pages = (PAGE_ALIGN(last_addr) - offset) >> PAGE_SHIFT;
+       /* phys_addr and size must be page aligned */
+       if ((phys_addr & ~PAGE_MASK) || (size & ~PAGE_MASK))
+               return NULL;
+
+       pages = size >> PAGE_SHIFT;
        if (pages_mapped + pages > MAX_EFI_IO_PAGES)
                return NULL;
 
        for (i = 0; i < pages; i++) {
-               set_fixmap_nocache(FIX_EFI_IO_MAP_FIRST_PAGE - pages_mapped,
-                                  offset);
-               offset += PAGE_SIZE;
+               __set_fixmap(FIX_EFI_IO_MAP_FIRST_PAGE - pages_mapped,
+                            phys_addr, PAGE_KERNEL);
+               phys_addr += PAGE_SIZE;
                pages_mapped++;
        }