efi: Make memreserve table handling local to efi.c

There is no need for struct efi to carry the address of the memreserve
table and share it with the world. So move it out and make it
__initdata as well.

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

diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c
index 1fc4e174f11d60fcc53717bb475e85036a46ee4a..41bb2c44cea4c7e2f4426421d0cc2638f4c2463c 100644 (file)
--- a/drivers/firmware/efi/efi.c
+++ b/drivers/firmware/efi/efi.c
@@ -45,11 +45,11 @@ struct efi __read_mostly efi = {
        .esrt                   = EFI_INVALID_TABLE_ADDR,
        .tpm_log                = EFI_INVALID_TABLE_ADDR,
        .tpm_final_log          = EFI_INVALID_TABLE_ADDR,
-       .mem_reserve            = EFI_INVALID_TABLE_ADDR,
 };
 EXPORT_SYMBOL(efi);
 
 static unsigned long __ro_after_init rng_seed = EFI_INVALID_TABLE_ADDR;
+static unsigned long __initdata mem_reserve = EFI_INVALID_TABLE_ADDR;
 
 struct mm_struct efi_mm = {
        .mm_rb                  = RB_ROOT,
@@ -470,7 +470,7 @@ static __initdata efi_config_table_type_t common_tables[] = {
        {LINUX_EFI_RANDOM_SEED_TABLE_GUID, "RNG", &rng_seed},
        {LINUX_EFI_TPM_EVENT_LOG_GUID, "TPMEventLog", &efi.tpm_log},
        {LINUX_EFI_TPM_FINAL_LOG_GUID, "TPMFinalLog", &efi.tpm_final_log},
-       {LINUX_EFI_MEMRESERVE_TABLE_GUID, "MEMRESERVE", &efi.mem_reserve},
+       {LINUX_EFI_MEMRESERVE_TABLE_GUID, "MEMRESERVE", &mem_reserve},
 #ifdef CONFIG_EFI_RCI2_TABLE
        {DELLEMC_EFI_RCI2_TABLE_GUID, NULL, &rci2_table_phys},
 #endif
@@ -563,8 +563,8 @@ int __init efi_config_parse_tables(void *config_tables, int count, int sz,
 
        efi_tpm_eventlog_init();
 
-       if (efi.mem_reserve != EFI_INVALID_TABLE_ADDR) {
-               unsigned long prsv = efi.mem_reserve;
+       if (mem_reserve != EFI_INVALID_TABLE_ADDR) {
+               unsigned long prsv = mem_reserve;
 
                while (prsv) {
                        struct linux_efi_memreserve *rsv;
@@ -939,10 +939,10 @@ static struct linux_efi_memreserve *efi_memreserve_root __ro_after_init;
 
 static int __init efi_memreserve_map_root(void)
 {
-       if (efi.mem_reserve == EFI_INVALID_TABLE_ADDR)
+       if (mem_reserve == EFI_INVALID_TABLE_ADDR)
                return -ENODEV;
 
-       efi_memreserve_root = memremap(efi.mem_reserve,
+       efi_memreserve_root = memremap(mem_reserve,
                                       sizeof(*efi_memreserve_root),
                                       MEMREMAP_WB);
        if (WARN_ON_ONCE(!efi_memreserve_root))

diff --git a/include/linux/efi.h b/include/linux/efi.h
index b093fce1cf598dec31619e2a0fd6a7dddca8ca33..a5e210abe4cab8768daf76b5f356ccb92abd9418 100644 (file)
--- a/include/linux/efi.h
+++ b/include/linux/efi.h
@@ -541,7 +541,6 @@ extern struct efi {
        unsigned long esrt;             /* ESRT table */
        unsigned long tpm_log;          /* TPM2 Event Log table */
        unsigned long tpm_final_log;    /* TPM2 Final Events Log table */
-       unsigned long mem_reserve;      /* Linux EFI memreserve table */
        efi_get_time_t *get_time;
        efi_set_time_t *set_time;
        efi_get_wakeup_time_t *get_wakeup_time;