From patchwork Wed Feb 25 08:39:50 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hanjun Guo X-Patchwork-Id: 5878801 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 0FEF29F691 for ; Wed, 25 Feb 2015 08:51:56 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3FAB420373 for ; Wed, 25 Feb 2015 08:51:55 +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 29F8B20304 for ; Wed, 25 Feb 2015 08:51:54 +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 1YQXe5-000846-7B; Wed, 25 Feb 2015 08:48:41 +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 1YQXYP-0000Uf-JW for linux-arm-kernel@lists.infradead.org; Wed, 25 Feb 2015 08:42:50 +0000 Received: by pdev10 with SMTP id v10so3381518pde.7 for ; Wed, 25 Feb 2015 00:42:28 -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=tHCAT0+Duria029Off19nxVzcl7Dx/9irfTZYCwgCaM=; b=FMbeb8b61pA6WcHXy0qZBdAU2yPYM4gSJMUrkoyLqNxyZMlun6RdY9z5exvC0leAIB j4JgjQU8ZEdLz+P3VZmCUGj+L9pDPnqZn4lv6I64BVpUlNojJfUYL6Kmq6XQrGoKA5ei htzzJvn3jCxQrxjNlPvYISom2KLKokRxWKWySe2EHSJgyDS0167MBfFeEYk4Urb1OhQJ gNVbdzv1WPFC9PPR404K/QaomnnPbExZNpXYwW9QfiyL6pRYL8aQni776KKB8an6GuC4 jBKPxVR7sKRZXVHhAS1jo1B1UeD4tJYexkjIZMaBZMJxYYvIqKjWgKhkL/K6DNn26gWa pYcg== X-Gm-Message-State: ALoCoQmwcvFwZSshmn6HKQA9AQMErnZZ64eUP5zygbwTZ6QLupS0CS9F+kFmkUOluasUi0aAn40A X-Received: by 10.68.65.110 with SMTP id w14mr3539324pbs.57.1424853748395; Wed, 25 Feb 2015 00:42:28 -0800 (PST) Received: from localhost ([167.160.116.82]) by mx.google.com with ESMTPSA id f10sm32054031pds.37.2015.02.25.00.42.24 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Wed, 25 Feb 2015 00:42:26 -0800 (PST) From: Hanjun Guo To: Catalin Marinas , "Rafael J. Wysocki" , Will Deacon , Olof Johansson , Grant Likely Subject: [PATCH v9 10/21] ARM64 / ACPI: If we chose to boot from acpi then disable FDT Date: Wed, 25 Feb 2015 16:39:50 +0800 Message-Id: <1424853601-6675-11-git-send-email-hanjun.guo@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1424853601-6675-1-git-send-email-hanjun.guo@linaro.org> References: <1424853601-6675-1-git-send-email-hanjun.guo@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150225_004249_720062_6EC7AF58 X-CRM114-Status: UNSURE ( 9.55 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.7 (/) Cc: Mark Rutland , Ashwin Chaugule , Lorenzo Pieralisi , Robert Richter , Arnd Bergmann , Graeme Gregory , linaro-acpi@lists.linaro.org, Marc Zyngier , Jon Masters , Timur Tabi , linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org, Mark Brown , Hanjun Guo , suravee.suthikulpanit@amd.com, Sudeep Holla , linux-arm-kernel@lists.infradead.org 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. CC: Catalin Marinas CC: Will Deacon Tested-by: Suravee Suthikulpanit Tested-by: Yijing Wang Tested-by: Mark Langsdorf Tested-by: Jon Masters Tested-by: Timur Tabi Tested-by: Robert Richter Acked-by: Robert Richter Signed-off-by: Graeme Gregory Signed-off-by: Hanjun Guo Acked-by: Olof Johansson Acked-by: Grant Likely --- 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 4f1a014..e8c7000 100644 --- a/arch/arm64/kernel/setup.c +++ b/arch/arm64/kernel/setup.c @@ -390,7 +390,8 @@ void __init setup_arch(char **cmdline_p) early_ioremap_reset(); - unflatten_device_tree(); + if (acpi_disabled) + unflatten_device_tree(); psci_init();