From patchwork Fri Oct 17 13:37:03 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hanjun Guo X-Patchwork-Id: 38864 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f200.google.com (mail-wi0-f200.google.com [209.85.212.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id ED7462054E for ; Fri, 17 Oct 2014 13:39:12 +0000 (UTC) Received: by mail-wi0-f200.google.com with SMTP id h11sf586128wiw.3 for ; Fri, 17 Oct 2014 06:39:12 -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=DLSUoY8nxKKipizT+96AxOhGhyvEnILPqw2VrmIiiCc=; b=ieZxRC3b9WGZuKyRoFP+eLFx27tB7JYdrN3jz9kyvwFhCUlayAiubjYkwW/Sf7ibQX PyZqK+LgBMWs5AnAyTRC46VgO02av/PcLr0Z3KqbtQ9UBcW4dE1fQQbN7E6kuK5B5hRo uJXAg5syMZv+d9EUyOvzzqP14DEWgqV7TyKZqt3mLBDObFXEOZe4uT/lO9k3wAtk/hwZ HcI5h57CrgVXGO2Yf9laeAISyTnGmJFO/TvfLeqz6uYM5Y9Yu1huvZjZY9nDPag//lsl Eb8gfxiXElgi8cbnQYcbkFABYv/4OvELldxOY1WtmAfB/y4xoF40oyjzVpAeZPGKh93t xYIA== X-Gm-Message-State: ALoCoQkg/f6W4Lj1oFAM2l4kNVaarFzYIlZPtCzoE2fPNoO0I8x3nCUELbGFQX8CYztv5GUbNLjg X-Received: by 10.152.116.97 with SMTP id jv1mr161051lab.7.1413553152180; Fri, 17 Oct 2014 06:39:12 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.2.67 with SMTP id 3ls255927las.63.gmail; Fri, 17 Oct 2014 06:39:12 -0700 (PDT) X-Received: by 10.112.11.133 with SMTP id q5mr8787114lbb.77.1413553152016; Fri, 17 Oct 2014 06:39:12 -0700 (PDT) Received: from mail-lb0-f178.google.com (mail-lb0-f178.google.com. [209.85.217.178]) by mx.google.com with ESMTPS id j5si2144145lam.25.2014.10.17.06.39.11 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 17 Oct 2014 06:39:12 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.178 as permitted sender) client-ip=209.85.217.178; Received: by mail-lb0-f178.google.com with SMTP id w7so690991lbi.37 for ; Fri, 17 Oct 2014 06:39:11 -0700 (PDT) X-Received: by 10.112.97.135 with SMTP id ea7mr9026221lbb.46.1413553151937; Fri, 17 Oct 2014 06:39:11 -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.84.229 with SMTP id c5csp228349lbz; Fri, 17 Oct 2014 06:39:11 -0700 (PDT) X-Received: by 10.67.16.106 with SMTP id fv10mr8575990pad.47.1413553150472; Fri, 17 Oct 2014 06:39:10 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id jy10si1161138pbc.150.2014.10.17.06.39.09 for ; Fri, 17 Oct 2014 06:39:10 -0700 (PDT) Received-SPF: none (google.com: linux-acpi-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 S1752459AbaJQNjH (ORCPT + 7 others); Fri, 17 Oct 2014 09:39:07 -0400 Received: from mail-pd0-f172.google.com ([209.85.192.172]:48887 "EHLO mail-pd0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752171AbaJQNjD (ORCPT ); Fri, 17 Oct 2014 09:39:03 -0400 Received: by mail-pd0-f172.google.com with SMTP id ft15so832384pdb.3 for ; Fri, 17 Oct 2014 06:39:03 -0700 (PDT) X-Received: by 10.70.35.72 with SMTP id f8mr8702512pdj.134.1413553143437; Fri, 17 Oct 2014 06:39:03 -0700 (PDT) Received: from localhost ([220.202.153.90]) by mx.google.com with ESMTPSA id bf2sm1651720pbb.13.2014.10.17.06.39.00 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 17 Oct 2014 06:39:02 -0700 (PDT) From: Hanjun Guo To: Catalin Marinas , "Rafael J. Wysocki" , Mark Rutland , Olof Johansson , Grant Likely , Will Deacon Cc: Graeme Gregory , Arnd Bergmann , Sudeep Holla , Jon Masters , Jason Cooper , Marc Zyngier , Bjorn Helgaas , Daniel Lezcano , Mark Brown , Rob Herring , Robert Richter , Lv Zheng , Robert Moore , Lorenzo Pieralisi , Liviu Dudau , Randy Dunlap , Charles.Garcia-Tobin@arm.com, Kangkang.Shen@huawei.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 v5 07/18] ARM64 / ACPI: If we chose to boot from acpi then disable FDT Date: Fri, 17 Oct 2014 21:37:03 +0800 Message-Id: <1413553034-20956-8-git-send-email-hanjun.guo@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1413553034-20956-1-git-send-email-hanjun.guo@linaro.org> References: <1413553034-20956-1-git-send-email-hanjun.guo@linaro.org> Sender: linux-acpi-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-acpi@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.178 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. 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 15621b9..e4f2576 100644 --- a/arch/arm64/kernel/setup.c +++ b/arch/arm64/kernel/setup.c @@ -401,7 +401,8 @@ void __init setup_arch(char **cmdline_p) efi_idmap_init(); cpu_logical_map(0) = read_cpuid_mpidr() & MPIDR_HWID_BITMASK; - unflatten_device_tree(); + if (acpi_disabled) + unflatten_device_tree(); psci_init();