From patchwork Thu Dec 7 17:29:12 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Prarit Bhargava X-Patchwork-Id: 10100431 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 1F5DB60325 for ; Thu, 7 Dec 2017 17:29:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 09ACE2097A for ; Thu, 7 Dec 2017 17:29:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F230F2851B; Thu, 7 Dec 2017 17:29:40 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6E05B2097A for ; Thu, 7 Dec 2017 17:29:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756234AbdLGR3i (ORCPT ); Thu, 7 Dec 2017 12:29:38 -0500 Received: from mx1.redhat.com ([209.132.183.28]:65521 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756072AbdLGR3c (ORCPT ); Thu, 7 Dec 2017 12:29:32 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 7D68EC01BD40; Thu, 7 Dec 2017 17:29:32 +0000 (UTC) Received: from praritdesktop.bos.redhat.com (prarit-guest.khw.lab.eng.bos.redhat.com [10.16.186.145]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5175C7C663; Thu, 7 Dec 2017 17:29:28 +0000 (UTC) From: Prarit Bhargava To: linux-acpi@vger.kernel.org Cc: Prarit Bhargava , linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-pm@vger.kernel.org, linux-serial@vger.kernel.org, Bhupesh Sharma , Lv Zheng , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , x86@kernel.org, Jonathan Corbet , Catalin Marinas , Will Deacon , "Rafael J. Wysocki" Subject: [PATCH 2/2] acpi, x86: Use SPCR table for earlycon on x86 Date: Thu, 7 Dec 2017 12:29:12 -0500 Message-Id: <20171207172912.17868-3-prarit@redhat.com> In-Reply-To: <20171207172912.17868-1-prarit@redhat.com> References: <20171207172912.17868-1-prarit@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Thu, 07 Dec 2017 17:29:32 +0000 (UTC) Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The ACPI SPCR code has been used to define an earlycon console for arm64 and can be used for x86. Modify the ACPI SPCR parsing code to account for console behaviour differences between arm64 and x86. Initialize the SPCR code from x86 ACPI initialization code. Signed-off-by: Prarit Bhargava Cc: linux-doc@vger.kernel.org Cc: linux-kernel@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org Cc: linux-pm@vger.kernel.org Cc: linux-acpi@vger.kernel.org Cc: linux-serial@vger.kernel.org Cc: Bhupesh Sharma Cc: Lv Zheng Cc: Thomas Gleixner Cc: Ingo Molnar Cc: "H. Peter Anvin" Cc: x86@kernel.org Cc: Jonathan Corbet Cc: Catalin Marinas Cc: Will Deacon Cc: "Rafael J. Wysocki" --- Documentation/admin-guide/kernel-parameters.txt | 3 +++ arch/arm64/kernel/acpi.c | 2 +- arch/x86/kernel/acpi/boot.c | 3 +++ drivers/acpi/Kconfig | 2 +- drivers/acpi/spcr.c | 5 +++-- include/linux/acpi.h | 7 +++++-- 6 files changed, 16 insertions(+), 6 deletions(-) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt index 0d173289c67e..c7cc890a0e81 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt @@ -918,6 +918,9 @@ stdout-path property in device tree's chosen node, or determined by the ACPI SPCR table. + [X86] When used with no options the early console is + determined by the ACPI SPCR table. + cdns,[,options] Start an early, polled-mode console on a Cadence (xuartps) serial port at the specified address. Only diff --git a/arch/arm64/kernel/acpi.c b/arch/arm64/kernel/acpi.c index ef74e1f3e468..9d7842022d47 100644 --- a/arch/arm64/kernel/acpi.c +++ b/arch/arm64/kernel/acpi.c @@ -355,7 +355,7 @@ void __init acpi_boot_table_init(void) early_init_dt_scan_chosen_stdout(); } else { /* Always enable the ACPI SPCR console */ - acpi_parse_spcr(console_acpi_spcr_enable); + acpi_parse_spcr(console_acpi_spcr_enable, true); if (IS_ENABLED(CONFIG_ACPI_BGRT)) acpi_table_parse(ACPI_SIG_BGRT, acpi_parse_bgrt); } diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c index f4c463df8b08..4527ecbab4cb 100644 --- a/arch/x86/kernel/acpi/boot.c +++ b/arch/x86/kernel/acpi/boot.c @@ -1626,6 +1626,9 @@ int __init acpi_boot_init(void) if (!acpi_noirq) x86_init.pci.init = pci_acpi_init; + /* Do not enable ACPI SPCR console by default */ + acpi_parse_spcr(console_acpi_spcr_enable, console_acpi_spcr_enable); + return 0; } diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig index ae25159dd976..6bcddd149ca7 100644 --- a/drivers/acpi/Kconfig +++ b/drivers/acpi/Kconfig @@ -562,7 +562,7 @@ config TPS68470_PMIC_OPREGION config ACPI_SPCR_TABLE bool "ACPI Serial Port Console Redirection Support" - default y if ARM64 + default y if (X86 || ARM64) help Enable support for Serial Port Console Redirection (SPCR) Table. This table provides information about the configuration of the diff --git a/drivers/acpi/spcr.c b/drivers/acpi/spcr.c index d8ad8fa67582..23abb1c207a0 100644 --- a/drivers/acpi/spcr.c +++ b/drivers/acpi/spcr.c @@ -40,7 +40,7 @@ bool console_acpi_spcr_enable __initdata; * from arch initialization code as soon as the DT/ACPI decision is made. * */ -int __init acpi_parse_spcr(bool earlycon) +int __init acpi_parse_spcr(bool earlycon, bool enable_console) { static char opts[ACPI_SPCR_OPTS_SIZE]; static char uart[ACPI_SPCR_BUF_SIZE]; @@ -113,7 +113,8 @@ int __init acpi_parse_spcr(bool earlycon) if (earlycon) setup_earlycon(opts); - err = add_preferred_console(uart, 0, opts + strlen(uart) + 1); + if (enable_console) + err = add_preferred_console(uart, 0, opts + strlen(uart) + 1); done: acpi_put_table((struct acpi_table_header *)table); return err; diff --git a/include/linux/acpi.h b/include/linux/acpi.h index 818c1053cc6f..252d692f017f 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -1248,10 +1248,13 @@ extern bool console_acpi_spcr_enable __initdata; extern int acpi_arch_setup_console(struct acpi_table_spcr *table, char *opts, char *uart, char *iotype, int baud_rate, bool earlycon); -int acpi_parse_spcr(bool earlycon); +int acpi_parse_spcr(bool earlycon, bool enable_console); #else static const bool console_acpi_spcr_enable; -static inline int acpi_parse_spcr(bool earlycon) { return 0; } +static inline int acpi_parse_spcr(bool earlycon, bool enable_console) +{ + return 0; +} #endif #if IS_ENABLED(CONFIG_ACPI_GENERIC_GSI)