From patchwork Fri Sep 12 14:00:05 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hanjun Guo X-Patchwork-Id: 4895611 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 D0A94BEEA5 for ; Fri, 12 Sep 2014 14:29:07 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A728120270 for ; Fri, 12 Sep 2014 14:29:06 +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 515ED2026D for ; Fri, 12 Sep 2014 14:29:05 +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 1XSRn9-0001qh-I2; Fri, 12 Sep 2014 14:25:39 +0000 Received: from casper.infradead.org ([2001:770:15f::2]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XSRn7-0001qB-Qv for linux-arm-kernel@bombadil.infradead.org; Fri, 12 Sep 2014 14:25:38 +0000 Received: from mail-pd0-f180.google.com ([209.85.192.180]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XSRQ3-0002Ko-NS for linux-arm-kernel@lists.infradead.org; Fri, 12 Sep 2014 14:01:48 +0000 Received: by mail-pd0-f180.google.com with SMTP id ft15so1270521pdb.25 for ; Fri, 12 Sep 2014 07:01:21 -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=oALO0AicI9sV+ZnHbbiTNfbU4iFSHr8fP2Ezx4Y+7Mw=; b=EAfVMOrP0njfaPuyVOy4Gkh+yzQSNZrL+J6dhcQ3FhDGQ+qFmhV4siMaKOXSa9/1aK ewN2VoMzNE0U4TXC6WwLzMgZev9uEpdmHCEuH0onM2/RJooiC1amfwrUYZWeGoFLnR/b 5rHFAwMlWtjd9Ga3tiWwHyXWCeJq4C/3vg5a+gDHO+59znMZCcq2a0LIYEro3MmICgGd PK2B/jGdQJrsn/qRpYqaMtOSJXvEefvOfeco4gUezFVgSFygtkF+FAIBEDIecGfHaB4w BfQnZTR4LkW/H8L6jU6xl5jZx6Rh3ZYoK/SMGaeYfYf+30KtWBLYO1ChYlO1C3fYA1OW gIuA== X-Gm-Message-State: ALoCoQm0SUyF6SyxPR06x68vWX1zwoKAzAkhObIHtFhv5/oiDwJUoDF/aj6iwAIoCuz29EW2jfpc X-Received: by 10.70.118.68 with SMTP id kk4mr13627004pdb.21.1410530481218; Fri, 12 Sep 2014 07:01:21 -0700 (PDT) Received: from localhost ([111.140.73.43]) by mx.google.com with ESMTPSA id u8sm4014182pbs.61.2014.09.12.07.01.19 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 12 Sep 2014 07:01:20 -0700 (PDT) From: Hanjun Guo To: Catalin Marinas , "Rafael J. Wysocki" , Mark Rutland , Olof Johansson , Grant Likely , Will Deacon Subject: [PATCH v4 07/18] ARM64 / ACPI: If we chose to boot from acpi then disable FDT Date: Fri, 12 Sep 2014 22:00:05 +0800 Message-Id: <1410530416-30200-8-git-send-email-hanjun.guo@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1410530416-30200-1-git-send-email-hanjun.guo@linaro.org> References: <1410530416-30200-1-git-send-email-hanjun.guo@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140912_150147_902969_A7685B41 X-CRM114-Status: GOOD ( 12.17 ) X-Spam-Score: -4.4 (----) Cc: linaro-acpi@lists.linaro.org, Liviu Dudau , Lv Zheng , Rob Herring , Lorenzo Pieralisi , Daniel Lezcano , Robert Moore , linux-acpi@vger.kernel.org, Charles.Garcia-Tobin@arm.com, Robert Richter , Jason Cooper , Arnd Bergmann , Marc Zyngier , Jon Masters , Mark Brown , Bjorn Helgaas , linux-arm-kernel@lists.infradead.org, Graeme Gregory , Randy Dunlap , linux-kernel@vger.kernel.org, Hanjun Guo , Sudeep Holla 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.1 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, 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 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 5b05227..5796734 100644 --- a/arch/arm64/kernel/setup.c +++ b/arch/arm64/kernel/setup.c @@ -398,7 +398,8 @@ void __init setup_arch(char **cmdline_p) efi_idmap_init(); cpu_logical_map(0) = read_cpuid_mpidr() & MPIDR_HWID_BITMASK; - unflatten_device_tree(); + if (acpi_disabled) + unflatten_device_tree(); psci_init();