From patchwork Thu Jul 24 13:00: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: 4618141 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 A05CE9F295 for ; Thu, 24 Jul 2014 13:12:14 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C8450201F2 for ; Thu, 24 Jul 2014 13:12:13 +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 79664201D3 for ; Thu, 24 Jul 2014 13:12:12 +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 1XAIjo-0007WB-S1; Thu, 24 Jul 2014 13:07:12 +0000 Received: from mail-pa0-f45.google.com ([209.85.220.45]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XAIhg-0002fN-My for linux-arm-kernel@lists.infradead.org; Thu, 24 Jul 2014 13:05:04 +0000 Received: by mail-pa0-f45.google.com with SMTP id eu11so3883577pac.4 for ; Thu, 24 Jul 2014 06:04:12 -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=wo3Xgzn8nYTEqGFL+VEgnSSV9c7qy877QzF3GnJ21D0=; b=MdItBumm+38Ulo7MJdpeS3ZofgPQUP+U76AC5aT0SPXwBUAK6Iq1k2SSWBI/tVkA0B 01j/tLNKn+RVYwHgpoSPQKAHwiJdOHRG4LJ/4ZsMOLKBxTL9A38wHIBQS4RqzYy47z7f QD7IdGIrHEnRiiloF8L7mb3RQNm60jfCKpNkYByRvyKKG58KhPYu4lOmG6msWWfZLsW8 6RCwP6ftslpYPAQ+2uCaJL0BLqLRgdVQGMoQ6FUAu6QNWkPrAdZVyAmIyFYh6uGhXbsp aWWr1EkkiIK2bQAerMCSYBf0vh9R+v68/MEukDSA5KdoDy1ZUN/J0YPI71METXHcBtTk ghmw== X-Gm-Message-State: ALoCoQle0zPq6TLYDvIifkX2q+QC2tsToz+u2ACJLAKtdz+xyM3O1H2qDRhU7k9/dptmTKoFvWP8 X-Received: by 10.67.5.39 with SMTP id cj7mr2352594pad.154.1406207049244; Thu, 24 Jul 2014 06:04:09 -0700 (PDT) Received: from localhost ([183.247.163.231]) by mx.google.com with ESMTPSA id fm5sm1210529pbd.23.2014.07.24.06.04.02 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 24 Jul 2014 06:04:08 -0700 (PDT) From: Hanjun Guo To: Catalin Marinas , "Rafael J. Wysocki" , Mark Rutland Subject: [PATCH 17/19] ARM64 / ACPI: If we chose to boot from acpi then disable FDT Date: Thu, 24 Jul 2014 21:00:23 +0800 Message-Id: <1406206825-15590-18-git-send-email-hanjun.guo@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1406206825-15590-1-git-send-email-hanjun.guo@linaro.org> References: <1406206825-15590-1-git-send-email-hanjun.guo@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140724_060500_796284_92BCD517 X-CRM114-Status: GOOD ( 11.15 ) X-Spam-Score: -0.7 (/) Cc: Mark Brown , Liviu Dudau , Lv Zheng , 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 , linaro-acpi-private@linaro.org, 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=-1.9 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=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 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c index 17ab98e..4ace77c 100644 --- a/arch/arm64/kernel/setup.c +++ b/arch/arm64/kernel/setup.c @@ -397,8 +397,8 @@ void __init setup_arch(char **cmdline_p) /* Get the boot CPU's MPIDR before cpu logical map is built */ cpu_logical_map(0) = read_cpuid_mpidr() & MPIDR_HWID_BITMASK; acpi_boot_init(); - - unflatten_device_tree(); + if (acpi_disabled) + unflatten_device_tree(); psci_init();