From patchwork Mon Sep 1 14:57:43 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hanjun Guo X-Patchwork-Id: 4820441 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id B68A79F314 for ; Mon, 1 Sep 2014 15:04:17 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9F7EE20155 for ; Mon, 1 Sep 2014 15:04:13 +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 73CCB20145 for ; Mon, 1 Sep 2014 15:04:09 +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 1XOT5j-0000EF-8o; Mon, 01 Sep 2014 15:00:23 +0000 Received: from mail-pd0-f175.google.com ([209.85.192.175]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XOT5h-0007Im-1t for linux-arm-kernel@lists.infradead.org; Mon, 01 Sep 2014 15:00:21 +0000 Received: by mail-pd0-f175.google.com with SMTP id ft15so6285584pdb.20 for ; Mon, 01 Sep 2014 08:00:00 -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=Ze7pGqNiNM/jViad1N/42ix8Ead/I8JBuw+iAOpz9Ds=; b=OYOGOdwA7GiC0sVAFU0Cbtwwf+d0cih1Yg38HZZAC9LXSEngEb7SwcOfsU2Fc6WMtY Du0Sn8cytENZBiQhswpEeCaA+c65khbgwNwt0RIriMhs3VC/+do3qBTaFhBXWXuUPIUa oQA1s88bjTIv4+DJoto1glJdGKHVfkYh1RIzBPRdr+TpDFWbDWFqgNI4CqTTjycce4hw 3e13uFfw8MYFSgDb1cKj/73RjrpCgZ1a4hlqSCfGDO59NH+JQXeRT67Ng02LR1JWmGS/ LXCKVaxM4O5o/gDsfI24K+CCTk29sXiZc8Ecu6nQPqGth9DN3JChEFgG4KJTwNWsLxzH hQJA== X-Gm-Message-State: ALoCoQk9doX3oD92JyTzw0hIlnjDSN4NMX+E2SiNcqNVloa259H4+S6WuGm/1nxcOGmOX2iEVv6T X-Received: by 10.70.47.161 with SMTP id e1mr40628679pdn.71.1409583598812; Mon, 01 Sep 2014 07:59:58 -0700 (PDT) Received: from localhost ([202.104.114.248]) by mx.google.com with ESMTPSA id db2sm1267681pbc.16.2014.09.01.07.59.56 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 01 Sep 2014 07:59:58 -0700 (PDT) From: Hanjun Guo To: Catalin Marinas , "Rafael J. Wysocki" , Mark Rutland , Olof Johansson , Grant Likely Subject: [PATCH v3 05/17] ARM64 / ACPI: If we chose to boot from acpi then disable FDT Date: Mon, 1 Sep 2014 22:57:43 +0800 Message-Id: <1409583475-6978-6-git-send-email-hanjun.guo@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1409583475-6978-1-git-send-email-hanjun.guo@linaro.org> References: <1409583475-6978-1-git-send-email-hanjun.guo@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140901_080021_121324_4B179DED X-CRM114-Status: GOOD ( 10.95 ) X-Spam-Score: -1.5 (-) Cc: linaro-acpi@lists.linaro.org, Liviu Dudau , Lv Zheng , Rob Herring , Lorenzo Pieralisi , Daniel Lezcano , Robert Moore , linux-acpi@vger.kernel.org, Charles.Garcia-Tobin@arm.com, Robert Richter , Jason Cooper , Arnd Bergmann , Marc Zyngier , Will Deacon , Mark Brown , Bjorn Helgaas , linux-arm-kernel@lists.infradead.org, Graeme Gregory , Randy Dunlap , linux-kernel@vger.kernel.org, Hanjun Guo , Sudeep Holla 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=-3.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, 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=off has not been passed. Then do not unflat devicetree effectively disabling further hardware probing from DT. 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 fb7cc0e..ba181ba 100644 --- a/arch/arm64/kernel/setup.c +++ b/arch/arm64/kernel/setup.c @@ -395,7 +395,8 @@ void __init setup_arch(char **cmdline_p) efi_idmap_init(); cpu_logical_map(0) = read_cpuid_mpidr() & MPIDR_HWID_BITMASK; - unflatten_device_tree(); + if (acpi_disabled) + unflatten_device_tree(); psci_init();