From patchwork Fri Sep 12 14:00:05 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hanjun Guo X-Patchwork-Id: 37328 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f199.google.com (mail-lb0-f199.google.com [209.85.217.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id B3EAC203EE for ; Fri, 12 Sep 2014 14:02:13 +0000 (UTC) Received: by mail-lb0-f199.google.com with SMTP id z11sf513241lbi.2 for ; Fri, 12 Sep 2014 07:02: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=OMWAXYEYHVafEiDjKzyyRR8e/Whoyskftov83EPdSGQ=; b=doCS2weiPzA5xaqjQJGqvAnD3jN++AJs3DZJL+d933sItzH4Uk1NCUO2v0P54vgEuH 0fq61r/kMQNMe8XDGP5biGJw8qz9TuTCLUb2V9FPB3aJLXHH0ibyg5xw9rzx/AF4vgsT GaD6Lh0gm4yTtC3vcy/pw3Rimb0rNOPH+K/zeZsg5zn0p30N1TumBqcWc8ED2758GdoV c2VQPMjAu/ypPJWDldJea4MO3xBm0a4GoDwWrCQPdPBkS+YXbrhdlwZZkDkEDGsbSuGN I0yc6TfmdQpkVACD6hGmLtRfCd1pdcZfgIjDGpny+1pKy/25tVu/1vhFirKHN+Pv8UM9 itBQ== X-Gm-Message-State: ALoCoQnvtheGX/gAIp7PY2oR4g/jP/prLpG5p59Sij+0EK7sY9f8Nt9i8PN1ccUpPiY6gVCmtHjQ X-Received: by 10.112.63.225 with SMTP id j1mr18236lbs.24.1410530532544; Fri, 12 Sep 2014 07:02:12 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.88.8 with SMTP id bc8ls161245lab.86.gmail; Fri, 12 Sep 2014 07:02:12 -0700 (PDT) X-Received: by 10.152.179.226 with SMTP id dj2mr9376431lac.40.1410530532186; Fri, 12 Sep 2014 07:02: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 wu8si3023004lac.66.2014.09.12.07.02.12 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 12 Sep 2014 07:02: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 c11so956498lbj.23 for ; Fri, 12 Sep 2014 07:02:12 -0700 (PDT) X-Received: by 10.152.204.231 with SMTP id lb7mr7508438lac.44.1410530532080; Fri, 12 Sep 2014 07:02:12 -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.141.42 with SMTP id rl10csp737723lbb; Fri, 12 Sep 2014 07:02:11 -0700 (PDT) X-Received: by 10.50.253.193 with SMTP id ac1mr2372919igd.49.1410530530770; Fri, 12 Sep 2014 07:02:10 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id v3si8191344pdh.66.2014.09.12.07.02.10 for ; Fri, 12 Sep 2014 07:02: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 S1755072AbaILOBX (ORCPT + 7 others); Fri, 12 Sep 2014 10:01:23 -0400 Received: from mail-pd0-f176.google.com ([209.85.192.176]:45421 "EHLO mail-pd0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755066AbaILOBV (ORCPT ); Fri, 12 Sep 2014 10:01:21 -0400 Received: by mail-pd0-f176.google.com with SMTP id y13so1301711pdi.7 for ; Fri, 12 Sep 2014 07:01:21 -0700 (PDT) X-Received: by 10.70.118.68 with SMTP id kk4mr13627004pdb.21.1410530481218; Fri, 12 Sep 2014 07:01:21 -0700 (PDT) Received: from localhost ([111.140.73.43]) by mx.google.com with ESMTPSA id u8sm4014182pbs.61.2014.09.12.07.01.19 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 12 Sep 2014 07:01:20 -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, 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 v4 07/18] ARM64 / ACPI: If we chose to boot from acpi then disable FDT Date: Fri, 12 Sep 2014 22:00:05 +0800 Message-Id: <1410530416-30200-8-git-send-email-hanjun.guo@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1410530416-30200-1-git-send-email-hanjun.guo@linaro.org> References: <1410530416-30200-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=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 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c index 5b05227..5796734 100644 --- a/arch/arm64/kernel/setup.c +++ b/arch/arm64/kernel/setup.c @@ -398,7 +398,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();