From patchwork Sun Jan 4 10:55:07 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hanjun Guo X-Patchwork-Id: 5563301 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.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 6AF8C9F6B5 for ; Sun, 4 Jan 2015 10:59:38 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A56A7201FB for ; Sun, 4 Jan 2015 10:59:37 +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 26257201ED for ; Sun, 4 Jan 2015 10:59:36 +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 1Y7irw-0005zw-2y; Sun, 04 Jan 2015 10:57:12 +0000 Received: from mail-pa0-f50.google.com ([209.85.220.50]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Y7irH-0005Tf-9O for linux-arm-kernel@lists.infradead.org; Sun, 04 Jan 2015 10:56:31 +0000 Received: by mail-pa0-f50.google.com with SMTP id bj1so26645912pad.23 for ; Sun, 04 Jan 2015 02:56:08 -0800 (PST) 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=o/3dQLQz0OOd3JUyDF9TzjBa3NJ8inZWxGUQyixKaro=; b=AmBsdBBCM3p9tRlgOZLX/M++eKcE6BMDV3m2YiHF60tn9fbHInNPu/ce9egTbJblTr 6p3vLHVwzJYeUg0jy8zc93047hoo7jB8Ny/HJxWWF66rTLwBBPrPadmiKyUCuykFFNxc hDNuxryVXSclx34iwn4aYI0om6JOXzoAcyGafer08eepsdr6p2lzE+RBvtOeSwjWdH/T RJPMb7jHpyPMCHtZuqhemwnwLUqvc7NzjFrKLJbgmk2udhj3UKp1tmdoOyYyK9tYjIyB oXDukr59wxH1K4APf3MOlhXPdMDhw28QoxBwDyVk5gAB/9E94xjRXishebxjmu5i1KOM 9C3g== X-Gm-Message-State: ALoCoQmNnXEMIlkZBlioSYeOm33Lp3h6un/G7X8bG7mSQf8j/qU9MkLAgAuo5Tzs5YEZuc1QzBQr X-Received: by 10.68.134.3 with SMTP id pg3mr139424388pbb.84.1420368968774; Sun, 04 Jan 2015 02:56:08 -0800 (PST) Received: from localhost ([180.150.148.224]) by mx.google.com with ESMTPSA id ri3sm51367602pdb.58.2015.01.04.02.56.07 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Sun, 04 Jan 2015 02:56:08 -0800 (PST) From: Hanjun Guo To: Catalin Marinas , "Rafael J. Wysocki" , Olof Johansson , Arnd Bergmann , Mark Rutland , Grant Likely , Will Deacon Subject: [PATCH v6 06/17] ARM64 / ACPI: If we chose to boot from acpi then disable FDT Date: Sun, 4 Jan 2015 18:55:07 +0800 Message-Id: <1420368918-5086-7-git-send-email-hanjun.guo@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1420368918-5086-1-git-send-email-hanjun.guo@linaro.org> References: <1420368918-5086-1-git-send-email-hanjun.guo@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150104_025631_398079_1EB504BB X-CRM114-Status: UNSURE ( 9.43 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.7 (/) Cc: Rob Herring , Lorenzo Pieralisi , Robert Richter , Jason Cooper , Graeme Gregory , linaro-acpi@lists.linaro.org, Marc Zyngier , Jon Masters , Timur Tabi , Randy Dunlap , linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org, Mark Brown , Hanjun Guo , suravee.suthikulpanit@amd.com, Sudeep Holla , Bjorn Helgaas , phoenix.liyi@huawei.com, linux-arm-kernel@lists.infradead.org, Charles.Garcia-Tobin@arm.com 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=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_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. Tested-by: Suravee Suthikulpanit 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 22e6895..2534de3 100644 --- a/arch/arm64/kernel/setup.c +++ b/arch/arm64/kernel/setup.c @@ -410,7 +410,8 @@ void __init setup_arch(char **cmdline_p) efi_idmap_init(); - unflatten_device_tree(); + if (acpi_disabled) + unflatten_device_tree(); psci_init();