From patchwork Tue Mar 24 14:02:42 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hanjun Guo X-Patchwork-Id: 46258 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f198.google.com (mail-wi0-f198.google.com [209.85.212.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 6376E214B0 for ; Tue, 24 Mar 2015 14:09:36 +0000 (UTC) Received: by wivr20 with SMTP id r20sf13152657wiv.0 for ; Tue, 24 Mar 2015 07:09:35 -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=lzijj4AO++jhadKzrluD27Oi7ztTIYVXToUJAPcOn78=; b=TCVLtwMvePM4M+72YvP84nz0bZ3UW9HKUVkA6MhkCUCN8nYSwpizQJ+07TUHcdETPl aVoDMkI83DTKGLMU72jV/5ey5IEcJdMOaLdEX4iJaZCyGZKVPwmMafZZj+jUVmwe6JKr O/bToN2UKgjR696L+ngnmCV46fgP9NUMMeDGBk8PeXEL6jxtIGXYBTEvF76E/jDjRCmf KNIuw82OeH/PLyW2QpgJcwUvoqIj+7TRZJNyJEaSpEbfUvA6i5eXOkwkdpZ5P6/YO44Y WlGhd6zqz//jMnoiEcu4rXMbOOCOjIok3nGv2F4+b+tmrwhYuCEtR5NsFTJu3LFqNepu NnnQ== X-Gm-Message-State: ALoCoQmB7c2ZtgiNM3jiKXk/VcXkpNIruiq2PHfafo+bK6viHrc+o14qOgSktxl6Afyuy3SL0vC9 X-Received: by 10.194.201.10 with SMTP id jw10mr919568wjc.3.1427206175668; Tue, 24 Mar 2015 07:09:35 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.87.140 with SMTP id ay12ls917011lab.2.gmail; Tue, 24 Mar 2015 07:09:35 -0700 (PDT) X-Received: by 10.112.51.35 with SMTP id h3mr3784197lbo.113.1427206175291; Tue, 24 Mar 2015 07:09:35 -0700 (PDT) Received: from mail-lb0-f176.google.com (mail-lb0-f176.google.com. [209.85.217.176]) by mx.google.com with ESMTPS id lu7si3060723lbb.124.2015.03.24.07.09.35 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 24 Mar 2015 07:09:35 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.176 as permitted sender) client-ip=209.85.217.176; Received: by lbcmq2 with SMTP id mq2so31541658lbc.0 for ; Tue, 24 Mar 2015 07:09:35 -0700 (PDT) X-Received: by 10.152.178.197 with SMTP id da5mr4095742lac.56.1427206175164; Tue, 24 Mar 2015 07:09:35 -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.112.57.201 with SMTP id k9csp1477023lbq; Tue, 24 Mar 2015 07:09:34 -0700 (PDT) X-Received: by 10.70.89.8 with SMTP id bk8mr7787320pdb.139.1427206173341; Tue, 24 Mar 2015 07:09:33 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id cb11si5860392pdb.61.2015.03.24.07.09.32; Tue, 24 Mar 2015 07:09:33 -0700 (PDT) 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 S1753407AbbCXOJ1 (ORCPT + 27 others); Tue, 24 Mar 2015 10:09:27 -0400 Received: from mail-pd0-f180.google.com ([209.85.192.180]:34968 "EHLO mail-pd0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752561AbbCXOEj (ORCPT ); Tue, 24 Mar 2015 10:04:39 -0400 Received: by pdbop1 with SMTP id op1so222310595pdb.2 for ; Tue, 24 Mar 2015 07:04:39 -0700 (PDT) X-Received: by 10.66.218.129 with SMTP id pg1mr7837770pac.65.1427205879171; Tue, 24 Mar 2015 07:04:39 -0700 (PDT) Received: from localhost ([180.150.148.224]) by mx.google.com with ESMTPSA id di10sm4333258pad.41.2015.03.24.07.04.36 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 24 Mar 2015 07:04:37 -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 , Mark Salter , 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 v11 09/23] ARM64 / ACPI: If we chose to boot from acpi then disable FDT Date: Tue, 24 Mar 2015 22:02:42 +0800 Message-Id: <1427205776-5060-10-git-send-email-hanjun.guo@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1427205776-5060-1-git-send-email-hanjun.guo@linaro.org> References: <1427205776-5060-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.176 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. 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();