From patchwork Thu Mar 10 14:10:43 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amerigo Wang X-Patchwork-Id: 624811 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p2AEDEcD016487 for ; Thu, 10 Mar 2011 14:13:14 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752210Ab1CJONN (ORCPT ); Thu, 10 Mar 2011 09:13:13 -0500 Received: from mx1.redhat.com ([209.132.183.28]:10827 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751137Ab1CJONM (ORCPT ); Thu, 10 Mar 2011 09:13:12 -0500 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p2AEBfcl015045 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 10 Mar 2011 09:11:42 -0500 Received: from localhost.localdomain (vpn1-6-147.sin2.redhat.com [10.67.6.147]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id p2AEB1O6025524; Thu, 10 Mar 2011 09:11:02 -0500 From: Amerigo Wang To: linux-kernel@vger.kernel.org Cc: Takao Indoh , WANG Cong , "Eric W. Biederman" , Vivek Goyal , Randy Dunlap , Len Brown , linux-doc@vger.kernel.org, linux-acpi@vger.kernel.org Subject: [Patch] acpi: introduce "acpi_addr=" parameter for kdump Date: Thu, 10 Mar 2011 22:10:43 +0800 Message-Id: <1299766243-494-1-git-send-email-amwang@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 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]); Thu, 10 Mar 2011 14:13:16 +0000 (UTC) diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index f4a04c0..0fbbdc6 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_addr= [ACPI,EFI] + 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 c90c76a..06dfec0 100644 --- a/drivers/acpi/osl.c +++ b/drivers/acpi/osl.c @@ -238,8 +238,19 @@ void acpi_os_vprintf(const char *fmt, va_list args) #endif } +static unsigned long acpi_addr; +static int __init setup_acpi_addr(char *arg) +{ + acpi_addr = simple_strtoul(arg, NULL, 16); + return 0; +} +early_param("acpi_addr", setup_acpi_addr); + acpi_physical_address __init acpi_os_get_root_pointer(void) { + if (acpi_addr) + return acpi_addr; + if (efi_enabled) { if (efi.acpi20 != EFI_INVALID_TABLE_ADDR) return efi.acpi20;