From patchwork Wed Mar 11 12:39:35 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hanjun Guo X-Patchwork-Id: 45637 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f197.google.com (mail-wi0-f197.google.com [209.85.212.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 23016214C6 for ; Wed, 11 Mar 2015 12:41:58 +0000 (UTC) Received: by widex7 with SMTP id ex7sf7001215wid.2 for ; Wed, 11 Mar 2015 05:41:57 -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=Lw/FnVxIKPSUb7B2hjlIF114C8uda/hTD7QnuX+20tFIH1s7/59F+mSIfXqurNqe0Y FxtMfs+JNwCnq/U/Yn10HP/MeMF+v5gzUMXO5RmsujIL3R+E3lDKbelTrMiu/GnjijNQ HG6pFk+EfhGHR+TKDVUQaK72c/Pz1boxc/Os9nurp38j90UkfaOEfRkDKFKSQ83HPjkm jwUgVHuJvRt8Dzm9ZABdqh4BoFjXDXlDBUYhQuZK7DFI99ntEyky+Q8B3Jqxixsjg7WV CEj0Jegpo3hGRxCt0G4lr02zIgqtG1OeT2XL2cj2LgdOlXSQtNqs4xSvSG/jK9ZG9Vka iAKw== X-Gm-Message-State: ALoCoQkBwU6cu8pr5npgFWfvUDA9bI7cI38foyWumVfD15887LDWGA+NUipvFeYEWar+cC3w7CZR X-Received: by 10.112.198.34 with SMTP id iz2mr5275230lbc.22.1426077717425; Wed, 11 Mar 2015 05:41:57 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.29.201 with SMTP id m9ls157584lah.6.gmail; Wed, 11 Mar 2015 05:41:57 -0700 (PDT) X-Received: by 10.112.26.134 with SMTP id l6mr26376069lbg.23.1426077717242; Wed, 11 Mar 2015 05:41:57 -0700 (PDT) Received: from mail-la0-f49.google.com (mail-la0-f49.google.com. [209.85.215.49]) by mx.google.com with ESMTPS id u2si2239955laj.129.2015.03.11.05.41.57 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 11 Mar 2015 05:41:57 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.49 as permitted sender) client-ip=209.85.215.49; Received: by labhs14 with SMTP id hs14so7962568lab.5 for ; Wed, 11 Mar 2015 05:41:57 -0700 (PDT) X-Received: by 10.112.130.195 with SMTP id og3mr34009993lbb.112.1426077717144; Wed, 11 Mar 2015 05:41:57 -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.35.133 with SMTP id h5csp2751947lbj; Wed, 11 Mar 2015 05:41:56 -0700 (PDT) X-Received: by 10.66.55.104 with SMTP id r8mr76058363pap.75.1426077715110; Wed, 11 Mar 2015 05:41:55 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id pr2si1691662pdb.188.2015.03.11.05.41.54; Wed, 11 Mar 2015 05:41:55 -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 S1753151AbbCKMln (ORCPT + 28 others); Wed, 11 Mar 2015 08:41:43 -0400 Received: from mail-pd0-f177.google.com ([209.85.192.177]:44834 "EHLO mail-pd0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753074AbbCKMlg (ORCPT ); Wed, 11 Mar 2015 08:41:36 -0400 Received: by pdjz10 with SMTP id z10so10907849pdj.11 for ; Wed, 11 Mar 2015 05:41:36 -0700 (PDT) X-Received: by 10.70.131.107 with SMTP id ol11mr78318973pdb.63.1426077696381; Wed, 11 Mar 2015 05:41:36 -0700 (PDT) Received: from localhost ([180.150.153.56]) by mx.google.com with ESMTPSA id kn4sm5930517pab.48.2015.03.11.05.41.34 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Wed, 11 Mar 2015 05:41:35 -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@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 v10 09/21] ARM64 / ACPI: If we chose to boot from acpi then disable FDT Date: Wed, 11 Mar 2015 20:39:35 +0800 Message-Id: <1426077587-1561-10-git-send-email-hanjun.guo@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1426077587-1561-1-git-send-email-hanjun.guo@linaro.org> References: <1426077587-1561-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.215.49 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();