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 v10 5/7] x86/boot: Add get_acpi_rsdp() to parse RSDP in cmdline from kexec Date: Mon, 22 Oct 2018 17:37:18 +0800 [thread overview] Message-ID: <20181022093720.21426-6-fanc.fnst@cn.fujitsu.com> (raw) In-Reply-To: <20181022093720.21426-1-fanc.fnst@cn.fujitsu.com> Imitate setup_acpi_rsdp() for the early_param of "acpi_rsdp". KEXEC writes the RSDP pointer to cmdline for EFI booting. So if "acpi_rsdp" found in cmdline, use it directely. Signed-off-by: Chao Fan <fanc.fnst@cn.fujitsu.com> --- arch/x86/boot/compressed/acpitb.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/arch/x86/boot/compressed/acpitb.c b/arch/x86/boot/compressed/acpitb.c index 50fa65cf824d..fa63a584d7ec 100644 --- a/arch/x86/boot/compressed/acpitb.c +++ b/arch/x86/boot/compressed/acpitb.c @@ -8,6 +8,9 @@ #include <linux/numa.h> #include <linux/acpi.h> +#define STATIC +#include <linux/decompress/mm.h> + /* Search EFI table for RSDP table. */ static void efi_get_rsdp_addr(acpi_physical_address *rsdp_addr) { @@ -200,3 +203,23 @@ static void bios_get_rsdp_addr(acpi_physical_address *rsdp_addr) *rsdp_addr = (acpi_physical_address)address; } } + +static void get_acpi_rsdp(acpi_physical_address *rsdp_addr) +{ +#ifdef CONFIG_KEXEC + unsigned long long res; + int len = 0; + char *val; + + val = malloc(19); + len = cmdline_find_option("acpi_rsdp", val, 19); + + if (len == -1) + return; + + if (len > 0) { + val[len] = 0; + *rsdp_addr = (acpi_physical_address)kstrtoull(val, 16, &res); + } +#endif +} -- 2.17.2
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 v10 5/7] x86/boot: Add get_acpi_rsdp() to parse RSDP in cmdline from kexec Date: Mon, 22 Oct 2018 17:37:18 +0800 [thread overview] Message-ID: <20181022093720.21426-6-fanc.fnst@cn.fujitsu.com> (raw) In-Reply-To: <20181022093720.21426-1-fanc.fnst@cn.fujitsu.com> Imitate setup_acpi_rsdp() for the early_param of "acpi_rsdp". KEXEC writes the RSDP pointer to cmdline for EFI booting. So if "acpi_rsdp" found in cmdline, use it directely. Signed-off-by: Chao Fan <fanc.fnst@cn.fujitsu.com> --- arch/x86/boot/compressed/acpitb.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/arch/x86/boot/compressed/acpitb.c b/arch/x86/boot/compressed/acpitb.c index 50fa65cf824d..fa63a584d7ec 100644 --- a/arch/x86/boot/compressed/acpitb.c +++ b/arch/x86/boot/compressed/acpitb.c @@ -8,6 +8,9 @@ #include <linux/numa.h> #include <linux/acpi.h> +#define STATIC +#include <linux/decompress/mm.h> + /* Search EFI table for RSDP table. */ static void efi_get_rsdp_addr(acpi_physical_address *rsdp_addr) { @@ -200,3 +203,23 @@ static void bios_get_rsdp_addr(acpi_physical_address *rsdp_addr) *rsdp_addr = (acpi_physical_address)address; } } + +static void get_acpi_rsdp(acpi_physical_address *rsdp_addr) +{ +#ifdef CONFIG_KEXEC + unsigned long long res; + int len = 0; + char *val; + + val = malloc(19); + len = cmdline_find_option("acpi_rsdp", val, 19); + + if (len == -1) + return; + + if (len > 0) { + val[len] = 0; + *rsdp_addr = (acpi_physical_address)kstrtoull(val, 16, &res); + } +#endif +} -- 2.17.2
next prev parent reply other threads:[~2018-10-22 9:37 UTC|newest] Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-10-22 9:37 [PATCH v10 0/7] x86/boot/KASLR: Parse ACPI table and limit kaslr in immovable memory Chao Fan 2018-10-22 9:37 ` Chao Fan 2018-10-22 9:37 ` [PATCH v10 1/7] x86/boot: Introduce cmdline_find_option_arg()to detect if option=arg in cmdline Chao Fan 2018-10-22 9:37 ` Chao Fan 2018-11-06 12:22 ` Borislav Petkov 2018-11-07 1:24 ` Chao Fan 2018-11-07 1:24 ` Chao Fan 2018-10-22 9:37 ` [PATCH v10 2/7] x86/boot: Copy kstrtoull() to compressed period Chao Fan 2018-10-22 9:37 ` Chao Fan 2018-11-06 19:13 ` Borislav Petkov 2018-11-07 1:28 ` Chao Fan 2018-11-07 1:28 ` Chao Fan 2018-10-22 9:37 ` [PATCH v10 3/7] x86/boot: Add efi_get_rsdp_addr() to dig out RSDP from EFI table Chao Fan 2018-10-22 9:37 ` Chao Fan 2018-10-22 9:37 ` [PATCH v10 4/7] x86/boot: Add bios_get_rsdp_addr() to search RSDP in memory Chao Fan 2018-10-22 9:37 ` Chao Fan 2018-10-22 9:37 ` Chao Fan [this message] 2018-10-22 9:37 ` [PATCH v10 5/7] x86/boot: Add get_acpi_rsdp() to parse RSDP in cmdline from kexec Chao Fan 2018-10-22 9:37 ` [PATCH v10 6/7] x86/boot: Dig out SRAT table from RSDP and find immovable memory Chao Fan 2018-10-22 9:37 ` Chao Fan 2018-10-22 9:37 ` [PATCH v10 7/7] x86/boot/KASLR: Limit kaslr to choosing the " Chao Fan 2018-10-22 9:37 ` Chao Fan 2018-10-31 7:42 ` [PATCH v10 0/7] x86/boot/KASLR: Parse ACPI table and limit kaslr in " Chao Fan 2018-10-31 7:42 ` Chao Fan 2018-10-31 10:05 ` Borislav Petkov 2018-11-01 1:25 ` Chao Fan 2018-11-01 1:25 ` 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=20181022093720.21426-6-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.