From patchwork Thu Jul 24 13:00: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: 34218 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-oa0-f72.google.com (mail-oa0-f72.google.com [209.85.219.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 48D0A20C7F for ; Thu, 24 Jul 2014 13:04:28 +0000 (UTC) Received: by mail-oa0-f72.google.com with SMTP id m1sf16758313oag.7 for ; Thu, 24 Jul 2014 06:04:27 -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=xK+9XRh5OllaGdmvHZ7IMER6uBSblMPZa/nmlwtyYfA=; b=hQjZnAlpRZA+Hyvmb6OyLD43usDDXQfdCIlfqEzTyOiNbIIhkFSKPusLtxjjrpGr8g tOK6qclB/94kE3tcl2Mh5lTuQTidu/wnODsnMkDP0I2/CZGumFNV8WQ3A34DiyY6/VRV ZOP5DJj2JaQ7+IMUl8L0z4wBC3NNXWFNj+p3HPKeh+dhQfvJxRwck/EJc5O0I54SVljV tvkmFVewWGPueE+iZhRYEJc+ImLduxhOk3TFwqIBH09zpLCkC07XUy1RJ6E7x3aRnOFz tPTpC3UHDe2FFsSHKgSXnUOKLWQU28xf6Q5wNodxz2fayL7I7S2zoUSp4AMVg9Pk7MTt QtTg== X-Gm-Message-State: ALoCoQkpURzgqw52FH5l8R84uXFXq3zxetlPvsWnqsEwZjkeV8p06wxhqBTRvO18c1ujrDyQ54a0 X-Received: by 10.50.109.131 with SMTP id hs3mr4583558igb.8.1406207067805; Thu, 24 Jul 2014 06:04:27 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.50.227 with SMTP id s90ls729003qga.95.gmail; Thu, 24 Jul 2014 06:04:27 -0700 (PDT) X-Received: by 10.220.74.10 with SMTP id s10mr11839026vcj.61.1406207067606; Thu, 24 Jul 2014 06:04:27 -0700 (PDT) Received: from mail-vc0-f170.google.com (mail-vc0-f170.google.com [209.85.220.170]) by mx.google.com with ESMTPS id dk1si4829117vdb.95.2014.07.24.06.04.27 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 24 Jul 2014 06:04:27 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.170 as permitted sender) client-ip=209.85.220.170; Received: by mail-vc0-f170.google.com with SMTP id lf12so4751306vcb.29 for ; Thu, 24 Jul 2014 06:04:27 -0700 (PDT) X-Received: by 10.52.244.81 with SMTP id xe17mr10196694vdc.24.1406207067205; Thu, 24 Jul 2014 06:04:27 -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 tc5csp363093vcb; Thu, 24 Jul 2014 06:04:26 -0700 (PDT) X-Received: by 10.68.221.161 with SMTP id qf1mr9965286pbc.45.1406207066119; Thu, 24 Jul 2014 06:04:26 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id qp1si5976094pac.31.2014.07.24.06.04.25 for ; Thu, 24 Jul 2014 06:04:26 -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 S932600AbaGXNEN (ORCPT + 13 others); Thu, 24 Jul 2014 09:04:13 -0400 Received: from mail-pd0-f175.google.com ([209.85.192.175]:42751 "EHLO mail-pd0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932342AbaGXNEJ (ORCPT ); Thu, 24 Jul 2014 09:04:09 -0400 Received: by mail-pd0-f175.google.com with SMTP id r10so3641020pdi.34 for ; Thu, 24 Jul 2014 06:04:09 -0700 (PDT) X-Received: by 10.67.5.39 with SMTP id cj7mr2352594pad.154.1406207049244; Thu, 24 Jul 2014 06:04:09 -0700 (PDT) Received: from localhost ([183.247.163.231]) by mx.google.com with ESMTPSA id fm5sm1210529pbd.23.2014.07.24.06.04.02 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 24 Jul 2014 06:04:08 -0700 (PDT) From: Hanjun Guo To: Catalin Marinas , "Rafael J. Wysocki" , Mark Rutland Cc: Graeme Gregory , Arnd Bergmann , Grant Likely , Sudeep Holla , Will Deacon , Jason Cooper , Marc Zyngier , Bjorn Helgaas , Daniel Lezcano , Mark Brown , 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-private@linaro.org, Hanjun Guo Subject: [PATCH 17/19] ARM64 / ACPI: If we chose to boot from acpi then disable FDT Date: Thu, 24 Jul 2014 21:00:23 +0800 Message-Id: <1406206825-15590-18-git-send-email-hanjun.guo@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1406206825-15590-1-git-send-email-hanjun.guo@linaro.org> References: <1406206825-15590-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.170 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=off has not 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 17ab98e..4ace77c 100644 --- a/arch/arm64/kernel/setup.c +++ b/arch/arm64/kernel/setup.c @@ -397,8 +397,8 @@ void __init setup_arch(char **cmdline_p) /* Get the boot CPU's MPIDR before cpu logical map is built */ cpu_logical_map(0) = read_cpuid_mpidr() & MPIDR_HWID_BITMASK; acpi_boot_init(); - - unflatten_device_tree(); + if (acpi_disabled) + unflatten_device_tree(); psci_init();