From: Hanjun Guo <hanjun.guo@linaro.org> To: "Rafael J. Wysocki" <rjw@rjwysocki.net>, Catalin Marinas <catalin.marinas@arm.com>, linux-arm-kernel@lists.infradead.org, linux-acpi@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Arnd Bergmann <arnd@arndb.de>, Bjorn Helgaas <bhelgaas@google.com>, rric@kernel.org, Grant Likely <grant.likely@linaro.org>, Sudeep Holla <Sudeep.Holla@arm.com>, Mark Rutland <mark.rutland@arm.com>, Charles.Garcia-Tobin@arm.com, lorenzo.pieralisi@arm.com, linaro-acpi@lists.linaro.org, Graeme Gregory <graeme.gregory@linaro.org> Subject: [PATCH v4 01/13] acpi: arm64 does not have a BIOS add config for BIOS table scan. Date: Fri, 27 Jun 2014 11:49:24 +0800 [thread overview] Message-ID: <1403840976-7456-2-git-send-email-hanjun.guo@linaro.org> (raw) In-Reply-To: <1403840976-7456-1-git-send-email-hanjun.guo@linaro.org> From: Graeme Gregory <graeme.gregory@linaro.org> With the addition of ARM64 that does not have a traditional BIOS to scan, add a config option which is selected on x86 and ia64 to do the traditional BIOS scanning for tables. Signed-off-by: Graeme Gregory <graeme.gregory@linaro.org> --- arch/ia64/Kconfig | 1 + arch/x86/Kconfig | 1 + drivers/acpi/Kconfig | 3 +++ drivers/acpi/osl.c | 4 +++- 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig index 2f3abcf..f82b352 100644 --- a/arch/ia64/Kconfig +++ b/arch/ia64/Kconfig @@ -47,6 +47,7 @@ config IA64 select MODULES_USE_ELF_RELA select ARCH_USE_CMPXCHG_LOCKREF select HAVE_ARCH_AUDITSYSCALL + select ACPI_SCAN_BIOS_NOT_EFI default y help The Itanium Processor Family is Intel's 64-bit successor to diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index a8f749e..4865d44 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -131,6 +131,7 @@ config X86 select HAVE_CC_STACKPROTECTOR select GENERIC_CPU_AUTOPROBE select HAVE_ARCH_AUDITSYSCALL + select ACPI_SCAN_BIOS_NOT_EFI config INSTRUCTION_DECODER def_bool y diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig index a34a228..70eaf7a 100644 --- a/drivers/acpi/Kconfig +++ b/drivers/acpi/Kconfig @@ -2,6 +2,9 @@ # ACPI Configuration # +config ACPI_SCAN_BIOS_NOT_EFI + bool + menuconfig ACPI bool "ACPI (Advanced Configuration and Power Interface) Support" depends on !IA64_HP_SIM diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c index bad25b0..5ba0b74 100644 --- a/drivers/acpi/osl.c +++ b/drivers/acpi/osl.c @@ -259,12 +259,14 @@ acpi_physical_address __init acpi_os_get_root_pointer(void) "System description tables not found\n"); return 0; } - } else { + } else if (IS_ENABLED(CONFIG_ACPI_SCAN_BIOS_NOT_EFI)) { acpi_physical_address pa = 0; acpi_find_root_pointer(&pa); return pa; } + + return 0; } /* Must be called with 'acpi_ioremap_lock' or RCU read lock held. */ -- 1.7.9.5
WARNING: multiple messages have this Message-ID (diff)
From: hanjun.guo@linaro.org (Hanjun Guo) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v4 01/13] acpi: arm64 does not have a BIOS add config for BIOS table scan. Date: Fri, 27 Jun 2014 11:49:24 +0800 [thread overview] Message-ID: <1403840976-7456-2-git-send-email-hanjun.guo@linaro.org> (raw) In-Reply-To: <1403840976-7456-1-git-send-email-hanjun.guo@linaro.org> From: Graeme Gregory <graeme.gregory@linaro.org> With the addition of ARM64 that does not have a traditional BIOS to scan, add a config option which is selected on x86 and ia64 to do the traditional BIOS scanning for tables. Signed-off-by: Graeme Gregory <graeme.gregory@linaro.org> --- arch/ia64/Kconfig | 1 + arch/x86/Kconfig | 1 + drivers/acpi/Kconfig | 3 +++ drivers/acpi/osl.c | 4 +++- 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig index 2f3abcf..f82b352 100644 --- a/arch/ia64/Kconfig +++ b/arch/ia64/Kconfig @@ -47,6 +47,7 @@ config IA64 select MODULES_USE_ELF_RELA select ARCH_USE_CMPXCHG_LOCKREF select HAVE_ARCH_AUDITSYSCALL + select ACPI_SCAN_BIOS_NOT_EFI default y help The Itanium Processor Family is Intel's 64-bit successor to diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index a8f749e..4865d44 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -131,6 +131,7 @@ config X86 select HAVE_CC_STACKPROTECTOR select GENERIC_CPU_AUTOPROBE select HAVE_ARCH_AUDITSYSCALL + select ACPI_SCAN_BIOS_NOT_EFI config INSTRUCTION_DECODER def_bool y diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig index a34a228..70eaf7a 100644 --- a/drivers/acpi/Kconfig +++ b/drivers/acpi/Kconfig @@ -2,6 +2,9 @@ # ACPI Configuration # +config ACPI_SCAN_BIOS_NOT_EFI + bool + menuconfig ACPI bool "ACPI (Advanced Configuration and Power Interface) Support" depends on !IA64_HP_SIM diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c index bad25b0..5ba0b74 100644 --- a/drivers/acpi/osl.c +++ b/drivers/acpi/osl.c @@ -259,12 +259,14 @@ acpi_physical_address __init acpi_os_get_root_pointer(void) "System description tables not found\n"); return 0; } - } else { + } else if (IS_ENABLED(CONFIG_ACPI_SCAN_BIOS_NOT_EFI)) { acpi_physical_address pa = 0; acpi_find_root_pointer(&pa); return pa; } + + return 0; } /* Must be called with 'acpi_ioremap_lock' or RCU read lock held. */ -- 1.7.9.5
next prev parent reply other threads:[~2014-06-27 3:50 UTC|newest] Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top 2014-06-27 3:49 [PATCH v4 00/13] Enable ACPI on ARM64 in Kconfig Hanjun Guo 2014-06-27 3:49 ` Hanjun Guo 2014-06-27 3:49 ` Hanjun Guo [this message] 2014-06-27 3:49 ` [PATCH v4 01/13] acpi: arm64 does not have a BIOS add config for BIOS table scan Hanjun Guo 2014-06-27 3:49 ` [PATCH v4 02/13] ACPI: Don't use acpi_lapic in ACPI core code Hanjun Guo 2014-06-27 3:49 ` Hanjun Guo 2014-06-27 3:49 ` [PATCH v4 03/13] ACPI / processor: Introduce ARCH_HAS_ACPI_PDC Hanjun Guo 2014-06-27 3:49 ` Hanjun Guo 2014-06-27 3:49 ` [PATCH v4 04/13] ARM64 : Add dummy asm/cpu.h Hanjun Guo 2014-06-27 3:49 ` Hanjun Guo 2014-06-27 3:49 ` [PATCH v4 05/13] ARM64 / ACPI: Introduce arm-core.c and its related head file Hanjun Guo 2014-06-27 3:49 ` Hanjun Guo 2014-06-30 16:24 ` Catalin Marinas 2014-06-30 16:24 ` Catalin Marinas 2014-06-30 16:24 ` Catalin Marinas 2014-06-30 17:21 ` Graeme Gregory 2014-06-30 17:21 ` Graeme Gregory 2014-06-30 17:21 ` Graeme Gregory 2014-06-27 3:49 ` [PATCH v4 06/13] ARM64 / ACPI: Introduce early_param for "acpi" Hanjun Guo 2014-06-27 3:49 ` Hanjun Guo 2014-06-27 9:07 ` Arnd Bergmann 2014-06-27 9:07 ` Arnd Bergmann 2014-06-27 10:57 ` Graeme Gregory 2014-06-27 10:57 ` Graeme Gregory 2014-06-27 10:57 ` Graeme Gregory 2014-06-27 3:49 ` [PATCH v4 07/13] ARM64 / ACPI: Introduce lowlevel suspend function Hanjun Guo 2014-06-27 3:49 ` Hanjun Guo 2014-06-30 16:28 ` Catalin Marinas 2014-06-30 16:28 ` Catalin Marinas 2014-06-30 16:28 ` Catalin Marinas 2014-06-27 3:49 ` [PATCH v4 08/13] ARM64 / ACPI: Introduce arch_fix_phys_package_id() for cpu topology Hanjun Guo 2014-06-27 3:49 ` Hanjun Guo 2014-06-27 3:49 ` [PATCH v4 09/13] ARM64 / ACPI: Introduce PCI functions for ACPI on ARM64 Hanjun Guo 2014-06-27 3:49 ` Hanjun Guo 2014-06-27 3:49 ` [PATCH v4 10/13] ACPI: Make EC debugfs depend on X86 || IA64 in Kconfig Hanjun Guo 2014-06-27 3:49 ` Hanjun Guo 2014-06-27 3:49 ` [PATCH v4 11/13] ARM64 / ACPI: Select ACPI_REDUCED_HARDWARE_ONLY if ACPI is enabled on ARM64 Hanjun Guo 2014-06-27 3:49 ` Hanjun Guo 2014-06-27 3:49 ` [PATCH v4 12/13] ARM64 / ACPI: if we chose to boot from acpi then disable FDT Hanjun Guo 2014-06-27 3:49 ` Hanjun Guo 2014-06-27 9:09 ` [Linaro-acpi] " Arnd Bergmann 2014-06-27 9:09 ` Arnd Bergmann 2014-06-27 3:49 ` [PATCH v4 13/13] ARM64 / ACPI: Enable ARM64 in Kconfig Hanjun Guo 2014-06-27 3:49 ` Hanjun Guo 2014-06-30 10:46 ` Catalin Marinas 2014-06-30 10:46 ` Catalin Marinas 2014-06-30 10:46 ` Catalin Marinas 2014-07-01 7:54 ` Hanjun Guo 2014-07-01 7:54 ` Hanjun Guo 2014-07-01 7:54 ` Hanjun Guo 2014-07-01 8:20 ` Hanjun Guo 2014-07-01 8:20 ` Hanjun Guo 2014-07-01 8:20 ` Hanjun Guo 2014-07-01 9:22 ` Catalin Marinas 2014-07-01 9:22 ` Catalin Marinas 2014-07-01 9:22 ` Catalin Marinas
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=1403840976-7456-2-git-send-email-hanjun.guo@linaro.org \ --to=hanjun.guo@linaro.org \ --cc=Charles.Garcia-Tobin@arm.com \ --cc=Sudeep.Holla@arm.com \ --cc=arnd@arndb.de \ --cc=bhelgaas@google.com \ --cc=catalin.marinas@arm.com \ --cc=graeme.gregory@linaro.org \ --cc=grant.likely@linaro.org \ --cc=linaro-acpi@lists.linaro.org \ --cc=linux-acpi@vger.kernel.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=lorenzo.pieralisi@arm.com \ --cc=mark.rutland@arm.com \ --cc=rjw@rjwysocki.net \ --cc=rric@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.