lkml.org 
[lkml]   [2020]   [Feb]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 11/18] efi: make efi_config_init() x86 only
    Date
    The efi_config_init() routine is no longer shared with ia64 so let's
    move it into the x86 arch code before making further x86 specific
    changes to it.

    Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
    ---
    arch/x86/platform/efi/efi.c | 30 +++++++++++++++++++
    drivers/firmware/efi/efi.c | 31 --------------------
    include/linux/efi.h | 1 -
    3 files changed, 30 insertions(+), 32 deletions(-)

    diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c
    index 777373423a67..26d905e6b579 100644
    --- a/arch/x86/platform/efi/efi.c
    +++ b/arch/x86/platform/efi/efi.c
    @@ -434,6 +434,36 @@ static int __init efi_systab_init(u64 phys)
    return 0;
    }

    +static int __init efi_config_init(efi_config_table_type_t *arch_tables)
    +{
    + void *config_tables;
    + int sz, ret;
    +
    + if (efi.systab->nr_tables == 0)
    + return 0;
    +
    + if (efi_enabled(EFI_64BIT))
    + sz = sizeof(efi_config_table_64_t);
    + else
    + sz = sizeof(efi_config_table_32_t);
    +
    + /*
    + * Let's see what config tables the firmware passed to us.
    + */
    + config_tables = early_memremap(efi.systab->tables,
    + efi.systab->nr_tables * sz);
    + if (config_tables == NULL) {
    + pr_err("Could not map Configuration table!\n");
    + return -ENOMEM;
    + }
    +
    + ret = efi_config_parse_tables(config_tables, efi.systab->nr_tables, sz,
    + arch_tables);
    +
    + early_memunmap(config_tables, efi.systab->nr_tables * sz);
    + return ret;
    +}
    +
    void __init efi_init(void)
    {
    if (IS_ENABLED(CONFIG_X86_32) &&
    diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c
    index 80fe0044f2e2..2bfd6c0806ce 100644
    --- a/drivers/firmware/efi/efi.c
    +++ b/drivers/firmware/efi/efi.c
    @@ -601,37 +601,6 @@ int __init efi_config_parse_tables(void *config_tables, int count, int sz,
    return 0;
    }

    -int __init efi_config_init(efi_config_table_type_t *arch_tables)
    -{
    - void *config_tables;
    - int sz, ret;
    -
    - if (efi.systab->nr_tables == 0)
    - return 0;
    -
    - if (efi_enabled(EFI_64BIT))
    - sz = sizeof(efi_config_table_64_t);
    - else
    - sz = sizeof(efi_config_table_32_t);
    -
    - /*
    - * Let's see what config tables the firmware passed to us.
    - */
    - config_tables = early_memremap(efi.systab->tables,
    - efi.systab->nr_tables * sz);
    - if (config_tables == NULL) {
    - pr_err("Could not map Configuration table!\n");
    - return -ENOMEM;
    - }
    -
    - ret = efi_config_parse_tables(config_tables, efi.systab->nr_tables, sz,
    - arch_tables);
    -
    - early_memunmap(config_tables, efi.systab->nr_tables * sz);
    - return ret;
    -}
    -
    -
    int __init efi_systab_check_header(const efi_table_hdr_t *systab_hdr,
    int min_major_version)
    {
    diff --git a/include/linux/efi.h b/include/linux/efi.h
    index 287510e84dfb..d61c25fd5824 100644
    --- a/include/linux/efi.h
    +++ b/include/linux/efi.h
    @@ -608,7 +608,6 @@ extern int __init efi_memmap_split_count(efi_memory_desc_t *md,
    extern void __init efi_memmap_insert(struct efi_memory_map *old_memmap,
    void *buf, struct efi_mem_range *mem);

    -extern int efi_config_init(efi_config_table_type_t *arch_tables);
    #ifdef CONFIG_EFI_ESRT
    extern void __init efi_esrt_init(void);
    #else
    --
    2.17.1
    \
     
     \ /
      Last update: 2020-02-16 19:25    [W:2.546 / U:0.188 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site