From: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
To: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: "hanjun.guo@linaro.org" <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>,
"grant.likely@linaro.org" <grant.likely@linaro.org>,
Arnd Bergmann <arnd@arndb.de>,
Mark Rutland <Mark.Rutland@arm.com>,
"graeme.gregory@linaro.org" <graeme.gregory@linaro.org>,
Sudeep Holla <Sudeep.Holla@arm.com>,
"jcm@redhat.com" <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" <suravee.suthikulpanit@amd.com>,
"linux-acpi@vger.kernel.org" <linux-acpi@vger.kernel.org>,
"linux-arm-kernel@lists.infradead.org"
<linux-arm-kernel@lists.infradead.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"linaro-acpi@lists.linaro.org" <linaro-acpi@lists.linaro.org>,
Al Stone <al.stone@linaro.org>
Subject: Re: [PATCH v10 08/21] ARM64 / ACPI: Introduce early_param "acpi=" to enable/disable ACPI
Date: Thu, 19 Mar 2015 10:04:55 +0000 [thread overview]
Message-ID: <20150319100455.GA24556@red-moon> (raw)
In-Reply-To: <CAKv+Gu9wkh+J18cm1Mt4-Up5b3VA4-qeLtHcc+UD44DHbqABtQ@mail.gmail.com>
On Wed, Mar 18, 2015 at 08:07:09PM +0000, Ard Biesheuvel wrote:
> On 18 March 2015 at 12:35, Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> wrote:
> > On Wed, Mar 11, 2015 at 12:39:34PM +0000, Hanjun Guo 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)
> >
> > I think this comment is stale. acpi=force enables ACPI and tries to
> > init the ACPI tables without even checking DT, but it does fall back to
> > DT if ACPI table init fails (by disabling ACPI and unflattening the
> > FDT).
> >
> > Am I wrong ?
> >
>
> No, you're right. But I would suggest that we fix the code, not the comment.
So would I. I flagged this up on the comment since I was not able to follow
the thread on arm64 acpi=force and thought I was missing something.
> I think we are all in agreement on the policy, we only need to make
> disable_acpi() conditional on whether acpi_param_force is set
Either this or Catalin's fix, in actual terms the end result should be
the same on arm64, leaving acpi_disabled will save us some pointless
parsing IMO.
Nit: "acpi" kernel parameter description defines
"force -- enable ACPI if default was off"
which is not what we do on arm64 if we leave ACPI disabled when
acpi=force and ACPI fails to init.
I do not think we should care, if anyone disagrees manifest yourselves.
Lorenzo
>
>
> >> - 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>
> >> Acked-by: Olof Johansson <olof@lixom.net>
> >> Acked-by: Grant Likely <grant.likely@linaro.org>
> >> Tested-by: Timur Tabi <timur@codeaurora.org>
> >> 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>
> >> ---
> >> 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 7abac24..2269e30 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 param_acpi_off __initdata;
> >> +static bool param_acpi_force __initdata;
> >> +
> >> +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-19 10:05 UTC|newest]
Thread overview: 89+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-11 12:39 [PATCH v10 00/21] Introduce ACPI for ARM64 based on ACPI 5.1 Hanjun Guo
2015-03-11 12:39 ` [PATCH v10 01/21] ACPI / table: Use pr_debug() instead of pr_info() for MADT table scanning Hanjun Guo
2015-03-11 12:39 ` [PATCH v10 02/21] ACPI: add arm64 to the platforms that use ioremap Hanjun Guo
2015-03-11 12:39 ` [PATCH v10 03/21] ARM64: allow late use of early_ioremap Hanjun Guo
2015-03-11 12:39 ` [PATCH v10 04/21] ARM64 / ACPI: Get RSDP and ACPI boot-time tables Hanjun Guo
2015-03-11 12:39 ` [PATCH v10 05/21] ACPI: fix acpi_os_ioremap for arm64 Hanjun Guo
2015-03-11 12:39 ` [PATCH v10 06/21] ACPI / sleep: Introduce CONFIG_ACPI_GENERIC_SLEEP Hanjun Guo
2015-03-12 9:32 ` Lorenzo Pieralisi
2015-03-12 22:57 ` Rafael J. Wysocki
2015-03-13 3:31 ` Hanjun Guo
2015-03-11 12:39 ` [PATCH v10 07/21] ARM64 / ACPI: Introduce PCI stub functions for ACPI Hanjun Guo
2015-03-11 12:39 ` [PATCH v10 08/21] ARM64 / ACPI: Introduce early_param "acpi=" to enable/disable ACPI Hanjun Guo
2015-03-18 11:35 ` Lorenzo Pieralisi
2015-03-18 20:07 ` Ard Biesheuvel
2015-03-19 2:30 ` Hanjun Guo
2015-03-19 10:04 ` Lorenzo Pieralisi [this message]
2015-03-11 12:39 ` [PATCH v10 09/21] ARM64 / ACPI: If we chose to boot from acpi then disable FDT Hanjun Guo
2015-03-18 16:52 ` Catalin Marinas
2015-03-11 12:39 ` [PATCH v10 10/21] ARM64 / ACPI: Get PSCI flags in FADT for PSCI init Hanjun Guo
2015-03-13 14:51 ` Lorenzo Pieralisi
2015-03-16 11:45 ` Hanjun Guo
2015-03-16 18:41 ` Lorenzo Pieralisi
2015-03-11 12:39 ` [PATCH v10 11/21] ACPI / table: Print GIC information when MADT is parsed Hanjun Guo
2015-03-11 12:39 ` [PATCH v10 12/21] ARM64 / ACPI: Parse MADT for SMP initialization Hanjun Guo
2015-03-11 12:39 ` [PATCH v10 13/21] ACPI / processor: Introduce phys_cpuid_t for CPU hardware ID Hanjun Guo
2015-03-12 9:51 ` Lorenzo Pieralisi
2015-03-12 10:16 ` Hanjun Guo
2015-03-11 12:39 ` [PATCH v10 14/21] ACPI / processor: Make it possible to get CPU hardware ID via GICC Hanjun Guo
2015-03-12 15:41 ` Lorenzo Pieralisi
2015-03-12 23:02 ` Rafael J. Wysocki
2015-03-11 12:39 ` [PATCH v10 15/21] ARM64 / ACPI: Introduce ACPI_IRQ_MODEL_GIC and register device's gsi Hanjun Guo
2015-03-18 18:41 ` Will Deacon
2015-03-19 3:45 ` Hanjun Guo
2015-03-19 10:12 ` Lorenzo Pieralisi
2015-03-19 19:37 ` Will Deacon
2015-03-20 13:07 ` Hanjun Guo
2015-03-20 14:25 ` Lorenzo Pieralisi
2015-03-21 21:38 ` Lorenzo Pieralisi
2015-03-11 12:39 ` [PATCH v10 16/21] irqchip: Add GICv2 specific ACPI boot support Hanjun Guo
[not found] ` <CACxGe6uWwts6X=Yc2ioBdQizXkF1_YgoNNOsREWirk2MFBVDHg@mail.gmail.com>
2015-03-11 23:11 ` Jason Cooper
2015-03-12 1:46 ` Hanjun Guo
2015-03-12 5:12 ` Jason Cooper
2015-03-12 7:31 ` Hanjun Guo
2015-03-13 17:15 ` Jason Cooper
2015-03-14 8:47 ` Grant Likely
2015-03-14 11:43 ` Catalin Marinas
2015-03-12 10:14 ` Marc Zyngier
2015-03-14 18:44 ` Jason Cooper
2015-03-11 12:39 ` [PATCH v10 17/21] clocksource / arch_timer: Parse GTDT to initialize arch timer Hanjun Guo
2015-03-18 18:34 ` Will Deacon
2015-03-20 13:49 ` Daniel Lezcano
2015-03-11 12:39 ` [PATCH v10 18/21] ARM64 / ACPI: Select ACPI_REDUCED_HARDWARE_ONLY if ACPI is enabled on ARM64 Hanjun Guo
2015-03-12 18:21 ` Lorenzo Pieralisi
2015-03-13 3:28 ` Hanjun Guo
2015-03-13 11:04 ` Lorenzo Pieralisi
2015-03-16 11:33 ` Hanjun Guo
2015-03-17 12:50 ` Lorenzo Pieralisi
2015-03-18 9:18 ` Lorenzo Pieralisi
2015-03-18 15:06 ` Rafael J. Wysocki
2015-03-19 1:16 ` Hanjun Guo
2015-03-11 12:39 ` [PATCH v10 19/21] ARM64 / ACPI: Enable ARM64 in Kconfig Hanjun Guo
2015-03-11 12:39 ` [PATCH v10 20/21] Documentation: ACPI for ARM64 Hanjun Guo
2015-03-11 12:39 ` [PATCH v10 21/21] ARM64 / ACPI: additions of ACPI documentation for arm64 Hanjun Guo
2015-03-12 13:26 ` [PATCH v10 00/21] Introduce ACPI for ARM64 based on ACPI 5.1 Timur Tabi
2015-03-16 5:07 ` Suthikulpanit, Suravee
2015-03-18 19:05 ` Will Deacon
2015-03-18 19:09 ` Will Deacon
2015-03-19 4:09 ` Hanjun Guo
2015-03-19 10:17 ` Lorenzo Pieralisi
2015-03-19 19:39 ` Will Deacon
2015-03-24 22:02 ` Grant Likely
2015-03-25 11:24 ` Will Deacon
2015-03-25 11:54 ` Rafael J. Wysocki
2015-03-25 11:38 ` Will Deacon
2015-03-25 12:16 ` Rafael J. Wysocki
2015-03-28 12:34 ` Grant Likely
2015-03-26 10:24 ` Lorenzo Pieralisi
2015-03-20 18:54 ` Will Deacon
2015-03-21 3:17 ` Hanjun Guo
2015-03-21 7:03 ` Hanjun Guo
[not found] ` <CAFoFrHatzS3MwGVeOPPjY1R1sfBRYnJjgbQjvfzi6xS+XYD14g@mail.gmail.com>
2015-03-22 21:05 ` Julien Grall
2015-03-22 21:49 ` Rafael J. Wysocki
2015-03-22 21:32 ` Julien Grall
2015-03-22 22:11 ` Rafael J. Wysocki
2015-03-23 1:37 ` Hanjun Guo
2015-03-23 18:39 ` Stefano Stabellini
2015-03-23 18:32 ` Stefano Stabellini
2015-03-24 13:46 ` Hanjun Guo
2015-03-20 13:18 ` Mark Salter
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=20150319100455.GA24556@red-moon \
--to=lorenzo.pieralisi@arm.com \
--cc=Catalin.Marinas@arm.com \
--cc=Marc.Zyngier@arm.com \
--cc=Mark.Rutland@arm.com \
--cc=Sudeep.Holla@arm.com \
--cc=Will.Deacon@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=graeme.gregory@linaro.org \
--cc=grant.likely@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=olof@lixom.net \
--cc=rjw@rjwysocki.net \
--cc=rric@kernel.org \
--cc=suravee.suthikulpanit@amd.com \
--cc=timur@codeaurora.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: 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).