From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935931AbbCDIBr (ORCPT ); Wed, 4 Mar 2015 03:01:47 -0500 Received: from userp1040.oracle.com ([156.151.31.81]:28861 "EHLO userp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935905AbbCDIBj (ORCPT ); Wed, 4 Mar 2015 03:01:39 -0500 From: Yinghai Lu To: Matt Fleming , "H. Peter Anvin" , Bjorn Helgaas Cc: Thomas Gleixner , Ingo Molnar , Jiri Kosina , Borislav Petkov , Baoquan He , linux-kernel@vger.kernel.org, linux-efi@vger.kernel.org, linux-pci@vger.kernel.org, Yinghai Lu Subject: [PATCH v2 09/15] x86, efi: copy SETUP_EFI data and access directly Date: Wed, 4 Mar 2015 00:00:42 -0800 Message-Id: <1425456048-16236-10-git-send-email-yinghai@kernel.org> X-Mailer: git-send-email 1.8.4.5 In-Reply-To: <1425456048-16236-1-git-send-email-yinghai@kernel.org> References: <1425456048-16236-1-git-send-email-yinghai@kernel.org> X-Source-IP: aserv0022.oracle.com [141.146.126.234] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org the copy will be in __initdata, and it is small. We can use pointer to access the setup_data instead of keeping on early_memmap and early_memunmap everywhere. Cc: Matt Fleming Cc: linux-efi@vger.kernel.org Signed-off-by: Yinghai Lu --- arch/x86/include/asm/efi.h | 2 +- arch/x86/platform/efi/efi.c | 13 ++----------- arch/x86/platform/efi/efi_64.c | 13 ++++++++++++- arch/x86/platform/efi/quirks.c | 23 ++++++----------------- 4 files changed, 21 insertions(+), 30 deletions(-) diff --git a/arch/x86/include/asm/efi.h b/arch/x86/include/asm/efi.h index 25bce45..edbecd6 100644 --- a/arch/x86/include/asm/efi.h +++ b/arch/x86/include/asm/efi.h @@ -114,7 +114,7 @@ struct efi_setup_data { u64 reserved[8]; }; -extern u64 efi_setup; +extern struct efi_setup_data *efi_setup; #ifdef CONFIG_EFI diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c index dbc8627..1cd38e8 100644 --- a/arch/x86/platform/efi/efi.c +++ b/arch/x86/platform/efi/efi.c @@ -68,7 +68,7 @@ static efi_config_table_type_t arch_tables[] __initdata = { {NULL_GUID, NULL, NULL}, }; -u64 efi_setup; /* efi setup_data physical address */ +struct efi_setup_data *efi_setup __initdata; /* cached efi setup_data pointer */ static int add_efi_memmap __initdata; static int __init setup_add_efi_memmap(char *arg) @@ -225,20 +225,13 @@ static int __init efi_systab_init(void *phys) { if (efi_enabled(EFI_64BIT)) { efi_system_table_64_t *systab64; - struct efi_setup_data *data = NULL; + struct efi_setup_data *data = efi_setup; u64 tmp = 0; - if (efi_setup) { - data = early_memremap(efi_setup, sizeof(*data)); - if (!data) - return -ENOMEM; - } systab64 = early_memremap((unsigned long)phys, sizeof(*systab64)); if (systab64 == NULL) { pr_err("Couldn't map the system table!\n"); - if (data) - early_memunmap(data, sizeof(*data)); return -ENOMEM; } @@ -271,8 +264,6 @@ static int __init efi_systab_init(void *phys) tmp |= data ? data->tables : systab64->tables; early_memunmap(systab64, sizeof(*systab64)); - if (data) - early_memunmap(data, sizeof(*data)); #ifdef CONFIG_X86_32 if (tmp >> 32) { pr_err("EFI data located above 4GB, disabling EFI.\n"); diff --git a/arch/x86/platform/efi/efi_64.c b/arch/x86/platform/efi/efi_64.c index 17e80d8..a541c6c 100644 --- a/arch/x86/platform/efi/efi_64.c +++ b/arch/x86/platform/efi/efi_64.c @@ -292,9 +292,20 @@ void __iomem *__init efi_ioremap(unsigned long phys_addr, unsigned long size, return (void __iomem *)__va(phys_addr); } +static struct efi_setup_data efi_setup_data __initdata; + void __init parse_efi_setup(u64 phys_addr, u32 data_len) { - efi_setup = phys_addr + sizeof(struct setup_data); + struct efi_setup_data *data; + + data = early_memremap(phys_addr + sizeof(struct setup_data), + sizeof(*data)); + if (!data) + return; + + efi_setup_data = *data; + early_memunmap(data, sizeof(*data)); + efi_setup = &efi_setup_data; } void __init efi_runtime_mkexec(void) diff --git a/arch/x86/platform/efi/quirks.c b/arch/x86/platform/efi/quirks.c index 1c7380d..45fec7d 100644 --- a/arch/x86/platform/efi/quirks.c +++ b/arch/x86/platform/efi/quirks.c @@ -203,9 +203,8 @@ void __init efi_free_boot_services(void) */ int __init efi_reuse_config(u64 tables, int nr_tables) { - int i, sz, ret = 0; + int i, sz; void *p, *tablep; - struct efi_setup_data *data; if (!efi_setup) return 0; @@ -213,22 +212,15 @@ int __init efi_reuse_config(u64 tables, int nr_tables) if (!efi_enabled(EFI_64BIT)) return 0; - data = early_memremap(efi_setup, sizeof(*data)); - if (!data) { - ret = -ENOMEM; - goto out; - } - - if (!data->smbios) - goto out_memremap; + if (!efi_setup->smbios) + return 0; sz = sizeof(efi_config_table_64_t); p = tablep = early_memremap(tables, nr_tables * sz); if (!p) { pr_err("Could not map Configuration table!\n"); - ret = -ENOMEM; - goto out_memremap; + return -ENOMEM; } for (i = 0; i < efi.systab->nr_tables; i++) { @@ -237,15 +229,12 @@ int __init efi_reuse_config(u64 tables, int nr_tables) guid = ((efi_config_table_64_t *)p)->guid; if (!efi_guidcmp(guid, SMBIOS_TABLE_GUID)) - ((efi_config_table_64_t *)p)->table = data->smbios; + ((efi_config_table_64_t *)p)->table = efi_setup->smbios; p += sz; } early_memunmap(tablep, nr_tables * sz); -out_memremap: - early_memunmap(data, sizeof(*data)); -out: - return ret; + return 0; } void __init efi_apply_memmap_quirks(void) -- 1.8.4.5 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Yinghai Lu Subject: [PATCH v2 09/15] x86, efi: copy SETUP_EFI data and access directly Date: Wed, 4 Mar 2015 00:00:42 -0800 Message-ID: <1425456048-16236-10-git-send-email-yinghai@kernel.org> References: <1425456048-16236-1-git-send-email-yinghai@kernel.org> Return-path: In-Reply-To: <1425456048-16236-1-git-send-email-yinghai-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> Sender: linux-efi-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org To: Matt Fleming , "H. Peter Anvin" , Bjorn Helgaas Cc: Thomas Gleixner , Ingo Molnar , Jiri Kosina , Borislav Petkov , Baoquan He , linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-efi-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-pci-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Yinghai Lu List-Id: linux-efi@vger.kernel.org the copy will be in __initdata, and it is small. We can use pointer to access the setup_data instead of keeping on early_memmap and early_memunmap everywhere. Cc: Matt Fleming Cc: linux-efi-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Signed-off-by: Yinghai Lu --- arch/x86/include/asm/efi.h | 2 +- arch/x86/platform/efi/efi.c | 13 ++----------- arch/x86/platform/efi/efi_64.c | 13 ++++++++++++- arch/x86/platform/efi/quirks.c | 23 ++++++----------------- 4 files changed, 21 insertions(+), 30 deletions(-) diff --git a/arch/x86/include/asm/efi.h b/arch/x86/include/asm/efi.h index 25bce45..edbecd6 100644 --- a/arch/x86/include/asm/efi.h +++ b/arch/x86/include/asm/efi.h @@ -114,7 +114,7 @@ struct efi_setup_data { u64 reserved[8]; }; -extern u64 efi_setup; +extern struct efi_setup_data *efi_setup; #ifdef CONFIG_EFI diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c index dbc8627..1cd38e8 100644 --- a/arch/x86/platform/efi/efi.c +++ b/arch/x86/platform/efi/efi.c @@ -68,7 +68,7 @@ static efi_config_table_type_t arch_tables[] __initdata = { {NULL_GUID, NULL, NULL}, }; -u64 efi_setup; /* efi setup_data physical address */ +struct efi_setup_data *efi_setup __initdata; /* cached efi setup_data pointer */ static int add_efi_memmap __initdata; static int __init setup_add_efi_memmap(char *arg) @@ -225,20 +225,13 @@ static int __init efi_systab_init(void *phys) { if (efi_enabled(EFI_64BIT)) { efi_system_table_64_t *systab64; - struct efi_setup_data *data = NULL; + struct efi_setup_data *data = efi_setup; u64 tmp = 0; - if (efi_setup) { - data = early_memremap(efi_setup, sizeof(*data)); - if (!data) - return -ENOMEM; - } systab64 = early_memremap((unsigned long)phys, sizeof(*systab64)); if (systab64 == NULL) { pr_err("Couldn't map the system table!\n"); - if (data) - early_memunmap(data, sizeof(*data)); return -ENOMEM; } @@ -271,8 +264,6 @@ static int __init efi_systab_init(void *phys) tmp |= data ? data->tables : systab64->tables; early_memunmap(systab64, sizeof(*systab64)); - if (data) - early_memunmap(data, sizeof(*data)); #ifdef CONFIG_X86_32 if (tmp >> 32) { pr_err("EFI data located above 4GB, disabling EFI.\n"); diff --git a/arch/x86/platform/efi/efi_64.c b/arch/x86/platform/efi/efi_64.c index 17e80d8..a541c6c 100644 --- a/arch/x86/platform/efi/efi_64.c +++ b/arch/x86/platform/efi/efi_64.c @@ -292,9 +292,20 @@ void __iomem *__init efi_ioremap(unsigned long phys_addr, unsigned long size, return (void __iomem *)__va(phys_addr); } +static struct efi_setup_data efi_setup_data __initdata; + void __init parse_efi_setup(u64 phys_addr, u32 data_len) { - efi_setup = phys_addr + sizeof(struct setup_data); + struct efi_setup_data *data; + + data = early_memremap(phys_addr + sizeof(struct setup_data), + sizeof(*data)); + if (!data) + return; + + efi_setup_data = *data; + early_memunmap(data, sizeof(*data)); + efi_setup = &efi_setup_data; } void __init efi_runtime_mkexec(void) diff --git a/arch/x86/platform/efi/quirks.c b/arch/x86/platform/efi/quirks.c index 1c7380d..45fec7d 100644 --- a/arch/x86/platform/efi/quirks.c +++ b/arch/x86/platform/efi/quirks.c @@ -203,9 +203,8 @@ void __init efi_free_boot_services(void) */ int __init efi_reuse_config(u64 tables, int nr_tables) { - int i, sz, ret = 0; + int i, sz; void *p, *tablep; - struct efi_setup_data *data; if (!efi_setup) return 0; @@ -213,22 +212,15 @@ int __init efi_reuse_config(u64 tables, int nr_tables) if (!efi_enabled(EFI_64BIT)) return 0; - data = early_memremap(efi_setup, sizeof(*data)); - if (!data) { - ret = -ENOMEM; - goto out; - } - - if (!data->smbios) - goto out_memremap; + if (!efi_setup->smbios) + return 0; sz = sizeof(efi_config_table_64_t); p = tablep = early_memremap(tables, nr_tables * sz); if (!p) { pr_err("Could not map Configuration table!\n"); - ret = -ENOMEM; - goto out_memremap; + return -ENOMEM; } for (i = 0; i < efi.systab->nr_tables; i++) { @@ -237,15 +229,12 @@ int __init efi_reuse_config(u64 tables, int nr_tables) guid = ((efi_config_table_64_t *)p)->guid; if (!efi_guidcmp(guid, SMBIOS_TABLE_GUID)) - ((efi_config_table_64_t *)p)->table = data->smbios; + ((efi_config_table_64_t *)p)->table = efi_setup->smbios; p += sz; } early_memunmap(tablep, nr_tables * sz); -out_memremap: - early_memunmap(data, sizeof(*data)); -out: - return ret; + return 0; } void __init efi_apply_memmap_quirks(void) -- 1.8.4.5