From patchwork Fri Jun 27 03:49:35 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hanjun Guo X-Patchwork-Id: 32613 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ve0-f200.google.com (mail-ve0-f200.google.com [209.85.128.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id A23DA201EF for ; Fri, 27 Jun 2014 03:53:10 +0000 (UTC) Received: by mail-ve0-f200.google.com with SMTP id i13sf9005417veh.3 for ; Thu, 26 Jun 2014 20:53:10 -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=cO6O6F6KKCyX12hJu59nI1wzalbtjLsa5qvKRwk4xw4=; b=DziUo8Y5lT5wJMhblFHIZliRllC55xb9uKgpyP+KXDmdSeSt/i3jg3WeO4/ReAl8gB nGsWAe6HGNxxCG+v5tUUkcKZujdXNc6K16A5tHasYdm21gZ852eHucwjraeZ2e3Fo7lf 0FebE9SFmutn8P8/MAJZMxeGHYIc1pNRMQ3t/IxrgMO731CdwsUUC4QJe3AXD79l8vY0 +GyR8EG5S+nuHtobTrxG+j6WVSYS57k0mKq5NWmk5rn6ute0mcfDqn63MJmYT50cyAS7 fI8R8BNNqOCQz/GHVDbRTOnaZjFhDQVt675hEcyuExAjctAl8XpRef9qXOQrBYcAHbwy w3gQ== X-Gm-Message-State: ALoCoQlWyrHg1dQjspU5hSYw5XLCQ8jm7cJefCkVZRaVv/3PL/M5ZqO9GxGJByYuOHIjPKs9/dVx X-Received: by 10.58.229.227 with SMTP id st3mr10253320vec.5.1403841190446; Thu, 26 Jun 2014 20:53:10 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.49.1 with SMTP id p1ls500167qga.97.gmail; Thu, 26 Jun 2014 20:53:10 -0700 (PDT) X-Received: by 10.58.228.74 with SMTP id sg10mr17102157vec.6.1403841190325; Thu, 26 Jun 2014 20:53:10 -0700 (PDT) Received: from mail-ve0-f171.google.com (mail-ve0-f171.google.com [209.85.128.171]) by mx.google.com with ESMTPS id ne10si5730504veb.55.2014.06.26.20.53.10 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 26 Jun 2014 20:53:10 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.171 as permitted sender) client-ip=209.85.128.171; Received: by mail-ve0-f171.google.com with SMTP id jz11so4709519veb.16 for ; Thu, 26 Jun 2014 20:53:10 -0700 (PDT) X-Received: by 10.58.19.10 with SMTP id a10mr17858049vee.1.1403841190221; Thu, 26 Jun 2014 20:53:10 -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 tc5csp77115vcb; Thu, 26 Jun 2014 20:53:09 -0700 (PDT) X-Received: by 10.66.234.202 with SMTP id ug10mr27217893pac.109.1403841189429; Thu, 26 Jun 2014 20:53:09 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id cc2si12394012pbb.208.2014.06.26.20.53.08; Thu, 26 Jun 2014 20:53:08 -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 S1752976AbaF0Dw7 (ORCPT + 27 others); Thu, 26 Jun 2014 23:52:59 -0400 Received: from mail-pd0-f170.google.com ([209.85.192.170]:34636 "EHLO mail-pd0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752945AbaF0Dw4 (ORCPT ); Thu, 26 Jun 2014 23:52:56 -0400 Received: by mail-pd0-f170.google.com with SMTP id z10so3895577pdj.1 for ; Thu, 26 Jun 2014 20:52:56 -0700 (PDT) X-Received: by 10.69.20.74 with SMTP id ha10mr27228413pbd.127.1403841176460; Thu, 26 Jun 2014 20:52:56 -0700 (PDT) Received: from localhost ([183.247.163.231]) by mx.google.com with ESMTPSA id mj9sm18940365pab.20.2014.06.26.20.52.51 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 26 Jun 2014 20:52:55 -0700 (PDT) From: Hanjun Guo To: "Rafael J. Wysocki" , Catalin Marinas , linux-arm-kernel@lists.infradead.org, linux-acpi@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Arnd Bergmann , Bjorn Helgaas , rric@kernel.org, Grant Likely , Sudeep Holla , Mark Rutland , Charles.Garcia-Tobin@arm.com, lorenzo.pieralisi@arm.com, linaro-acpi@lists.linaro.org, Graeme Gregory Subject: [PATCH v4 12/13] ARM64 / ACPI: if we chose to boot from acpi then disable FDT Date: Fri, 27 Jun 2014 11:49:35 +0800 Message-Id: <1403840976-7456-13-git-send-email-hanjun.guo@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1403840976-7456-1-git-send-email-hanjun.guo@linaro.org> References: <1403840976-7456-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.128.171 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 --- 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 9dedb0b..487fd1f 100644 --- a/arch/arm64/kernel/setup.c +++ b/arch/arm64/kernel/setup.c @@ -394,7 +394,8 @@ void __init setup_arch(char **cmdline_p) efi_idmap_init(); - unflatten_device_tree(); + if (acpi_disabled) + unflatten_device_tree(); psci_init();