From patchwork Mon Aug 4 15:28:23 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hanjun Guo X-Patchwork-Id: 4671191 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 68B9C9F375 for ; Mon, 4 Aug 2014 15:34:49 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 935342012F for ; Mon, 4 Aug 2014 15:34:48 +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 9DC5120127 for ; Mon, 4 Aug 2014 15:34:47 +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 1XEKG2-0004EY-Hp; Mon, 04 Aug 2014 15:33:06 +0000 Received: from mail-pd0-f169.google.com ([209.85.192.169]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XEKF4-00020A-Jl for linux-arm-kernel@lists.infradead.org; Mon, 04 Aug 2014 15:32:07 +0000 Received: by mail-pd0-f169.google.com with SMTP id y10so9840588pdj.14 for ; Mon, 04 Aug 2014 08:31:45 -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=6OdBww2oXWVbaPZNDW2o1/l2+Q0IE2IrFxrzwxprx3Y=; b=f/0zo/YKOmFVgM6WTbV0m2PeXfGDaEpaIfKOJWI6Mz4V/pY7l4zGXklOhDwkHRYcGf wmrK4gRy+hyD9LpJcaHs3cRsSHNRXx8JiIvOwHvOJEofjnHUoSGUzCDRdTcnCsM2qQ40 pNWsvxJXBFS+ZxdyRHHJpBcnxfpvCXA1KYWgx4DtXwL6n7rujp+xH+4YTQNTIOarcOy5 X38iluAZo3yeSgolVlIjI8STCg4QayiZJm1zc/b5pJySSX0fk0sOaIsYMZe6ISMngsve tHh1n5KgoiRycQNWOTaPwphKTD56VfHsvH9eB3yGRUAxscfFTUm67vzQgvpLVFxV89Ip pCUg== X-Gm-Message-State: ALoCoQkVepqEjblESrlvSsX6RfSoP3ct8m4arWpD+NkLugmb1qtb/3nif+pbDB6j5rBI6yW0cUR/ X-Received: by 10.70.50.137 with SMTP id c9mr4767469pdo.101.1407166305782; Mon, 04 Aug 2014 08:31:45 -0700 (PDT) Received: from localhost ([39.182.20.233]) by mx.google.com with ESMTPSA id sm4sm47526776pab.7.2014.08.04.08.31.38 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 04 Aug 2014 08:31:45 -0700 (PDT) From: Hanjun Guo To: Catalin Marinas , "Rafael J. Wysocki" , Mark Rutland Subject: [PATCH v2 16/18] ARM64 / ACPI: If we chose to boot from acpi then disable FDT Date: Mon, 4 Aug 2014 23:28:23 +0800 Message-Id: <1407166105-17675-17-git-send-email-hanjun.guo@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1407166105-17675-1-git-send-email-hanjun.guo@linaro.org> References: <1407166105-17675-1-git-send-email-hanjun.guo@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140804_083206_702984_3F25747D X-CRM114-Status: GOOD ( 10.89 ) X-Spam-Score: -1.4 (-) Cc: linaro-acpi@lists.linaro.org, Liviu Dudau , Lv Zheng , Rob Herring , Lorenzo Pieralisi , Daniel Lezcano , Robert Moore , linux-acpi@vger.kernel.org, Grant Likely , Charles.Garcia-Tobin@arm.com, Robert Richter , Jason Cooper , Arnd Bergmann , Marc Zyngier , Will Deacon , Mark Brown , Bjorn Helgaas , linux-arm-kernel@lists.infradead.org, Graeme Gregory , Randy Dunlap , linux-kernel@vger.kernel.org, Hanjun Guo , Sudeep Holla , Olof Johansson 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=-2.6 required=5.0 tests=BAYES_00,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=on 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 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c index 056e2e1..0742e8c 100644 --- a/arch/arm64/kernel/setup.c +++ b/arch/arm64/kernel/setup.c @@ -399,8 +399,8 @@ void __init setup_arch(char **cmdline_p) cpu_logical_map(0) = read_cpuid_mpidr() & MPIDR_HWID_BITMASK; acpi_boot_init(); - - unflatten_device_tree(); + if (acpi_disabled) + unflatten_device_tree(); psci_init();