From patchwork Mon Aug 4 15:28:23 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hanjun Guo X-Patchwork-Id: 34874 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ig0-f197.google.com (mail-ig0-f197.google.com [209.85.213.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 3DBD921F5F for ; Mon, 4 Aug 2014 15:31:56 +0000 (UTC) Received: by mail-ig0-f197.google.com with SMTP id r2sf14824569igi.0 for ; Mon, 04 Aug 2014 08:31:55 -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=WvEXsMyHP7lbDSK8M6iZ6dOZpqhZ59n9xkVxhhWOySU=; b=PM2Wn8vIwZ4G50PERf3jKemvA1kpXm3KiTOWX5FQ/IS1R3a1rpeiDgAr8D7kL1es39 cpVYesK4hC4W5i2/7Y0blD+ypIbpaeZdtpENUZ/ReShoaxM9N6jywv0z3l9XK5cjedJU XUGPu5Xj9wPqxbc+G01Ikd2tB5MA0PYIuupmCoKUQJJ8Ywpi0ERIEGWuoV4nX5VP28Ke AgbGxMpToGQiMlImRsUb25jpN57gkvcoW5EL/2Boc8XnK0x4JrR0TYFyAXL1KtVeIDVZ WdRxK430u/5QwErBlh1GtfBcTP3Hn0UWpJkJwwfD+ujs7Khs5zQEA+kHwGEZ+2qkF7Y6 yV5A== X-Gm-Message-State: ALoCoQlnmS1ontqlKBPhME2yoSizdyG2qPt9SXgTryvnLIwUNvzOJmVRE77+2I20yA867zZL+NAF X-Received: by 10.42.212.207 with SMTP id gt15mr21133470icb.31.1407166315719; Mon, 04 Aug 2014 08:31:55 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.19.15 with SMTP id 15ls390050qgg.29.gmail; Mon, 04 Aug 2014 08:31:55 -0700 (PDT) X-Received: by 10.220.175.194 with SMTP id bb2mr18454424vcb.40.1407166315587; Mon, 04 Aug 2014 08:31:55 -0700 (PDT) Received: from mail-vc0-f174.google.com (mail-vc0-f174.google.com [209.85.220.174]) by mx.google.com with ESMTPS id fg6si1173630vcb.46.2014.08.04.08.31.55 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 04 Aug 2014 08:31:55 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.174 as permitted sender) client-ip=209.85.220.174; Received: by mail-vc0-f174.google.com with SMTP id la4so11286443vcb.5 for ; Mon, 04 Aug 2014 08:31:55 -0700 (PDT) X-Received: by 10.52.3.40 with SMTP id 8mr6388890vdz.24.1407166315522; Mon, 04 Aug 2014 08:31:55 -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.221.37.5 with SMTP id tc5csp313447vcb; Mon, 4 Aug 2014 08:31:54 -0700 (PDT) X-Received: by 10.68.164.100 with SMTP id yp4mr3157956pbb.136.1407166314480; Mon, 04 Aug 2014 08:31:54 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id cc4si11005157pad.159.2014.08.04.08.31.53 for ; Mon, 04 Aug 2014 08:31:54 -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 S1751065AbaHDPbt (ORCPT + 21 others); Mon, 4 Aug 2014 11:31:49 -0400 Received: from mail-pd0-f172.google.com ([209.85.192.172]:54409 "EHLO mail-pd0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751493AbaHDPbq (ORCPT ); Mon, 4 Aug 2014 11:31:46 -0400 Received: by mail-pd0-f172.google.com with SMTP id ft15so9799814pdb.17 for ; Mon, 04 Aug 2014 08:31:45 -0700 (PDT) X-Received: by 10.70.50.137 with SMTP id c9mr4767469pdo.101.1407166305782; Mon, 04 Aug 2014 08:31:45 -0700 (PDT) Received: from localhost ([39.182.20.233]) by mx.google.com with ESMTPSA id sm4sm47526776pab.7.2014.08.04.08.31.38 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 04 Aug 2014 08:31:45 -0700 (PDT) From: Hanjun Guo To: Catalin Marinas , "Rafael J. Wysocki" , Mark Rutland Cc: Graeme Gregory , Arnd Bergmann , Olof Johansson , Grant Likely , Sudeep Holla , Will Deacon , 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, 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 v2 16/18] ARM64 / ACPI: If we chose to boot from acpi then disable FDT Date: Mon, 4 Aug 2014 23:28:23 +0800 Message-Id: <1407166105-17675-17-git-send-email-hanjun.guo@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1407166105-17675-1-git-send-email-hanjun.guo@linaro.org> References: <1407166105-17675-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.220.174 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=on 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 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c index 056e2e1..0742e8c 100644 --- a/arch/arm64/kernel/setup.c +++ b/arch/arm64/kernel/setup.c @@ -399,8 +399,8 @@ void __init setup_arch(char **cmdline_p) cpu_logical_map(0) = read_cpuid_mpidr() & MPIDR_HWID_BITMASK; acpi_boot_init(); - - unflatten_device_tree(); + if (acpi_disabled) + unflatten_device_tree(); psci_init();