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: 5984271 Return-Path: X-Original-To: patchwork-linux-arm@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 ADEE8BF440 for ; Wed, 11 Mar 2015 12:51:16 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D7134200D4 for ; Wed, 11 Mar 2015 12:51:15 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 979C52012E for ; Wed, 11 Mar 2015 12:51:14 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1YVg40-0002UM-Se; Wed, 11 Mar 2015 12:48:40 +0000 Received: from mail-pa0-f47.google.com ([209.85.220.47]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1YVfxV-0004I9-Ow for linux-arm-kernel@lists.infradead.org; Wed, 11 Mar 2015 12:41:58 +0000 Received: by padfa1 with SMTP id fa1so11215261pad.3 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=XO2n14Gbw2puTGhV60/1tVup/o8melZzRq8HAiylr0j6J0Bp8iZhUC0NMnjbA9xxr9 y5ZL+UTTKO8VCNw/Poy6lD4Qy749jUaHk+XiJLOfc4IMW0TTPLTRaovIIyPC/dFCU704 uuCkrDpVsYYYEgX/rOgSbRaSuE7NY+OjGdxmuCa5GjojLfvPaozZYsLRSJSv9SO3i5KV /F492s9KtCUrInaSnhck6iMZDORKqQRxE3TM9RWRJk3PxaCyC5lYvlYGNFT0Ym5vDknd 8TUwrdhsAO+ojmfPR3zKLHE3yHyuVmuTxIVM/Ii+PJKnbn/sOG6RI0T9djxkdT+rnZwZ OunA== X-Gm-Message-State: ALoCoQl3v5q5ND2xZruRBZGMIROLH9+Gvg8JRiQeUhUKgS+R4V65UGJg73zMgwL0xQu8n2E0U7Yq 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 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> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150311_054157_941158_E195CF75 X-CRM114-Status: UNSURE ( 9.52 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.7 (/) Cc: Mark Rutland , Ashwin Chaugule , Lorenzo Pieralisi , Robert Richter , Arnd Bergmann , Graeme Gregory , linaro-acpi@lists.linaro.org, Marc Zyngier , Jon Masters , Timur Tabi , linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org, Mark Brown , Hanjun Guo , suravee.suthikulpanit@amd.com, Sudeep Holla , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, 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();