From patchwork Wed Feb 25 08:39:50 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hanjun Guo X-Patchwork-Id: 45017 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f72.google.com (mail-wg0-f72.google.com [74.125.82.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 9002120502 for ; Wed, 25 Feb 2015 08:42:41 +0000 (UTC) Received: by wggy19 with SMTP id y19sf1689891wgg.1 for ; Wed, 25 Feb 2015 00:42: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=xeExWA87XbgHtz9nTuK2FxGBUqAdbiL4Gx+odNjatFQ=; b=BOIz4R0KWwc/Sx9Dr1oWbFnRVIzV9EtzCVEkzszPSDkpZ6IK/Wg2N+hploqEq8y/qQ V6dodxcHfU2/8rALFXTxVzqrBPl2m4CS6JL7VKiVNOq99LaX3GbqhQ9cWhcl8Tb4nous JZES8iVXtnIOl8po1ymMWU1+93dQ81H+NOi7x9Tk6NsJVkhT8GkU9hfoUWRoybbrXYnX C12K0xJ/qQun4Ha55PY02pZFRR2zfZdoeuWSJRfpColnk22aBsIZ+uTCsAoRyKUah6gn MvteRv4Szg2KKETpOzfa49Jf+KPNvF/HJo7aOomP6pO5OGaueChmbXpgtVTDBsJQZyNq c/RQ== X-Gm-Message-State: ALoCoQmC815axzeg9a9KafhE0Ous8uCn7FKUgLumU4ZsRjVQ+mTYkYQcFvIPWHgdkrhz5cqKNEPu X-Received: by 10.152.1.5 with SMTP id 5mr281848lai.4.1424853760647; Wed, 25 Feb 2015 00:42:40 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.7.100 with SMTP id i4ls639113laa.106.gmail; Wed, 25 Feb 2015 00:42:40 -0800 (PST) X-Received: by 10.152.36.232 with SMTP id t8mr1781430laj.90.1424853760275; Wed, 25 Feb 2015 00:42:40 -0800 (PST) Received: from mail-lb0-f170.google.com (mail-lb0-f170.google.com. [209.85.217.170]) by mx.google.com with ESMTPS id ug7si27437226lac.123.2015.02.25.00.42.40 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 25 Feb 2015 00:42:40 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.170 as permitted sender) client-ip=209.85.217.170; Received: by lbiw7 with SMTP id w7so2294257lbi.9 for ; Wed, 25 Feb 2015 00:42:40 -0800 (PST) X-Received: by 10.112.118.211 with SMTP id ko19mr1769379lbb.19.1424853759996; Wed, 25 Feb 2015 00:42: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.35.133 with SMTP id h5csp2475784lbj; Wed, 25 Feb 2015 00:42:39 -0800 (PST) X-Received: by 10.68.254.168 with SMTP id aj8mr3665713pbd.80.1424853758121; Wed, 25 Feb 2015 00:42:38 -0800 (PST) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id pd8si4311724pbc.191.2015.02.25.00.42.36; Wed, 25 Feb 2015 00:42:38 -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 S1753336AbbBYImc (ORCPT + 28 others); Wed, 25 Feb 2015 03:42:32 -0500 Received: from mail-pa0-f44.google.com ([209.85.220.44]:43619 "EHLO mail-pa0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753287AbbBYIm2 (ORCPT ); Wed, 25 Feb 2015 03:42:28 -0500 Received: by paceu11 with SMTP id eu11so3597044pac.10 for ; Wed, 25 Feb 2015 00:42:28 -0800 (PST) X-Received: by 10.68.65.110 with SMTP id w14mr3539324pbs.57.1424853748395; Wed, 25 Feb 2015 00:42:28 -0800 (PST) Received: from localhost ([167.160.116.82]) by mx.google.com with ESMTPSA id f10sm32054031pds.37.2015.02.25.00.42.24 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Wed, 25 Feb 2015 00:42:26 -0800 (PST) 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@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 v9 10/21] ARM64 / ACPI: If we chose to boot from acpi then disable FDT Date: Wed, 25 Feb 2015 16:39:50 +0800 Message-Id: <1424853601-6675-11-git-send-email-hanjun.guo@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1424853601-6675-1-git-send-email-hanjun.guo@linaro.org> References: <1424853601-6675-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.170 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 Signed-off-by: Graeme Gregory Signed-off-by: Hanjun Guo Acked-by: Grant Likely --- 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();