From patchwork Mon Feb 2 12:45:38 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hanjun Guo X-Patchwork-Id: 44142 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 21A872034D for ; Mon, 2 Feb 2015 12:52:13 +0000 (UTC) Received: by mail-wi0-f198.google.com with SMTP id h11sf18426690wiw.1 for ; Mon, 02 Feb 2015 04:52:12 -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=hW48IKdXxGEZDe+5CxIO+UxzFn3NFitYO3cV0w6qh5s=; b=UO4n3JYdIZDBUwVf9cwo6Z/DD1L02r9taGtrKiuts/k2/G1Z869lAOfwDbLT+CS2kr 4qAoEO4QnZ5yKrP/kkjmBcC1paGBtmmG7Zj6XFL+Tq8s5k8qMvtmG8eJEVp/dYNJkmJ5 uB9TjqRGfRROrE000imvy3C7RyZgeLwUkrADPsm2sZ2z+2958ippbX1lw24J56yNc0Hp BWNKnWLrHMSs2wc4pWm9KOj3bCN9xyB8XlaER7Tm7BmQr1aVIgcECiFLthP4AnBgsNV1 V28PjdqHYLd2gdynIP8WliW5ukkQ6yoIrvdeyOWrAAR4qy2iTDVceFHm9OFJnfPFqBGe ae3g== X-Gm-Message-State: ALoCoQlTZHhHWZwl+662YQvpRpRGI0trlTSIlU5daOvk05eH2MwfTc26vfijp0E4hUuS5BfhkZPy X-Received: by 10.180.87.72 with SMTP id v8mr1198301wiz.3.1422881532345; Mon, 02 Feb 2015 04:52:12 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.153.4.10 with SMTP id ca10ls626795lad.33.gmail; Mon, 02 Feb 2015 04:52:12 -0800 (PST) X-Received: by 10.152.3.70 with SMTP id a6mr19276836laa.71.1422881532181; Mon, 02 Feb 2015 04:52:12 -0800 (PST) Received: from mail-la0-f49.google.com (mail-la0-f49.google.com. [209.85.215.49]) by mx.google.com with ESMTPS id wz2si16881804lbb.65.2015.02.02.04.52.11 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 02 Feb 2015 04:52:11 -0800 (PST) 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 mail-la0-f49.google.com with SMTP id gf13so40213837lab.8 for ; Mon, 02 Feb 2015 04:52:11 -0800 (PST) X-Received: by 10.112.144.164 with SMTP id sn4mr14097737lbb.2.1422881531743; Mon, 02 Feb 2015 04:52:11 -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 h5csp1274706lbj; Mon, 2 Feb 2015 04:52:10 -0800 (PST) X-Received: by 10.66.249.101 with SMTP id yt5mr18712430pac.41.1422881526689; Mon, 02 Feb 2015 04:52:06 -0800 (PST) Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id wa6si23562743pab.88.2015.02.02.04.52.05 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 02 Feb 2015 04:52:06 -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 1YIGSa-0003BB-8X; Mon, 02 Feb 2015 12:50:36 +0000 Received: from mail-pa0-f42.google.com ([209.85.220.42]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1YIGRQ-0008Kk-K5 for linux-arm-kernel@lists.infradead.org; Mon, 02 Feb 2015 12:49:25 +0000 Received: by mail-pa0-f42.google.com with SMTP id bj1so82141740pad.1 for ; Mon, 02 Feb 2015 04:49:06 -0800 (PST) X-Received: by 10.68.162.130 with SMTP id ya2mr28542893pbb.113.1422881346464; Mon, 02 Feb 2015 04:49:06 -0800 (PST) Received: from localhost ([180.150.157.4]) by mx.google.com with ESMTPSA id pd3sm10567155pdb.28.2015.02.02.04.49.04 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 02 Feb 2015 04:49:05 -0800 (PST) From: Hanjun Guo To: Catalin Marinas , "Rafael J. Wysocki" , Olof Johansson , Arnd Bergmann , Mark Rutland , Grant Likely , Will Deacon Subject: [PATCH v8 10/21] ARM64 / ACPI: If we chose to boot from acpi then disable FDT Date: Mon, 2 Feb 2015 20:45:38 +0800 Message-Id: <1422881149-8177-11-git-send-email-hanjun.guo@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1422881149-8177-1-git-send-email-hanjun.guo@linaro.org> References: <1422881149-8177-1-git-send-email-hanjun.guo@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150202_044924_687373_6B087F87 X-CRM114-Status: UNSURE ( 9.35 ) 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.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [209.85.220.42 listed in wl.mailspike.net] -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.220.42 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -0.0 RCVD_IN_MSPIKE_WL Mailspike good senders Cc: Mark Langsdorf , linaro-acpi@lists.linaro.org, wangyijing@huawei.com, Rob Herring , Lorenzo Pieralisi , Timur Tabi , Daniel Lezcano , linux-acpi@vger.kernel.org, Charles.Garcia-Tobin@arm.com, phoenix.liyi@huawei.com, Robert Richter , Jason Cooper , Marc Zyngier , Jon Masters , Mark Brown , Bjorn Helgaas , linux-arm-kernel@lists.infradead.org, Ashwin Chaugule , Graeme Gregory , Randy Dunlap , linux-kernel@vger.kernel.org, Hanjun Guo , suravee.suthikulpanit@amd.com, Sudeep Holla 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.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 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 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 510a681..553967d 100644 --- a/arch/arm64/kernel/setup.c +++ b/arch/arm64/kernel/setup.c @@ -446,7 +446,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();