From mboxrd@z Thu Jan 1 00:00:00 1970 From: catalin.marinas@arm.com (Catalin Marinas) Date: Wed, 18 Mar 2015 16:52:01 +0000 Subject: [PATCH v10 09/21] ARM64 / ACPI: If we chose to boot from acpi then disable FDT In-Reply-To: <1426077587-1561-10-git-send-email-hanjun.guo@linaro.org> References: <1426077587-1561-1-git-send-email-hanjun.guo@linaro.org> <1426077587-1561-10-git-send-email-hanjun.guo@linaro.org> Message-ID: <20150318165200.GA3421@e104818-lin.cambridge.arm.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Wed, Mar 11, 2015 at 08:39:35PM +0800, Hanjun Guo wrote: > From: Graeme Gregory > > 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 > CC: Will Deacon > Tested-by: Suravee Suthikulpanit > Tested-by: Yijing Wang > Tested-by: Mark Langsdorf > Tested-by: Jon Masters > Tested-by: Timur Tabi > Tested-by: Robert Richter > Acked-by: Robert Richter > Acked-by: Olof Johansson > Acked-by: Grant Likely > Signed-off-by: Graeme Gregory > Signed-off-by: Hanjun Guo > --- > 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