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: 4433351 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 74AB9BEEAA for ; Fri, 27 Jun 2014 03:56:19 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B82A82020F for ; Fri, 27 Jun 2014 03:56:18 +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 E8DE6201EF for ; Fri, 27 Jun 2014 03:56:17 +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 1X0NEy-00072q-6p; Fri, 27 Jun 2014 03:54:20 +0000 Received: from mail-pd0-f181.google.com ([209.85.192.181]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1X0NDy-0005QG-S0 for linux-arm-kernel@lists.infradead.org; Fri, 27 Jun 2014 03:53:19 +0000 Received: by mail-pd0-f181.google.com with SMTP id v10so3883415pde.40 for ; Thu, 26 Jun 2014 20:52:56 -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=PKyfOLywXGTFSkXhEXq+eYtjDn0YEI/zprb+bLpNujw=; b=dhAmW9zakNMvVuT/DxTTlW1+MidUz07GxX9DNMhsdTm/FBh39jV2lWG8YsJu8fd9kY OiKG8t5LRchxQpKqnrYR1KyGKmbjG0cumraLeUG6GdtYN1b6OM2Yc5X13KBWoH9E77iw 3gQpjEHXs7rVSjdprCH6nQbilEdeuCI8dDfC2I8/zmNZlna/y0B4JsT9f3NqsstxDXU4 xuKfq5siW88eWCTZ3NTr8sPdYCrny/bXN8+x7a2UQrEUXNgpFaz3v3t4ln5yL35q5HT1 KtQDMX7ldP1OEEAXTIllotc+/zua/SzppolP0RPg8h5j7v8ivVjdhNUPu5qV95Qza+Zu +LCw== X-Gm-Message-State: ALoCoQnSgwxBWRvIq8lGrTGAZhc9DxGWPisES1crTUwHBRvgFq7qsZlJuQfe9NBfTjnfkSbHIipr 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 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> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140626_205318_949025_0CA6CCE8 X-CRM114-Status: UNSURE ( 9.59 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.0 (/) Cc: Mark Rutland , lorenzo.pieralisi@arm.com, rric@kernel.org, Graeme Gregory , Arnd Bergmann , linaro-acpi@lists.linaro.org, linux-kernel@vger.kernel.org, Grant Likely , Sudeep Holla , Bjorn Helgaas , 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=-1.9 required=5.0 tests=BAYES_00, 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=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();