From patchwork Mon Feb 22 13:46:49 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aleksey Makarov X-Patchwork-Id: 62569 Delivered-To: patch@linaro.org Received: by 10.112.43.199 with SMTP id y7csp1245116lbl; Mon, 22 Feb 2016 05:47:38 -0800 (PST) X-Received: by 10.66.138.74 with SMTP id qo10mr23413988pab.140.1456148858219; Mon, 22 Feb 2016 05:47:38 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id fk1si39866031pad.35.2016.02.22.05.47.37; Mon, 22 Feb 2016 05:47:38 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-serial-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-serial-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-serial-owner@vger.kernel.org; dkim=neutral (body hash did not verify) header.i=@linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755213AbcBVNrf (ORCPT + 1 other); Mon, 22 Feb 2016 08:47:35 -0500 Received: from mail-lb0-f180.google.com ([209.85.217.180]:34912 "EHLO mail-lb0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755191AbcBVNrd (ORCPT ); Mon, 22 Feb 2016 08:47:33 -0500 Received: by mail-lb0-f180.google.com with SMTP id bc4so82108298lbc.2 for ; Mon, 22 Feb 2016 05:47:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=dv1YdUsD3cFgQdUTDjW/WrSAloCC4LHBzamTIZJI5yo=; b=CqYSKaNVrRmYvMkhuvIEsFdgUFIooArLpc23sSXpi+30hLWy6EDg4oXD7b6vC5n8wD vphBiUl0i0QEzKWlfaB6x2kT1j7sG6s4GRA4rS2XlllOu9+fpHisGndiHVYOgd1gghZH 8+BQv7PLTlHNoo6bM4jm4/UDmQKnV2ywGZgbk= 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=dv1YdUsD3cFgQdUTDjW/WrSAloCC4LHBzamTIZJI5yo=; b=i1y66W2hEMQYS+DmTzBA7Nfkodnx2SHgyiDj0I5QLSOCvgyuxxHVLZ217eKKCbz+qE 5dm6prGcN2BBxh5OaEH5oU/CjyDu+BnipfvfYIsDXOo7s6zs7rWLHWlqJywmAPMIKSYD s1i3pJYWKMyeFbFmuOurutQuv8Qn9YZ7J6SRo3RKsIB5Hf7MD321UFdIOiM7Gmbipuua c5qTmwkzByuZ7BPuVT67EWg8Ssa+pkuAWiRpeghEXpCFehkOkixYPfdY1yEj5KRI07YS Zz2afh6Hgxj7JmKMDLKTvpvVKcIWQ6Fk+4KB5+6cPOvt3gyHiZUSe8jCnkmpJ9J6FAAN n/Xw== X-Gm-Message-State: AG10YOTMfpgxlXqGUNuMD6Ay6tAZo+B0gYT3jPw3P6INbFRHgst3gZmDVxwmYEGajQBz6Rv1 X-Received: by 10.112.159.233 with SMTP id xf9mr10149843lbb.21.1456148851689; Mon, 22 Feb 2016 05:47:31 -0800 (PST) Received: from turnip.localdomain (nivc-213.auriga.ru. [80.240.102.213]) by smtp.gmail.com with ESMTPSA id s5sm2564633lbr.12.2016.02.22.05.47.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 22 Feb 2016 05:47:31 -0800 (PST) From: Aleksey Makarov To: linux-acpi@vger.kernel.org Cc: linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Aleksey Makarov , Russell King , Greg Kroah-Hartman , "Rafael J . Wysocki" , Leif Lindholm , Graeme Gregory , Al Stone , Christopher Covington , Catalin Marinas , Will Deacon Subject: [PATCH 1/8] arm64: move acpi/dt decision earlier in boot process Date: Mon, 22 Feb 2016 16:46:49 +0300 Message-Id: <1456148818-26257-2-git-send-email-aleksey.makarov@linaro.org> X-Mailer: git-send-email 2.7.1 In-Reply-To: <1456148818-26257-1-git-send-email-aleksey.makarov@linaro.org> References: <1456148818-26257-1-git-send-email-aleksey.makarov@linaro.org> Sender: linux-serial-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-serial@vger.kernel.org From: Leif Lindholm In order to support selecting earlycon via either ACPI or DT, move the decision on whether to attempt ACPI configuration into the early_param handling. Then make acpi_boot_table_init() bail out if acpi_disabled. Signed-off-by: Leif Lindholm --- arch/arm64/kernel/acpi.c | 54 ++++++++++++++++++++++++++---------------------- 1 file changed, 29 insertions(+), 25 deletions(-) -- 2.7.1 -- To unsubscribe from this list: send the line "unsubscribe linux-serial" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/arch/arm64/kernel/acpi.c b/arch/arm64/kernel/acpi.c index d1ce8e2..7a944f7 100644 --- a/arch/arm64/kernel/acpi.c +++ b/arch/arm64/kernel/acpi.c @@ -44,6 +44,19 @@ EXPORT_SYMBOL(acpi_pci_disabled); static bool param_acpi_off __initdata; static bool param_acpi_force __initdata; +static int __init dt_scan_depth1_nodes(unsigned long node, + const char *uname, int depth, + void *data) +{ + /* + * Return 1 as soon as we encounter a node at depth 1 that is + * not the /chosen node. + */ + if (depth == 1 && (strcmp(uname, "chosen") != 0)) + return 1; + return 0; +} + static int __init parse_acpi(char *arg) { if (!arg) @@ -57,23 +70,27 @@ static int __init parse_acpi(char *arg) else return -EINVAL; /* Core will print when we return error */ - return 0; -} -early_param("acpi", parse_acpi); + /* + * Enable ACPI instead of device tree unless + * - ACPI has been disabled explicitly (acpi=off), or + * - the device tree is not empty (it has more than just a /chosen node) + * and ACPI has not been force enabled (acpi=force) + */ + if (param_acpi_off || + (!param_acpi_force && of_scan_flat_dt(dt_scan_depth1_nodes, NULL))) + return 0; -static int __init dt_scan_depth1_nodes(unsigned long node, - const char *uname, int depth, - void *data) -{ /* - * Return 1 as soon as we encounter a node at depth 1 that is - * not the /chosen node. + * ACPI is disabled at this point. Enable it in order to parse + * the ACPI tables and carry out sanity checks */ - if (depth == 1 && (strcmp(uname, "chosen") != 0)) - return 1; + enable_acpi(); + return 0; } +early_param("acpi", parse_acpi); + /* * __acpi_map_table() will be called before page_init(), so early_ioremap() * or early_memremap() should be called here to for ACPI table mapping. @@ -181,23 +198,10 @@ out: */ void __init acpi_boot_table_init(void) { - /* - * Enable ACPI instead of device tree unless - * - ACPI has been disabled explicitly (acpi=off), or - * - the device tree is not empty (it has more than just a /chosen node) - * and ACPI has not been force enabled (acpi=force) - */ - if (param_acpi_off || - (!param_acpi_force && of_scan_flat_dt(dt_scan_depth1_nodes, NULL))) + if (acpi_disabled) return; /* - * ACPI is disabled at this point. Enable it in order to parse - * the ACPI tables and carry out sanity checks - */ - enable_acpi(); - - /* * If ACPI tables are initialized and FADT sanity checks passed, * leave ACPI enabled and carry on booting; otherwise disable ACPI * on initialization error.