From mboxrd@z Thu Jan 1 00:00:00 1970 From: Catalin Marinas Subject: Re: [patch v11 09/23] ARM64 / ACPI: If we chose to boot from acpi then disable FDT Date: Wed, 25 Mar 2015 17:00:27 +0000 Message-ID: <20150325170027.GG14585@localhost> References: <1427205776-5060-1-git-send-email-hanjun.guo@linaro.org> <1427205776-5060-10-git-send-email-hanjun.guo@linaro.org> Mime-Version: 1.0 Content-Type: text/plain; charset=WINDOWS-1252 Content-Transfer-Encoding: 8BIT Return-path: Received: from eu-smtp-delivery-143.mimecast.com ([146.101.78.143]:62803 "EHLO eu-smtp-delivery-143.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751185AbbCZBEG convert rfc822-to-8bit (ORCPT ); Wed, 25 Mar 2015 21:04:06 -0400 In-Reply-To: <1427205776-5060-10-git-send-email-hanjun.guo@linaro.org> Content-Disposition: inline Sender: linux-acpi-owner@vger.kernel.org List-Id: linux-acpi@vger.kernel.org To: Hanjun Guo Cc: "Rafael J. Wysocki" , Will Deacon , Olof Johansson , Grant Likely , Mark Rutland , Ashwin Chaugule , Lorenzo Pieralisi , Robert Richter , Arnd Bergmann , Graeme Gregory , linaro-acpi@lists.linaro.org, Marc Zyngier , Jon Masters , Timur Tabi , Mark Salter , linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org, Mark Brown , Suravee Suthikulpanit , Sudeep Holla , linux-arm-kernel@lists.infradead.org On Tue, Mar 24, 2015 at 10:02:42PM +0800, Hanjun Guo wrote: > 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. [...] > --- 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(); So if we have acpi=force but the acpi failed, do we have acpi_disabled set? Or this requires Lorenzo's patch? -- Catalin From mboxrd@z Thu Jan 1 00:00:00 1970 From: catalin.marinas@arm.com (Catalin Marinas) Date: Wed, 25 Mar 2015 17:00:27 +0000 Subject: [patch v11 09/23] ARM64 / ACPI: If we chose to boot from acpi then disable FDT In-Reply-To: <1427205776-5060-10-git-send-email-hanjun.guo@linaro.org> References: <1427205776-5060-1-git-send-email-hanjun.guo@linaro.org> <1427205776-5060-10-git-send-email-hanjun.guo@linaro.org> Message-ID: <20150325170027.GG14585@localhost> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Tue, Mar 24, 2015 at 10:02:42PM +0800, Hanjun Guo wrote: > 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. [...] > --- 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(); So if we have acpi=force but the acpi failed, do we have acpi_disabled set? Or this requires Lorenzo's patch? -- Catalin