efi/arm: Drop unnecessary references to efi.systab

Instead of populating efi.systab very early during efi_init() with
a mapping that is released again before the function exits, use a
local variable here. Now that we use efi.runtime to access the runtime
services table, this removes the only reference efi.systab, so there is
no need to populate it anymore, or discover its virtually remapped
address. So drop the references entirely.

Tested-by: Tony Luck <tony.luck@intel.com> # arch/ia64
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>

diff --git a/drivers/firmware/efi/arm-init.c b/drivers/firmware/efi/arm-init.c
index 77048f7a96596a16cac04db7053dcc1e17412a5f..76bf5b22e49e2f572c49d1264d6c17074606b5fe 100644 (file)
--- a/drivers/firmware/efi/arm-init.c
+++ b/drivers/firmware/efi/arm-init.c
@@ -22,8 +22,6 @@
 
 #include <asm/efi.h>
 
-u64 efi_system_table;
-
 static int __init is_memory(efi_memory_desc_t *md)
 {
        if (md->attribute & (EFI_MEMORY_WB|EFI_MEMORY_WT|EFI_MEMORY_WC))
@@ -36,7 +34,7 @@ static int __init is_memory(efi_memory_desc_t *md)
  * as some data members of the EFI system table are virtually remapped after
  * SetVirtualAddressMap() has been called.
  */
-static phys_addr_t efi_to_phys(unsigned long addr)
+static phys_addr_t __init efi_to_phys(unsigned long addr)
 {
        efi_memory_desc_t *md;
 
@@ -83,15 +81,15 @@ static void __init init_screen_info(void)
                memblock_mark_nomap(screen_info.lfb_base, screen_info.lfb_size);
 }
 
-static int __init uefi_init(void)
+static int __init uefi_init(u64 efi_system_table)
 {
        efi_config_table_t *config_tables;
+       efi_system_table_t *systab;
        size_t table_size;
        int retval;
 
-       efi.systab = early_memremap_ro(efi_system_table,
-                                      sizeof(efi_system_table_t));
-       if (efi.systab == NULL) {
+       systab = early_memremap_ro(efi_system_table, sizeof(efi_system_table_t));
+       if (systab == NULL) {
                pr_warn("Unable to map EFI system table.\n");
                return -ENOMEM;
        }
@@ -100,30 +98,29 @@ static int __init uefi_init(void)
        if (IS_ENABLED(CONFIG_64BIT))
                set_bit(EFI_64BIT, &efi.flags);
 
-       retval = efi_systab_check_header(&efi.systab->hdr, 2);
+       retval = efi_systab_check_header(&systab->hdr, 2);
        if (retval)
                goto out;
 
-       efi.runtime = efi.systab->runtime;
-       efi.runtime_version = efi.systab->hdr.revision;
+       efi.runtime = systab->runtime;
+       efi.runtime_version = systab->hdr.revision;
 
-       efi_systab_report_header(&efi.systab->hdr,
-                                efi_to_phys(efi.systab->fw_vendor));
+       efi_systab_report_header(&systab->hdr, efi_to_phys(systab->fw_vendor));
 
-       table_size = sizeof(efi_config_table_64_t) * efi.systab->nr_tables;
-       config_tables = early_memremap_ro(efi_to_phys(efi.systab->tables),
+       table_size = sizeof(efi_config_table_t) * systab->nr_tables;
+       config_tables = early_memremap_ro(efi_to_phys(systab->tables),
                                          table_size);
        if (config_tables == NULL) {
                pr_warn("Unable to map EFI config table array.\n");
                retval = -ENOMEM;
                goto out;
        }
-       retval = efi_config_parse_tables(config_tables, efi.systab->nr_tables,
+       retval = efi_config_parse_tables(config_tables, systab->nr_tables,
                                         arch_tables);
 
        early_memunmap(config_tables, table_size);
 out:
-       early_memunmap(efi.systab,  sizeof(efi_system_table_t));
+       early_memunmap(systab, sizeof(efi_system_table_t));
        return retval;
 }
 
@@ -214,8 +211,6 @@ void __init efi_init(void)
        if (!efi_get_fdt_params(&params))
                return;
 
-       efi_system_table = params.system_table;
-
        data.desc_version = params.desc_ver;
        data.desc_size = params.desc_size;
        data.size = params.mmap_size;
@@ -234,7 +229,7 @@ void __init efi_init(void)
             "Unexpected EFI_MEMORY_DESCRIPTOR version %ld",
              efi.memmap.desc_version);
 
-       if (uefi_init() < 0) {
+       if (uefi_init(params.system_table) < 0) {
                efi_memmap_unmap();
                return;
        }

diff --git a/drivers/firmware/efi/arm-runtime.c b/drivers/firmware/efi/arm-runtime.c
index 9dda2602c862ad08622439abae2935148f3de1b0..b876373f2297e3983d00b3a17e44e0462d3d4e1f 100644 (file)
--- a/drivers/firmware/efi/arm-runtime.c
+++ b/drivers/firmware/efi/arm-runtime.c
@@ -25,8 +25,6 @@
 #include <asm/pgalloc.h>
 #include <asm/pgtable.h>
 
-extern u64 efi_system_table;
-
 #if defined(CONFIG_PTDUMP_DEBUGFS) && defined(CONFIG_ARM64)
 #include <asm/ptdump.h>
 
@@ -54,13 +52,11 @@ device_initcall(ptdump_init);
 static bool __init efi_virtmap_init(void)
 {
        efi_memory_desc_t *md;
-       bool systab_found;
 
        efi_mm.pgd = pgd_alloc(&efi_mm);
        mm_init_cpumask(&efi_mm);
        init_new_context(NULL, &efi_mm);
 
-       systab_found = false;
        for_each_efi_memory_desc(md) {
                phys_addr_t phys = md->phys_addr;
                int ret;
@@ -76,20 +72,6 @@ static bool __init efi_virtmap_init(void)
                                &phys, ret);
                        return false;
                }
-               /*
-                * If this entry covers the address of the UEFI system table,
-                * calculate and record its virtual address.
-                */
-               if (efi_system_table >= phys &&
-                   efi_system_table < phys + (md->num_pages * EFI_PAGE_SIZE)) {
-                       efi.systab = (void *)(unsigned long)(efi_system_table -
-                                                            phys + md->virt_addr);
-                       systab_found = true;
-               }
-       }
-       if (!systab_found) {
-               pr_err("No virtual mapping found for the UEFI System Table\n");
-               return false;
        }
 
        if (efi_memattr_apply_permissions(&efi_mm, efi_set_mapping_permissions))