From patchwork Wed Jan 14 15:04:53 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hanjun Guo X-Patchwork-Id: 43124 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-we0-f200.google.com (mail-we0-f200.google.com [74.125.82.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 3A727240B9 for ; Wed, 14 Jan 2015 15:11:42 +0000 (UTC) Received: by mail-we0-f200.google.com with SMTP id u56sf5178279wes.3 for ; Wed, 14 Jan 2015 07:11:41 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:subject:date:message-id :in-reply-to:references:cc:precedence:list-id:list-unsubscribe :list-archive:list-post:list-help:list-subscribe:mime-version :content-type:content-transfer-encoding:sender:errors-to :x-original-sender:x-original-authentication-results:mailing-list; bh=NoakkNcqCZmlHWvfoh9GCdceu8OVafv/Gnm05N59npk=; b=GQy2h4N4wqQ7vp1rLmdVmvyWk1e76I99/RswGlZYCW4PclAWCtLZ1jESSeZSSvr6xO hXcpv51UtP4mcrpu71nBttRtQ+8ATqwyttM3ImB0x3GxtGdzPO8XoihZUYjK2ZdzzMFK iBmIECh0VFaWxqlV2ql3uHXz2x9tzdpNYSgRv+gyLLpVGSEg3axEE9eus8jxMDNaFRml T2wgYXJ65yiFIYBVosjMIBcyVYzExabVxVc29gb7P7DFztyE2ULqwmyDoqEPilgUY6oR AUz6xsJGSBbMdr26D1eMIVGom4GXlkKEm8pEI0Vvyg0V7h5IcD/4V+Ow7dcBT+PjR2L/ PVTA== X-Gm-Message-State: ALoCoQn+NfD4iTxOxu8yYMCdTTVFQJP1BtncSlpV04Hrr4uB6QEF4MrtjvyUHojeoz+n/ZX+xsy7 X-Received: by 10.112.99.37 with SMTP id en5mr322119lbb.17.1421248301462; Wed, 14 Jan 2015 07:11:41 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.43.137 with SMTP id w9ls133538lal.5.gmail; Wed, 14 Jan 2015 07:11:41 -0800 (PST) X-Received: by 10.112.180.135 with SMTP id do7mr4358407lbc.23.1421248301319; Wed, 14 Jan 2015 07:11:41 -0800 (PST) Received: from mail-lb0-f176.google.com (mail-lb0-f176.google.com. [209.85.217.176]) by mx.google.com with ESMTPS id uk4si27504431lbb.68.2015.01.14.07.11.41 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 14 Jan 2015 07:11:41 -0800 (PST) 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 mail-lb0-f176.google.com with SMTP id p9so8434663lbv.7 for ; Wed, 14 Jan 2015 07:11:41 -0800 (PST) X-Received: by 10.152.45.4 with SMTP id i4mr4517984lam.74.1421248301240; Wed, 14 Jan 2015 07:11:41 -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.9.200 with SMTP id c8csp1727500lbb; Wed, 14 Jan 2015 07:11:40 -0800 (PST) X-Received: by 10.68.68.172 with SMTP id x12mr6402627pbt.71.1421248297871; Wed, 14 Jan 2015 07:11:37 -0800 (PST) Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id ff5si31011473pad.179.2015.01.14.07.11.37 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Jan 2015 07:11:37 -0800 (PST) Received-SPF: none (google.com: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org does not designate permitted sender hosts) client-ip=2001:1868:205::9; 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 1YBPZz-0007bR-BR; Wed, 14 Jan 2015 15:09:55 +0000 Received: from mail-pd0-f171.google.com ([209.85.192.171]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1YBPXw-0006I4-Kh for linux-arm-kernel@lists.infradead.org; Wed, 14 Jan 2015 15:07:49 +0000 Received: by mail-pd0-f171.google.com with SMTP id y13so10274775pdi.2 for ; Wed, 14 Jan 2015 07:07:27 -0800 (PST) X-Received: by 10.66.221.135 with SMTP id qe7mr6428448pac.26.1421248047165; Wed, 14 Jan 2015 07:07:27 -0800 (PST) Received: from localhost (119.81.172.112-static.reverse.softlayer.com. [119.81.172.112]) by mx.google.com with ESMTPSA id lo3sm20176859pab.26.2015.01.14.07.07.25 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Wed, 14 Jan 2015 07:07:26 -0800 (PST) From: Hanjun Guo To: Catalin Marinas , "Rafael J. Wysocki" , Olof Johansson , Arnd Bergmann , Mark Rutland , Grant Likely , Will Deacon Subject: [PATCH v7 05/17] ARM64 / ACPI: If we chose to boot from acpi then disable FDT Date: Wed, 14 Jan 2015 23:04:53 +0800 Message-Id: <1421247905-3749-6-git-send-email-hanjun.guo@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1421247905-3749-1-git-send-email-hanjun.guo@linaro.org> References: <1421247905-3749-1-git-send-email-hanjun.guo@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150114_070748_779394_88DD6D83 X-CRM114-Status: UNSURE ( 9.06 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.7 (/) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-0.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.192.171 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.192.171 listed in wl.mailspike.net] -0.0 SPF_PASS SPF: sender matches SPF record Cc: Rob Herring , Lorenzo Pieralisi , Robert Richter , Jason Cooper , Graeme Gregory , linux-acpi@vger.kernel.org, Marc Zyngier , Jon Masters , Timur Tabi , Randy Dunlap , linux-kernel@vger.kernel.org, linaro-acpi@lists.linaro.org, wangyijing@huawei.com, Mark Brown , Hanjun Guo , suravee.suthikulpanit@amd.com, Sudeep Holla , Bjorn Helgaas , phoenix.liyi@huawei.com, linux-arm-kernel@lists.infradead.org, Charles.Garcia-Tobin@arm.com 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+patch=linaro.org@lists.infradead.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 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. Tested-by: Suravee Suthikulpanit Tested-by: Yijing Wang 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 4580ed3..5d139e1 100644 --- a/arch/arm64/kernel/setup.c +++ b/arch/arm64/kernel/setup.c @@ -411,7 +411,8 @@ void __init setup_arch(char **cmdline_p) efi_idmap_init(); early_ioremap_reset(); - unflatten_device_tree(); + if (acpi_disabled) + unflatten_device_tree(); psci_init();