[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20150318165200.GA3421@e104818-lin.cambridge.arm.com>
Date: Wed, 18 Mar 2015 16:52:01 +0000
From: Catalin Marinas <catalin.marinas@....com>
To: Hanjun Guo <hanjun.guo@...aro.org>
Cc: "Rafael J. Wysocki" <rjw@...ysocki.net>,
Will Deacon <will.deacon@....com>,
Olof Johansson <olof@...om.net>,
Grant Likely <grant.likely@...aro.org>,
Mark Rutland <mark.rutland@....com>,
Ashwin Chaugule <ashwinc@...eaurora.org>,
Lorenzo Pieralisi <Lorenzo.Pieralisi@....com>,
Robert Richter <rric@...nel.org>,
Arnd Bergmann <arnd@...db.de>,
Graeme Gregory <graeme.gregory@...aro.org>,
linaro-acpi@...ts.linaro.org, Marc Zyngier <marc.zyngier@....com>,
Jon Masters <jcm@...hat.com>,
Timur Tabi <timur@...eaurora.org>,
linux-kernel@...r.kernel.org, linux-acpi@...r.kernel.org,
Mark Brown <broonie@...nel.org>, suravee.suthikulpanit@....com,
Sudeep Holla <Sudeep.Holla@....com>,
linux-arm-kernel@...ts.infradead.org
Subject: Re: [PATCH v10 09/21] ARM64 / ACPI: If we chose to boot from acpi
then disable FDT
On Wed, Mar 11, 2015 at 08:39:35PM +0800, Hanjun Guo wrote:
> From: Graeme Gregory <graeme.gregory@...aro.org>
>
> If the early boot methods of acpi are happy that we have valid ACPI
> tables and acpi=force has been passed, then do not unflat devicetree
> effectively disabling further hardware probing from DT.
>
> CC: Catalin Marinas <catalin.marinas@....com>
> CC: Will Deacon <will.deacon@....com>
> Tested-by: Suravee Suthikulpanit <Suravee.Suthikulpanit@....com>
> Tested-by: Yijing Wang <wangyijing@...wei.com>
> Tested-by: Mark Langsdorf <mlangsdo@...hat.com>
> Tested-by: Jon Masters <jcm@...hat.com>
> Tested-by: Timur Tabi <timur@...eaurora.org>
> Tested-by: Robert Richter <rrichter@...ium.com>
> Acked-by: Robert Richter <rrichter@...ium.com>
> Acked-by: Olof Johansson <olof@...om.net>
> Acked-by: Grant Likely <grant.likely@...aro.org>
> Signed-off-by: Graeme Gregory <graeme.gregory@...aro.org>
> Signed-off-by: Hanjun Guo <hanjun.guo@...aro.org>
> ---
> arch/arm64/kernel/setup.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c
> index 4f1a014..e8c7000 100644
> --- a/arch/arm64/kernel/setup.c
> +++ b/arch/arm64/kernel/setup.c
> @@ -390,7 +390,8 @@ void __init setup_arch(char **cmdline_p)
>
> early_ioremap_reset();
>
> - unflatten_device_tree();
> + if (acpi_disabled)
> + unflatten_device_tree();
Lorenzo commented on the previous patch that acpi=force still allows the
fall back to DT. I guess you may want something like:
if (acpi_disabled && !param_acpi_force)
unflatten_device_tree();
--
Catalin
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists