From patchwork Wed Jan 14 15:04:53 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hanjun Guo X-Patchwork-Id: 5632281 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 88DAD9F357 for ; Wed, 14 Jan 2015 15:12:29 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A819520251 for ; Wed, 14 Jan 2015 15:12:28 +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 D10D720155 for ; Wed, 14 Jan 2015 15:12:27 +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 1YBPZz-0007bR-BR; Wed, 14 Jan 2015 15:09:55 +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 1YBPXw-0006I4-Kh for linux-arm-kernel@lists.infradead.org; Wed, 14 Jan 2015 15:07:49 +0000 Received: by mail-pd0-f171.google.com with SMTP id y13so10274775pdi.2 for ; Wed, 14 Jan 2015 07:07:27 -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=ymAcSyfza0lRYX2ZsjnKY1jLkxiJA3mcpLo4R3cVB1Y=; b=kpAoQkgLKeNVB72/cEUaCOxBlxjUxGWlu+FK/t/GhZ3EotgGLSP+Xb4qVr7q8/zovW kzujLpbFG12KB89w0B8a2Q97U+qddfSlWXU5K+8daqSt+80hTVsGcg+7ORRvt+lLNfgd CN14mwEosdREvZNNzjS/I5y6lcatf3DOfctRHyNUqO2gvJ08kayUVgQVYAN2p4qYtJ0q tSMQCxwQP5+Gd2UHR8boZEzqXtJAm/d5pBoiz9ZPZ7tgXszNOXM3Podwq7P9/UmkLsL+ teEDngxJKVKmsSwWqgg+yHDF1ioLg3o1ap3TbT3Yk/Z8FWkUGwB2opxGKq1897oI5GA5 N7Gg== X-Gm-Message-State: ALoCoQkwNrbCxzkZoA2z/7SwxZhnXmuQNHXLOPXLcY0VEsAKJTsod9wiBRl6XwDyCszjbMxnBQLq X-Received: by 10.66.221.135 with SMTP id qe7mr6428448pac.26.1421248047165; Wed, 14 Jan 2015 07:07:27 -0800 (PST) Received: from localhost (119.81.172.112-static.reverse.softlayer.com. [119.81.172.112]) by mx.google.com with ESMTPSA id lo3sm20176859pab.26.2015.01.14.07.07.25 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Wed, 14 Jan 2015 07:07:26 -0800 (PST) From: Hanjun Guo To: Catalin Marinas , "Rafael J. Wysocki" , Olof Johansson , Arnd Bergmann , Mark Rutland , Grant Likely , Will Deacon Subject: [PATCH v7 05/17] ARM64 / ACPI: If we chose to boot from acpi then disable FDT Date: Wed, 14 Jan 2015 23:04:53 +0800 Message-Id: <1421247905-3749-6-git-send-email-hanjun.guo@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1421247905-3749-1-git-send-email-hanjun.guo@linaro.org> References: <1421247905-3749-1-git-send-email-hanjun.guo@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150114_070748_779394_88DD6D83 X-CRM114-Status: UNSURE ( 9.06 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.7 (/) Cc: Rob Herring , Lorenzo Pieralisi , Robert Richter , Jason Cooper , Graeme Gregory , linux-acpi@vger.kernel.org, Marc Zyngier , Jon Masters , Timur Tabi , Randy Dunlap , linux-kernel@vger.kernel.org, linaro-acpi@lists.linaro.org, wangyijing@huawei.com, 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 Tested-by: Yijing Wang Signed-off-by: Graeme Gregory Signed-off-by: Hanjun Guo Tested-by: Mark Langsdorf --- 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 4580ed3..5d139e1 100644 --- a/arch/arm64/kernel/setup.c +++ b/arch/arm64/kernel/setup.c @@ -411,7 +411,8 @@ void __init setup_arch(char **cmdline_p) efi_idmap_init(); early_ioremap_reset(); - unflatten_device_tree(); + if (acpi_disabled) + unflatten_device_tree(); psci_init();