From: Chao Fan <fanc.fnst@cn.fujitsu.com> To: linux-kernel@vger.kernel.org, x86@kernel.org, linux-efi@vger.kernel.org, linux-acpi@vger.kernel.org, bp@alien8.de, tglx@linutronix.de, mingo@redhat.com, hpa@zytor.com, keescook@chromium.org, bhe@redhat.com, msys.mizuma@gmail.com Cc: indou.takao@jp.fujitsu.com, caoj.fnst@cn.fujitsu.com, fanc.fnst@cn.fujitsu.com Subject: [PATCH v11 1/5] x86/boot: Add efi_get_rsdp_addr() to dig out RSDP from EFI table Date: Mon, 12 Nov 2018 17:46:41 +0800 [thread overview] Message-ID: <20181112094645.4879-2-fanc.fnst@cn.fujitsu.com> (raw) In-Reply-To: <20181112094645.4879-1-fanc.fnst@cn.fujitsu.com> In order to parse SRAT table and get memory information, RSDP pointer should be found. In kernel, there are three methods to get RSDP: EFI condition, BIOS condition and KEXEC condition. The first works for EFI condition. Imitate ACPI code and EFI code to dig RSDP pointer from EFI tables. Process: boot_param->systab->efi_config_table->RSDP. Based on efi_init(), efi_config_init(), efi_config_parse_tables(). Signed-off-by: Chao Fan <fanc.fnst@cn.fujitsu.com> --- arch/x86/boot/compressed/acpitb.c | 96 +++++++++++++++++++++++++++++++ 1 file changed, 96 insertions(+) create mode 100644 arch/x86/boot/compressed/acpitb.c diff --git a/arch/x86/boot/compressed/acpitb.c b/arch/x86/boot/compressed/acpitb.c new file mode 100644 index 000000000000..56b54b0e0889 --- /dev/null +++ b/arch/x86/boot/compressed/acpitb.c @@ -0,0 +1,96 @@ +// SPDX-License-Identifier: GPL-2.0 +#define BOOT_CTYPE_H +#include "misc.h" +#include "error.h" + +#include <linux/efi.h> +#include <asm/efi.h> +#include <linux/numa.h> +#include <linux/acpi.h> + +/* Search EFI table for RSDP table. */ +static void efi_get_rsdp_addr(acpi_physical_address *rsdp_addr) +{ +#ifdef CONFIG_EFI + efi_system_table_t *systab; + bool efi_64 = false; + void *config_tables; + struct efi_info *e; + char *sig; + int size; + int i; + + e = &boot_params->efi_info; + sig = (char *)&e->efi_loader_signature; + + if (!strncmp(sig, EFI64_LOADER_SIGNATURE, 4)) + efi_64 = true; + else if (!strncmp(sig, EFI32_LOADER_SIGNATURE, 4)) + efi_64 = false; + else { + debug_putstr("Wrong EFI loader signature.\n"); + return; + } + + /* Get systab from boot params. Based on efi_init(). */ +#ifdef CONFIG_X86_64 + systab = (efi_system_table_t *)( + e->efi_systab | ((__u64)e->efi_systab_hi<<32)); +#else + if (e->efi_systab_hi || e->efi_memmap_hi) { + debug_putstr("Table located above 4GB. EFI should be disabled.\n"); + return; + } + systab = (efi_system_table_t *)e->efi_systab; +#endif + + if (!systab) + return; + + /* + * Get EFI tables from systab. Based on efi_config_init() and + * efi_config_parse_tables(). Only dig out the config_table. + */ + size = efi_64 ? sizeof(efi_config_table_64_t) : + sizeof(efi_config_table_32_t); + + for (i = 0; i < systab->nr_tables; i++) { + efi_guid_t guid; + unsigned long table; + + config_tables = (void *)(systab->tables + size * i); + if (efi_64) { + efi_config_table_64_t *tmp_table; + + tmp_table = (efi_config_table_64_t *)config_tables; + guid = tmp_table->guid; + table = tmp_table->table; +#ifndef CONFIG_64BIT + if (table >> 32) { + debug_putstr("Table located above 4G. EFI should be disabled.\n"); + return; + } +#endif + } else { + efi_config_table_32_t *tmp_table; + + tmp_table = (efi_config_table_32_t *)config_tables; + guid = tmp_table->guid; + table = tmp_table->table; + } + + /* + * Get RSDP from EFI tables. + * If ACPI20 table found, use it. + * If ACPI20 table not found, but ACPI table found, + * use the ACPI table. + */ + if (!(efi_guidcmp(guid, ACPI_TABLE_GUID))) { + *rsdp_addr = (acpi_physical_address)table; + } else if (!(efi_guidcmp(guid, ACPI_20_TABLE_GUID))) { + *rsdp_addr = (acpi_physical_address)table; + return; + } + } +#endif +} -- 2.19.1
WARNING: multiple messages have this Message-ID (diff)
From: Chao Fan <fanc.fnst@cn.fujitsu.com> To: <linux-kernel@vger.kernel.org>, <x86@kernel.org>, <linux-efi@vger.kernel.org>, <linux-acpi@vger.kernel.org>, <bp@alien8.de>, <tglx@linutronix.de>, <mingo@redhat.com>, <hpa@zytor.com>, <keescook@chromium.org>, <bhe@redhat.com>, <msys.mizuma@gmail.com> Cc: <indou.takao@jp.fujitsu.com>, <caoj.fnst@cn.fujitsu.com>, <fanc.fnst@cn.fujitsu.com> Subject: [PATCH v11 1/5] x86/boot: Add efi_get_rsdp_addr() to dig out RSDP from EFI table Date: Mon, 12 Nov 2018 17:46:41 +0800 [thread overview] Message-ID: <20181112094645.4879-2-fanc.fnst@cn.fujitsu.com> (raw) In-Reply-To: <20181112094645.4879-1-fanc.fnst@cn.fujitsu.com> In order to parse SRAT table and get memory information, RSDP pointer should be found. In kernel, there are three methods to get RSDP: EFI condition, BIOS condition and KEXEC condition. The first works for EFI condition. Imitate ACPI code and EFI code to dig RSDP pointer from EFI tables. Process: boot_param->systab->efi_config_table->RSDP. Based on efi_init(), efi_config_init(), efi_config_parse_tables(). Signed-off-by: Chao Fan <fanc.fnst@cn.fujitsu.com> --- arch/x86/boot/compressed/acpitb.c | 96 +++++++++++++++++++++++++++++++ 1 file changed, 96 insertions(+) create mode 100644 arch/x86/boot/compressed/acpitb.c diff --git a/arch/x86/boot/compressed/acpitb.c b/arch/x86/boot/compressed/acpitb.c new file mode 100644 index 000000000000..56b54b0e0889 --- /dev/null +++ b/arch/x86/boot/compressed/acpitb.c @@ -0,0 +1,96 @@ +// SPDX-License-Identifier: GPL-2.0 +#define BOOT_CTYPE_H +#include "misc.h" +#include "error.h" + +#include <linux/efi.h> +#include <asm/efi.h> +#include <linux/numa.h> +#include <linux/acpi.h> + +/* Search EFI table for RSDP table. */ +static void efi_get_rsdp_addr(acpi_physical_address *rsdp_addr) +{ +#ifdef CONFIG_EFI + efi_system_table_t *systab; + bool efi_64 = false; + void *config_tables; + struct efi_info *e; + char *sig; + int size; + int i; + + e = &boot_params->efi_info; + sig = (char *)&e->efi_loader_signature; + + if (!strncmp(sig, EFI64_LOADER_SIGNATURE, 4)) + efi_64 = true; + else if (!strncmp(sig, EFI32_LOADER_SIGNATURE, 4)) + efi_64 = false; + else { + debug_putstr("Wrong EFI loader signature.\n"); + return; + } + + /* Get systab from boot params. Based on efi_init(). */ +#ifdef CONFIG_X86_64 + systab = (efi_system_table_t *)( + e->efi_systab | ((__u64)e->efi_systab_hi<<32)); +#else + if (e->efi_systab_hi || e->efi_memmap_hi) { + debug_putstr("Table located above 4GB. EFI should be disabled.\n"); + return; + } + systab = (efi_system_table_t *)e->efi_systab; +#endif + + if (!systab) + return; + + /* + * Get EFI tables from systab. Based on efi_config_init() and + * efi_config_parse_tables(). Only dig out the config_table. + */ + size = efi_64 ? sizeof(efi_config_table_64_t) : + sizeof(efi_config_table_32_t); + + for (i = 0; i < systab->nr_tables; i++) { + efi_guid_t guid; + unsigned long table; + + config_tables = (void *)(systab->tables + size * i); + if (efi_64) { + efi_config_table_64_t *tmp_table; + + tmp_table = (efi_config_table_64_t *)config_tables; + guid = tmp_table->guid; + table = tmp_table->table; +#ifndef CONFIG_64BIT + if (table >> 32) { + debug_putstr("Table located above 4G. EFI should be disabled.\n"); + return; + } +#endif + } else { + efi_config_table_32_t *tmp_table; + + tmp_table = (efi_config_table_32_t *)config_tables; + guid = tmp_table->guid; + table = tmp_table->table; + } + + /* + * Get RSDP from EFI tables. + * If ACPI20 table found, use it. + * If ACPI20 table not found, but ACPI table found, + * use the ACPI table. + */ + if (!(efi_guidcmp(guid, ACPI_TABLE_GUID))) { + *rsdp_addr = (acpi_physical_address)table; + } else if (!(efi_guidcmp(guid, ACPI_20_TABLE_GUID))) { + *rsdp_addr = (acpi_physical_address)table; + return; + } + } +#endif +} -- 2.19.1
next prev parent reply other threads:[~2018-11-12 9:46 UTC|newest] Thread overview: 54+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-11-12 9:46 [PATCH v11 0/5] x86/boot/KASLR: Parse ACPI table and limit kaslr in immovable memory Chao Fan 2018-11-12 9:46 ` Chao Fan 2018-11-12 9:46 ` Chao Fan [this message] 2018-11-12 9:46 ` [PATCH v11 1/5] x86/boot: Add efi_get_rsdp_addr() to dig out RSDP from EFI table Chao Fan 2018-11-12 14:54 ` Borislav Petkov 2018-11-13 1:57 ` Chao Fan 2018-11-13 1:57 ` Chao Fan 2018-11-12 9:46 ` [PATCH v11 2/5] x86/boot: Add bios_get_rsdp_addr() to search RSDP in memory Chao Fan 2018-11-12 9:46 ` Chao Fan 2018-11-12 15:27 ` Borislav Petkov 2018-11-13 2:10 ` Chao Fan 2018-11-13 2:10 ` Chao Fan 2018-11-13 10:09 ` Borislav Petkov 2018-11-12 9:46 ` [PATCH v11 3/5] x86/boot: Add get_acpi_rsdp() to parse RSDP in cmdlien from kexec Chao Fan 2018-11-12 9:46 ` Chao Fan 2018-11-12 9:50 ` Chao Fan 2018-11-12 9:50 ` Chao Fan 2018-11-12 17:43 ` Masayoshi Mizuma 2018-11-13 2:12 ` Chao Fan 2018-11-13 2:12 ` Chao Fan 2018-11-13 16:11 ` Masayoshi Mizuma 2018-11-13 17:22 ` Borislav Petkov 2018-11-13 17:54 ` Borislav Petkov 2018-11-13 20:06 ` Masayoshi Mizuma 2018-11-13 21:51 ` Borislav Petkov 2018-11-14 6:12 ` Chao Fan 2018-11-14 6:12 ` Chao Fan 2018-11-14 18:30 ` Borislav Petkov 2018-11-19 1:16 ` Chao Fan 2018-11-19 1:16 ` Chao Fan 2018-11-13 17:51 ` Borislav Petkov 2018-11-14 1:54 ` Chao Fan 2018-11-14 1:54 ` Chao Fan 2018-11-14 1:59 ` Chao Fan 2018-11-14 1:59 ` Chao Fan 2018-11-14 18:33 ` Borislav Petkov 2018-11-12 9:46 ` [PATCH v11 4/5] x86/boot: Dig out SRAT table from RSDP and find immovable memory Chao Fan 2018-11-12 9:46 ` Chao Fan 2018-11-12 20:52 ` Masayoshi Mizuma 2018-11-13 2:43 ` Chao Fan 2018-11-13 2:43 ` Chao Fan 2018-11-12 21:51 ` Masayoshi Mizuma 2018-11-13 2:45 ` Chao Fan 2018-11-13 2:45 ` Chao Fan 2018-11-16 11:16 ` Borislav Petkov 2018-11-19 2:08 ` Chao Fan 2018-11-19 2:08 ` Chao Fan 2018-11-20 6:18 ` Chao Fan 2018-11-20 6:18 ` Chao Fan 2018-11-12 9:46 ` [PATCH v11 5/5] x86/boot/KASLR: Walk srat tables to filter " Chao Fan 2018-11-12 9:46 ` Chao Fan 2018-11-16 13:50 ` Borislav Petkov 2018-11-19 1:31 ` Chao Fan 2018-11-19 1:31 ` Chao Fan
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20181112094645.4879-2-fanc.fnst@cn.fujitsu.com \ --to=fanc.fnst@cn.fujitsu.com \ --cc=bhe@redhat.com \ --cc=bp@alien8.de \ --cc=caoj.fnst@cn.fujitsu.com \ --cc=hpa@zytor.com \ --cc=indou.takao@jp.fujitsu.com \ --cc=keescook@chromium.org \ --cc=linux-acpi@vger.kernel.org \ --cc=linux-efi@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=mingo@redhat.com \ --cc=msys.mizuma@gmail.com \ --cc=tglx@linutronix.de \ --cc=x86@kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.