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: 36371 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-yh0-f72.google.com (mail-yh0-f72.google.com [209.85.213.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 131B32032B for ; Mon, 1 Sep 2014 15:00:15 +0000 (UTC) Received: by mail-yh0-f72.google.com with SMTP id f73sf21480509yha.7 for ; Mon, 01 Sep 2014 08:00:14 -0700 (PDT) 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=nqZveLj9/oIdi8ykynNLB1CAFsTULO6qW18rksO259Q=; b=Jk37JZD+InIWJuGfT9Bu0Qrs5Z3haM7TwkQNKySUeaIIF+gw19yJguhMWS3GlylMPu Jald1l7gbFKCh829hlDq9ncHuPOb9xBvH0ENqwKltHnTItEEgMkc6Gf/zVdFLWUzfHmq t81f8s5JyEyKJUBWDbae0g/9+oRwcVxcW+NcurHW0yuU84FVZAWH/El0IkJSsgS5UKhw HvDH9yEFPSXJlHcczepN2/IxTxvYi5CtsqwVcd5TFcHESZAqlr+JL68OEcwo9j7OGoFN doVBONEZ3nu5WQpbk6Q58PaR4AzsCtUCK3O/ZXpomDrlLBGY3C4XODv9oiEXVRBBVpIf QVmA== X-Gm-Message-State: ALoCoQmeZturvz/7yTan56eWQ5/k8KmwKls63v6BTJSrpS2zoHZ2EGS1uJJ3bxaXo5Igc2LX0nLX X-Received: by 10.236.84.174 with SMTP id s34mr13731798yhe.21.1409583614892; Mon, 01 Sep 2014 08:00:14 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.51.170 with SMTP id u39ls1994927qga.21.gmail; Mon, 01 Sep 2014 08:00:14 -0700 (PDT) X-Received: by 10.221.66.194 with SMTP id xr2mr616067vcb.65.1409583614790; Mon, 01 Sep 2014 08:00:14 -0700 (PDT) Received: from mail-vc0-f177.google.com (mail-vc0-f177.google.com [209.85.220.177]) by mx.google.com with ESMTPS id qi14si544761vdb.83.2014.09.01.08.00.14 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 01 Sep 2014 08:00:14 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.177 as permitted sender) client-ip=209.85.220.177; Received: by mail-vc0-f177.google.com with SMTP id hq11so5477560vcb.8 for ; Mon, 01 Sep 2014 08:00:14 -0700 (PDT) X-Received: by 10.52.127.5 with SMTP id nc5mr621207vdb.59.1409583614673; Mon, 01 Sep 2014 08:00:14 -0700 (PDT) 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.221.45.67 with SMTP id uj3csp399564vcb; Mon, 1 Sep 2014 08:00:14 -0700 (PDT) X-Received: by 10.69.18.203 with SMTP id go11mr39751380pbd.50.1409583613727; Mon, 01 Sep 2014 08:00:13 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id kf7si1566795pbc.153.2014.09.01.08.00.13 for ; Mon, 01 Sep 2014 08:00:13 -0700 (PDT) Received-SPF: none (google.com: linux-acpi-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 S1754465AbaIAPAC (ORCPT + 7 others); Mon, 1 Sep 2014 11:00:02 -0400 Received: from mail-pd0-f173.google.com ([209.85.192.173]:61744 "EHLO mail-pd0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754461AbaIAO77 (ORCPT ); Mon, 1 Sep 2014 10:59:59 -0400 Received: by mail-pd0-f173.google.com with SMTP id p10so6338968pdj.4 for ; Mon, 01 Sep 2014 07:59:58 -0700 (PDT) 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 Cc: Graeme Gregory , Arnd Bergmann , Sudeep Holla , Will Deacon , Jason Cooper , Marc Zyngier , Bjorn Helgaas , Daniel Lezcano , Mark Brown , Rob Herring , Robert Richter , Lv Zheng , Robert Moore , Lorenzo Pieralisi , Liviu Dudau , Randy Dunlap , Charles.Garcia-Tobin@arm.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 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> Sender: linux-acpi-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-acpi@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.220.177 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=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();