From patchwork Sun Jan 4 10:55:07 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hanjun Guo X-Patchwork-Id: 42716 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f70.google.com (mail-la0-f70.google.com [209.85.215.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 8C5E620A5F for ; Sun, 4 Jan 2015 10:56:41 +0000 (UTC) Received: by mail-la0-f70.google.com with SMTP id hs14sf11400167lab.1 for ; Sun, 04 Jan 2015 02:56:40 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=pV3ISHwQz6lmzfbZI2ICT6qfyWGdUepbHqz4ns1sNfQ=; b=QsABjAvGqIBm9ybxy4rwmr/gHmBCQvw92I9JNsQ2/mRhf8EgSN7wI4gJjD79aItFAE gmquYW+DfDVpJiNQU3RhKDhJzMG4JVsfO9lZZpI8m+wu7y+CT3Ap9Lk9ekVWnUhBsc6O 8Z3LrcLeU8G0kqleg4tN7340p/jf2BUWie6ndW8zCZWqFhMHme+upGKOqvSJAIjuRnJo BMwZm1yGrd2Vhgejwvhzd8st0PbhlGtW9AHqEX/yXXfZE7faBnplaGiwpF+W3TZ9tYoc pYfgLd/DQbptoPVGsAeFedzdXgHfbN2zVeuYMyZzgqnhySABbwZ9wASv804fqHmizRy1 /cTw== X-Gm-Message-State: ALoCoQn+l6nw5kEOMCw0UBIzLaBe+qj7OjA437t8lT7LSiQA9KNMwrSImFzrejkqMX6FVf1WWEQE X-Received: by 10.180.82.34 with SMTP id f2mr797638wiy.1.1420368999994; Sun, 04 Jan 2015 02:56:39 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.5.229 with SMTP id v5ls981790lav.11.gmail; Sun, 04 Jan 2015 02:56:39 -0800 (PST) X-Received: by 10.152.115.146 with SMTP id jo18mr80412197lab.9.1420368999776; Sun, 04 Jan 2015 02:56:39 -0800 (PST) Received: from mail-lb0-f173.google.com (mail-lb0-f173.google.com. [209.85.217.173]) by mx.google.com with ESMTPS id ua8si58056664lac.7.2015.01.04.02.56.39 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 04 Jan 2015 02:56:39 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.173 as permitted sender) client-ip=209.85.217.173; Received: by mail-lb0-f173.google.com with SMTP id z12so16499223lbi.32 for ; Sun, 04 Jan 2015 02:56:39 -0800 (PST) X-Received: by 10.152.87.12 with SMTP id t12mr86415287laz.31.1420368999698; Sun, 04 Jan 2015 02:56:39 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.9.200 with SMTP id c8csp619109lbb; Sun, 4 Jan 2015 02:56:38 -0800 (PST) X-Received: by 10.68.110.161 with SMTP id ib1mr25262918pbb.36.1420368997818; Sun, 04 Jan 2015 02:56:37 -0800 (PST) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id zs6si78347598pac.109.2015.01.04.02.56.36; Sun, 04 Jan 2015 02:56:37 -0800 (PST) Received-SPF: none (google.com: linux-kernel-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752918AbbADK4Z (ORCPT + 27 others); Sun, 4 Jan 2015 05:56:25 -0500 Received: from mail-pa0-f48.google.com ([209.85.220.48]:54141 "EHLO mail-pa0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752855AbbADK4J (ORCPT ); Sun, 4 Jan 2015 05:56:09 -0500 Received: by mail-pa0-f48.google.com with SMTP id rd3so26677575pab.7 for ; Sun, 04 Jan 2015 02:56:08 -0800 (PST) X-Received: by 10.68.134.3 with SMTP id pg3mr139424388pbb.84.1420368968774; Sun, 04 Jan 2015 02:56:08 -0800 (PST) Received: from localhost ([180.150.148.224]) by mx.google.com with ESMTPSA id ri3sm51367602pdb.58.2015.01.04.02.56.07 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Sun, 04 Jan 2015 02:56:08 -0800 (PST) From: Hanjun Guo To: Catalin Marinas , "Rafael J. Wysocki" , Olof Johansson , Arnd Bergmann , Mark Rutland , Grant Likely , Will Deacon Cc: Lorenzo Pieralisi , Graeme Gregory , Sudeep Holla , Jon Masters , Jason Cooper , Marc Zyngier , Bjorn Helgaas , Mark Brown , Rob Herring , Robert Richter , Randy Dunlap , Charles.Garcia-Tobin@arm.com, phoenix.liyi@huawei.com, Timur Tabi , 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 v6 06/17] ARM64 / ACPI: If we chose to boot from acpi then disable FDT Date: Sun, 4 Jan 2015 18:55:07 +0800 Message-Id: <1420368918-5086-7-git-send-email-hanjun.guo@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1420368918-5086-1-git-send-email-hanjun.guo@linaro.org> References: <1420368918-5086-1-git-send-email-hanjun.guo@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: hanjun.guo@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.173 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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. Tested-by: Suravee Suthikulpanit 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 22e6895..2534de3 100644 --- a/arch/arm64/kernel/setup.c +++ b/arch/arm64/kernel/setup.c @@ -410,7 +410,8 @@ void __init setup_arch(char **cmdline_p) efi_idmap_init(); - unflatten_device_tree(); + if (acpi_disabled) + unflatten_device_tree(); psci_init();