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: 5097751 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 61B0A9F38C for ; Fri, 17 Oct 2014 13:45:07 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 70AE52015D for ; Fri, 17 Oct 2014 13:45:06 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 94AC9200F4 for ; Fri, 17 Oct 2014 13:45:05 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Xf7nk-0001JD-Lt; Fri, 17 Oct 2014 13:42:40 +0000 Received: from mail-pd0-f171.google.com ([209.85.192.171]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Xf7kb-0006RG-1u for linux-arm-kernel@lists.infradead.org; Fri, 17 Oct 2014 13:39:26 +0000 Received: by mail-pd0-f171.google.com with SMTP id ft15so812058pdb.30 for ; Fri, 17 Oct 2014 06:39:03 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=81TC/m03udumhMd164D4EFWLbTEzHhzhAKey5aB7bU0=; b=Ed3N+7ZmQF4na1vAgSMbvqefPQaV5fA40THrT7/MLfHrqt9D381rW6i9ZOEJ73bNod i9D3vItuHPAWIvKf7p9rVUcvZoVXb73sZjLOSrEeqwDXuhPHCCMqYkz9DRsqdMpb5oA7 aaSFzj0KOY0i91lvl0QiEnLX01676UCPQn1aZ989d3Pc1trMCiS8VMSedUzbmgPkNRWz 5iJfq1EgBzAkD0HbcjhZvZrr2kcKKmrlzjPxVUVJ88Lk0jJ+VI0NAeW6sb07OS7CCtj+ X8MZHYc6B8DCQcOznX7Jh7gZ/iVF6xMW/M9Ml/x8yubRbv1t+48yX1081O/eA7B5kv2D 1yGA== X-Gm-Message-State: ALoCoQmIlhaSVbszD+XbHkfMGRZRjE+LEm3RucEK235m7tEnxgglJ7ksxSoX8T/3nMEK8TUotT4D 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 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> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20141017_063925_165230_C04B3947 X-CRM114-Status: GOOD ( 10.40 ) X-Spam-Score: -0.9 (/) Cc: linaro-acpi@lists.linaro.org, Liviu Dudau , Lv Zheng , Rob Herring , Lorenzo Pieralisi , Daniel Lezcano , Robert Moore , linux-acpi@vger.kernel.org, Charles.Garcia-Tobin@arm.com, Robert Richter , Jason Cooper , Arnd Bergmann , Marc Zyngier , Jon Masters , Mark Brown , Bjorn Helgaas , linux-arm-kernel@lists.infradead.org, Graeme Gregory , Kangkang.Shen@huawei.com, Randy Dunlap , linux-kernel@vger.kernel.org, Hanjun Guo , Sudeep Holla X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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();