From: Grant Likely <grant.likely@linaro.org>
To: Hanjun Guo <hanjun.guo@linaro.org>,
Catalin Marinas <catalin.marinas@arm.com>,
"Rafael J. Wysocki" <rjw@rjwysocki.net>,
Will Deacon <will.deacon@arm.com>,
Olof Johansson <olof@lixom.net>
Cc: Lorenzo Pieralisi <Lorenzo.Pieralisi@arm.com>,
Arnd Bergmann <arnd@arndb.de>,
Mark Rutland <mark.rutland@arm.com>,
Graeme Gregory <graeme.gregory@linaro.org>,
Sudeep Holla <Sudeep.Holla@arm.com>, Jon Masters <jcm@redhat.com>,
Marc Zyngier <marc.zyngier@arm.com>,
Mark Brown <broonie@kernel.org>, Robert Richter <rric@kernel.org>,
Timur Tabi <timur@codeaurora.org>,
Ashwin Chaugule <ashwinc@codeaurora.org>,
suravee.suthikulpanit@amd.com, linux-acpi@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, linaro-acpi@lists.linaro.org,
Al Stone <al.stone@linaro.org>,
Hanjun Guo <hanjun.guo@linaro.org>,
Ard Biesheuvel <ard.biesheuvel@linaro.org>
Subject: Re: [PATCH v9 09/21] ARM64 / ACPI: Introduce early_param "acpi=" to enable/disable ACPI
Date: Fri, 06 Mar 2015 20:37:50 +0000 [thread overview]
Message-ID: <20150306203750.98A60C40AA9@trevor.secretlab.ca> (raw)
In-Reply-To: <1424853601-6675-10-git-send-email-hanjun.guo@linaro.org>
On Wed, 25 Feb 2015 16:39:49 +0800
, Hanjun Guo <hanjun.guo@linaro.org>
wrote:
> From: Al Stone <al.stone@linaro.org>
>
> This implements the following policy to decide whether ACPI should
> be used to boot the system:
> - acpi=off: ACPI will not be used to boot the system, even if there is
> no alternative available (e.g., device tree is empty)
> - acpi=force: only ACPI will be used to boot the system; if that fails,
> there will be no fallback to alternative methods (such as device tree)
> - otherwise, ACPI will be used as a fallback if the device tree turns out
> to lack a platform description; the heuristic to decide this is whether
> /chosen is the only node present at depth 1
>
> CC: Catalin Marinas <catalin.marinas@arm.com>
> CC: Will Deacon <will.deacon@arm.com>
> CC: Rafael J. Wysocki <rjw@rjwysocki.net>
> Signed-off-by: Al Stone <al.stone@linaro.org>
> Signed-off-by: Graeme Gregory <graeme.gregory@linaro.org>
> Signed-off-by: Hanjun Guo <hanjun.guo@linaro.org>
> Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Acked-by: Grant Likely <grant.likely@linaro.org>
> ---
> Documentation/kernel-parameters.txt | 3 ++-
> arch/arm64/include/asm/acpi.h | 7 +++++
> arch/arm64/kernel/acpi.c | 52 +++++++++++++++++++++++++++++++++----
> 3 files changed, 56 insertions(+), 6 deletions(-)
>
> diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
> index bfcb1a6..d6c35a7 100644
> --- a/Documentation/kernel-parameters.txt
> +++ b/Documentation/kernel-parameters.txt
> @@ -165,7 +165,7 @@ multipliers 'Kilo', 'Mega', and 'Giga', equalling 2^10, 2^20, and 2^30
> bytes respectively. Such letter suffixes can also be entirely omitted.
>
>
> - acpi= [HW,ACPI,X86]
> + acpi= [HW,ACPI,X86,ARM64]
> Advanced Configuration and Power Interface
> Format: { force | off | strict | noirq | rsdt }
> force -- enable ACPI if default was off
> @@ -175,6 +175,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
> strictly ACPI specification compliant.
> rsdt -- prefer RSDT over (default) XSDT
> copy_dsdt -- copy DSDT to memory
> + For ARM64, ONLY "acpi=off" or "acpi=force" are available
>
> See also Documentation/power/runtime_pm.txt, pci=noacpi
>
> diff --git a/arch/arm64/include/asm/acpi.h b/arch/arm64/include/asm/acpi.h
> index 40e0924..c5a9b97 100644
> --- a/arch/arm64/include/asm/acpi.h
> +++ b/arch/arm64/include/asm/acpi.h
> @@ -39,6 +39,13 @@ static inline void disable_acpi(void)
> acpi_noirq = 1;
> }
>
> +static inline void enable_acpi(void)
> +{
> + acpi_disabled = 0;
> + acpi_pci_disabled = 0;
> + acpi_noirq = 0;
> +}
> +
> /*
> * It's used from ACPI core in kdump to boot UP system with SMP kernel,
> * with this check the ACPI core will not override the CPU index
> diff --git a/arch/arm64/kernel/acpi.c b/arch/arm64/kernel/acpi.c
> index f052e7a..bdcc9fc 100644
> --- a/arch/arm64/kernel/acpi.c
> +++ b/arch/arm64/kernel/acpi.c
> @@ -22,15 +22,49 @@
> #include <linux/irq.h>
> #include <linux/irqdomain.h>
> #include <linux/memblock.h>
> +#include <linux/of_fdt.h>
> #include <linux/smp.h>
>
> -int acpi_noirq; /* skip ACPI IRQ initialization */
> -int acpi_disabled;
> +int acpi_noirq = 1; /* skip ACPI IRQ initialization */
> +int acpi_disabled = 1;
> EXPORT_SYMBOL(acpi_disabled);
>
> -int acpi_pci_disabled; /* skip ACPI PCI scan and IRQ initialization */
> +int acpi_pci_disabled = 1; /* skip ACPI PCI scan and IRQ initialization */
> EXPORT_SYMBOL(acpi_pci_disabled);
>
> +static bool __initdata param_acpi_off;
> +static bool __initdata param_acpi_force;
> +
> +static int __init parse_acpi(char *arg)
> +{
> + if (!arg)
> + return -EINVAL;
> +
> + /* "acpi=off" disables both ACPI table parsing and interpreter */
> + if (strcmp(arg, "off") == 0)
> + param_acpi_off = true;
> + else if (strcmp(arg, "force") == 0) /* force ACPI to be enabled */
> + param_acpi_force = true;
> + else
> + return -EINVAL; /* Core will print when we return error */
> +
> + return 0;
> +}
> +early_param("acpi", parse_acpi);
> +
> +static int __init dt_scan_depth1_nodes(unsigned long node,
> + const char *uname, int depth,
> + void *data)
> +{
> + /*
> + * Return 1 as soon as we encounter a node at depth 1 that is
> + * not the /chosen node.
> + */
> + if (depth == 1 && (strcmp(uname, "chosen") != 0))
> + return 1;
> + return 0;
> +}
> +
> /*
> * __acpi_map_table() will be called before page_init(), so early_ioremap()
> * or early_memremap() should be called here to for ACPI table mapping.
> @@ -83,10 +117,18 @@ static int __init acpi_parse_fadt(struct acpi_table_header *table)
> */
> void __init acpi_boot_table_init(void)
> {
> - /* If acpi_disabled, bail out */
> - if (acpi_disabled)
> + /*
> + * Enable ACPI instead of device tree unless
> + * - ACPI has been disabled explicitly (acpi=off), or
> + * - the device tree is not empty (it has more than just a /chosen node)
> + * and ACPI has not been force enabled (acpi=force)
> + */
> + if (param_acpi_off ||
> + (!param_acpi_force && of_scan_flat_dt(dt_scan_depth1_nodes, NULL)))
> return;
>
> + enable_acpi();
> +
> /* Initialize the ACPI boot-time table parser. */
> if (acpi_table_init()) {
> disable_acpi();
> --
> 1.9.1
>
next prev parent reply other threads:[~2015-03-06 20:37 UTC|newest]
Thread overview: 106+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-02-25 8:39 [PATCH v9 00/21] Introduce ACPI for ARM64 based on ACPI 5.1 Hanjun Guo
2015-02-25 8:39 ` [PATCH v9 01/21] ACPI / table: Use pr_debug() instead of pr_info() for MADT table scanning Hanjun Guo
2015-03-04 22:33 ` Rafael J. Wysocki
2015-03-05 17:55 ` Olof Johansson
2015-03-06 20:17 ` Grant Likely
2015-03-06 20:31 ` Joe Perches
2015-03-10 2:35 ` Hanjun Guo
2015-02-25 8:39 ` [PATCH v9 02/21] ACPI / processor: Introduce phys_cpuid_t for CPU hardware ID Hanjun Guo
2015-03-04 22:29 ` Rafael J. Wysocki
2015-03-05 7:44 ` Hanjun Guo
2015-03-05 13:23 ` Rafael J. Wysocki
2015-03-06 6:48 ` Hanjun Guo
2015-03-06 20:19 ` Grant Likely
2015-02-25 8:39 ` [PATCH v9 03/21] ACPI: add arm64 to the platforms that use ioremap Hanjun Guo
2015-03-04 22:33 ` Rafael J. Wysocki
2015-03-06 20:20 ` Grant Likely
2015-02-25 8:39 ` [PATCH v9 04/21] ARM64: allow late use of early_ioremap Hanjun Guo
2015-03-06 20:24 ` Grant Likely
2015-02-25 8:39 ` [PATCH v9 05/21] ARM64 / ACPI: Get RSDP and ACPI boot-time tables Hanjun Guo
2015-03-05 18:10 ` Olof Johansson
2015-03-05 18:51 ` Lorenzo Pieralisi
2015-03-10 8:01 ` Hanjun Guo
2015-03-10 9:32 ` Lorenzo Pieralisi
2015-03-10 11:19 ` Leif Lindholm
2015-03-10 11:36 ` Hanjun Guo
2015-03-06 20:28 ` Grant Likely
2015-02-25 8:39 ` [PATCH v9 06/21] ACPI: fix acpi_os_ioremap for arm64 Hanjun Guo
2015-03-04 22:36 ` Rafael J. Wysocki
2015-03-06 20:30 ` Grant Likely
2015-02-25 8:39 ` [PATCH v9 07/21] ACPI / sleep: Introduce arm64 specific acpi_sleep.c Hanjun Guo
2015-03-04 22:38 ` Rafael J. Wysocki
2015-03-04 22:49 ` G Gregory
2015-03-04 23:25 ` Rafael J. Wysocki
2015-03-05 0:16 ` Rafael J. Wysocki
2015-03-06 12:36 ` Lorenzo Pieralisi
2015-03-06 20:34 ` Grant Likely
2015-02-25 8:39 ` [PATCH v9 08/21] ARM64 / ACPI: Introduce PCI stub functions for ACPI Hanjun Guo
2015-03-06 18:31 ` Lorenzo Pieralisi
2015-03-10 9:21 ` Hanjun Guo
2015-03-06 20:36 ` Grant Likely
2015-03-09 15:01 ` Liviu Dudau
2015-03-10 9:34 ` Hanjun Guo
2015-02-25 8:39 ` [PATCH v9 09/21] ARM64 / ACPI: Introduce early_param "acpi=" to enable/disable ACPI Hanjun Guo
2015-03-05 18:11 ` Olof Johansson
2015-03-06 20:37 ` Grant Likely [this message]
2015-02-25 8:39 ` [PATCH v9 10/21] ARM64 / ACPI: If we chose to boot from acpi then disable FDT Hanjun Guo
2015-03-05 18:12 ` Olof Johansson
2015-03-06 20:38 ` Grant Likely
2015-02-25 8:39 ` [PATCH v9 11/21] ARM64 / ACPI: Get PSCI flags in FADT for PSCI init Hanjun Guo
2015-03-05 18:19 ` Olof Johansson
2015-03-06 20:40 ` Grant Likely
2015-02-25 8:39 ` [PATCH v9 12/21] ACPI / table: Print GIC information when MADT is parsed Hanjun Guo
2015-03-04 22:40 ` Rafael J. Wysocki
2015-03-06 18:06 ` Lorenzo Pieralisi
2015-03-06 20:40 ` Grant Likely
2015-02-25 8:39 ` [PATCH v9 13/21] ARM64 / ACPI: Parse MADT for SMP initialization Hanjun Guo
2015-03-05 18:49 ` Olof Johansson
2015-03-10 11:33 ` Hanjun Guo
2015-03-07 22:49 ` Grant Likely
2015-02-25 8:39 ` [PATCH v9 14/21] ACPI / processor: Make it possible to get CPU hardware ID via GICC Hanjun Guo
2015-03-04 22:46 ` Rafael J. Wysocki
2015-03-05 8:03 ` Hanjun Guo
2015-03-05 11:27 ` Catalin Marinas
2015-03-05 13:13 ` Rafael J. Wysocki
2015-03-05 15:19 ` Catalin Marinas
2015-03-06 6:51 ` Hanjun Guo
2015-03-07 22:52 ` Grant Likely
2015-02-25 8:39 ` [PATCH v9 15/21] ARM64 / ACPI: Introduce ACPI_IRQ_MODEL_GIC and register device's gsi Hanjun Guo
2015-03-04 22:47 ` Rafael J. Wysocki
2015-03-07 23:05 ` Grant Likely
2015-02-25 8:39 ` [PATCH v9 16/21] irqchip: Add GICv2 specific ACPI boot support Hanjun Guo
2015-03-04 22:50 ` Rafael J. Wysocki
2015-03-05 9:06 ` Hanjun Guo
2015-03-05 11:53 ` Catalin Marinas
2015-03-06 0:42 ` Rafael J. Wysocki
2015-03-05 8:21 ` Hanjun Guo
2015-03-07 23:14 ` Grant Likely
2015-02-25 8:39 ` [PATCH v9 17/21] clocksource / arch_timer: Parse GTDT to initialize arch timer Hanjun Guo
2015-03-07 23:16 ` Grant Likely
2015-02-25 8:39 ` [PATCH v9 18/21] ARM64 / ACPI: Select ACPI_REDUCED_HARDWARE_ONLY if ACPI is enabled on ARM64 Hanjun Guo
2015-03-06 17:47 ` Lorenzo Pieralisi
2015-03-10 12:23 ` Hanjun Guo
2015-03-10 14:16 ` Lorenzo Pieralisi
2015-03-07 23:16 ` Grant Likely
2015-02-25 8:39 ` [PATCH v9 19/21] ARM64 / ACPI: Enable ARM64 in Kconfig Hanjun Guo
2015-03-04 22:52 ` Rafael J. Wysocki
2015-03-07 23:17 ` Grant Likely
2015-02-25 8:40 ` [PATCH v9 20/21] Documentation: ACPI for ARM64 Hanjun Guo
2015-02-27 10:53 ` Shannon Zhao
2015-02-27 11:13 ` Shannon Zhao
2015-02-27 11:20 ` Shannon Zhao
2015-02-25 8:40 ` [PATCH v9 21/21] ARM64 / ACPI: additions of ACPI documentation for arm64 Hanjun Guo
2015-02-27 11:22 ` Shannon Zhao
2015-02-27 14:19 ` Hanjun Guo
2015-03-05 18:54 ` Olof Johansson
2015-02-27 3:20 ` [PATCH v9 00/21] Introduce ACPI for ARM64 based on ACPI 5.1 Timur Tabi
2015-02-27 8:37 ` Hanjun Guo
2015-02-27 10:51 ` Shannon Zhao
2015-02-27 8:50 ` Ard Biesheuvel
2015-02-27 10:36 ` Mark Rutland
2015-02-27 21:05 ` Timur Tabi
2015-03-04 23:18 ` Timur Tabi
2015-03-04 22:56 ` Rafael J. Wysocki
2015-03-05 7:03 ` Hanjun Guo
2015-03-05 18:57 ` Olof Johansson
2015-03-06 4:26 ` Hanjun Guo
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=20150306203750.98A60C40AA9@trevor.secretlab.ca \
--to=grant.likely@linaro.org \
--cc=Lorenzo.Pieralisi@arm.com \
--cc=Sudeep.Holla@arm.com \
--cc=al.stone@linaro.org \
--cc=ard.biesheuvel@linaro.org \
--cc=arnd@arndb.de \
--cc=ashwinc@codeaurora.org \
--cc=broonie@kernel.org \
--cc=catalin.marinas@arm.com \
--cc=graeme.gregory@linaro.org \
--cc=hanjun.guo@linaro.org \
--cc=jcm@redhat.com \
--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=marc.zyngier@arm.com \
--cc=mark.rutland@arm.com \
--cc=olof@lixom.net \
--cc=rjw@rjwysocki.net \
--cc=rric@kernel.org \
--cc=suravee.suthikulpanit@amd.com \
--cc=timur@codeaurora.org \
--cc=will.deacon@arm.com \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).