From patchwork Wed Mar 11 12:39:35 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hanjun Guo X-Patchwork-Id: 5984151 Return-Path: X-Original-To: patchwork-linux-acpi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id B877CBF440 for ; Wed, 11 Mar 2015 12:48:23 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 19D89200D4 for ; Wed, 11 Mar 2015 12:48:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8FC6820425 for ; Wed, 11 Mar 2015 12:48:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753107AbbCKMll (ORCPT ); Wed, 11 Mar 2015 08:41:41 -0400 Received: from mail-pa0-f50.google.com ([209.85.220.50]:37920 "EHLO mail-pa0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753078AbbCKMlg (ORCPT ); Wed, 11 Mar 2015 08:41:36 -0400 Received: by pabrd3 with SMTP id rd3so11197472pab.5 for ; Wed, 11 Mar 2015 05:41:36 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=usui7JQfPilMUDSj5aLFwy0Reftd48T/Q7yWQQPSKtQ=; b=k4JeX/vJT+OxkZ85vPtOsYm44nsZNd8+bhBdTgB7wfN/M+Uu5uSqwG46ty3V4+72td KJ+hrsJvrppJEV2t2hwHQqEfKfipc+nLOyhOmBHDGqaS4EQ3BqhPFrM7AfKvK1YldrJ4 L8iuuJUozb3kcqa1ixEUF2CKP3YiGadTPHoyDec0YaPY3ymZuaKdx72Bp2nlHAoVOD6b 7hHPW32ag/LZLQ90NKeDAydFELwbhC8WdXUBcsTPbzPH9/lJWJGotuo+nMb3vd2L8jPa mY4a9Ba18H6v6pY8bfcE32m3wnqAXrUFy+WURApLTnqmb8Mf0EeDaoTDsW7p/dc1Ryml q8Ow== X-Gm-Message-State: ALoCoQmENZ2Ru8PiaRHoXcl+gNzuIjZq/5x4f/bgcmv1cWo7sK/cBub2woUI8h+F2d8ftmqQPuCB X-Received: by 10.70.131.107 with SMTP id ol11mr78318973pdb.63.1426077696381; Wed, 11 Mar 2015 05:41:36 -0700 (PDT) Received: from localhost ([180.150.153.56]) by mx.google.com with ESMTPSA id kn4sm5930517pab.48.2015.03.11.05.41.34 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Wed, 11 Mar 2015 05:41:35 -0700 (PDT) From: Hanjun Guo To: Catalin Marinas , "Rafael J. Wysocki" , Will Deacon , Olof Johansson , Grant Likely Cc: Lorenzo Pieralisi , Arnd Bergmann , Mark Rutland , Graeme Gregory , Sudeep Holla , Jon Masters , Marc Zyngier , Mark Brown , Robert Richter , Timur Tabi , Ashwin Chaugule , 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, Hanjun Guo Subject: [PATCH v10 09/21] ARM64 / ACPI: If we chose to boot from acpi then disable FDT Date: Wed, 11 Mar 2015 20:39:35 +0800 Message-Id: <1426077587-1561-10-git-send-email-hanjun.guo@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1426077587-1561-1-git-send-email-hanjun.guo@linaro.org> References: <1426077587-1561-1-git-send-email-hanjun.guo@linaro.org> Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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(); psci_init();