From patchwork Mon Jul 11 15:14:41 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Takao Indoh X-Patchwork-Id: 965412 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p6BFFiVD024733 for ; Mon, 11 Jul 2011 15:15:44 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757868Ab1GKPPZ (ORCPT ); Mon, 11 Jul 2011 11:15:25 -0400 Received: from fgwmail5.fujitsu.co.jp ([192.51.44.35]:58316 "EHLO fgwmail5.fujitsu.co.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757777Ab1GKPPY (ORCPT ); Mon, 11 Jul 2011 11:15:24 -0400 Received: from mt4.gw.fujitsu.co.jp (unknown [10.75.179.174]) by fgwmail5.fujitsu.co.jp (Postfix) with ESMTP id 17FEF3EE0AE; Tue, 12 Jul 2011 00:15:22 +0900 (JST) Received: from smail (mt4 [127.0.0.1]) by outgoing.mt4.gw.fujitsu.co.jp (Postfix) with ESMTP id F03A445DE55; Tue, 12 Jul 2011 00:15:21 +0900 (JST) Received: from st4.gw.fujitsu.co.jp (st4.gw.fujitsu.co.jp [10.75.179.164]) by mt4.gw.fujitsu.co.jp (Postfix) with ESMTP id DBC0445DE4D; Tue, 12 Jul 2011 00:15:21 +0900 (JST) Received: from st4.gw.fujitsu.co.jp (localhost.localdomain [127.0.0.1]) by st4.gw.fujitsu.co.jp (Postfix) with ESMTP id CED521DB8038; Tue, 12 Jul 2011 00:15:21 +0900 (JST) Received: from sw2.gw.fujitsu.co.jp (sw2.gw.fujitsu.co.jp [10.75.179.56]) by st4.gw.fujitsu.co.jp (Postfix) with ESMTP id 93E451DB8032; Tue, 12 Jul 2011 00:15:21 +0900 (JST) Received: from jp.fujitsu.com ([172.31.250.129]) by sw2.gw.fujitsu.co.jp with SMTP id p6BFFHBm021772; Tue, 12 Jul 2011 00:15:18 +0900 (JST) X-SecurityPolicyCheck: OK by SHieldMailChecker v1.5.1 From: Takao Indoh To: linux-kernel@vger.kernel.org Cc: amwang@redhat.com, ebiederm@xmission.com, vgoyal@redhat.com, rdunlap@xenotime.net, lenb@kernel.org, linux-doc@vger.kernel.org, linux-acpi@vger.kernel.org, mjg@redhat.com Subject: [PATCH v2] acpi: introduce "acpi_rsdp=" parameter for kdump Date: Mon, 11 Jul 2011 11:14:41 -0400 MIME-Version: 1.0 X-Mailer: HidemaruMail 5.38 (WinNT,501) Message-Id: X-Antivirus: avast! (VPS 110711-0, 2011/07/11), Outbound message X-Antivirus-Status: Clean Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Mon, 11 Jul 2011 15:15:44 +0000 (UTC) Revised version of the patch which was posted by Cong WANG v1: https://lkml.org/lkml/2011/3/10/206 There is a problem with putting the first kernel in EFI virtual mode, it is that when the second kernel comes up it tries to initialize the EFI again and once we have put EFI in virtual mode we can not really do that. Actually, EFI is not necessary for kdump, we can boot the second kernel with "noefi" parameter, but the boot will mostly fail because 2nd kernel cannot find RSDP. In this situation, we introduced "acpi_rsdp=" kernel parameter, so that kexec-tools can pass the "noefi acpi_rsdp=X" to the second kernel to make kdump works. Changes in v2: * Change parameter name from "acpi_addr" to "acpi_rsdp" * Add CONFIG_KEXEC Signed-off-by: Takao Indoh [amwang@redhat.com: Add documentation.] Reviewed-by: WANG Cong --- Documentation/kernel-parameters.txt | 5 +++++ drivers/acpi/osl.c | 15 +++++++++++++++ 2 files changed, 20 insertions(+) -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index fd248a3..b88b8f1 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt @@ -163,6 +163,11 @@ bytes respectively. Such letter suffixes can also be entirely omitted. See also Documentation/power/pm.txt, pci=noacpi + acpi_rsdp= [ACPI,EFI,KEXEC] + Pass the RSDP address to the kernel, mostly used + on machines running EFI runtime service to boot the + second kernel for kdump. + acpi_apic_instance= [ACPI, IOAPIC] Format: 2: use 2nd APIC table, if available diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c index 52ca964..27cd140 100644 --- a/drivers/acpi/osl.c +++ b/drivers/acpi/osl.c @@ -237,8 +237,23 @@ void acpi_os_vprintf(const char *fmt, va_list args) #endif } +#ifdef CONFIG_KEXEC +static unsigned long acpi_rsdp; +static int __init setup_acpi_rsdp(char *arg) +{ + acpi_rsdp = simple_strtoul(arg, NULL, 16); + return 0; +} +early_param("acpi_rsdp", setup_acpi_rsdp); +#endif + acpi_physical_address __init acpi_os_get_root_pointer(void) { +#ifdef CONFIG_KEXEC + if (acpi_rsdp) + return acpi_rsdp; +#endif + if (efi_enabled) { if (efi.acpi20 != EFI_INVALID_TABLE_ADDR) return efi.acpi20;