From nobody Thu Feb 12 10:54:05 2026 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.13]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E008B20ED; Thu, 13 Jun 2024 12:51:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.13 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718283122; cv=none; b=Pb5J/uhkyh75qDoosG+hvPUIr/rdd5BJxz8b+Z7ArHtqB3+n6gdldhLdcwJ+dMEHyBJVYWYISbHsQT5QzGGHM4mZifdX3HFYv5c4KU3DkMKmJML+QFJeCiMPxLhVBiCGz0IRNQ/curl8RA1YqpvuL6MMRuXCf+bRwDCoobxxto4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718283122; c=relaxed/simple; bh=PN8rxRQcRmuUK8SZKksmmrKBiwjCMOQYWVly+UpZa7I=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=FBh7VZyN2PjFCGlz0iyLRbMcQMh6JrhGd36EPnd1YEZ76tZCEWiuZuvU0Euguv29bHI9JeOOLa3rAmt5CKCEdstovyN4zCiXdfhYpiUgj11bK+q8xUQH1nlZoYIq6CEVV/TiINUYv/4oBG3/0SYB44TGeCbL8KT5OoD3gmTugEw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=Ik7VvL/W; arc=none smtp.client-ip=192.198.163.13 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="Ik7VvL/W" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1718283120; x=1749819120; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=PN8rxRQcRmuUK8SZKksmmrKBiwjCMOQYWVly+UpZa7I=; b=Ik7VvL/Wh7jSGHAs8zMrsrNRfSBZUgJ+ZsCnYMdI32SOE7nsomASgcXM ot3/XvSbviBGv2LIRKFKCBo58lLx0jb46UI1Spin/p1scWTuSOpQaqcAT +nD3RZsCAiQBND063WiAmcOluS/Pyh/n1qWLTqC8JbZgDo1Z4889G8Xj9 LuLmKZo6GF080dr271stWXkztsSFv3aLQO8QIB5xCdfgbYCFfRnIAPKgK vwQlcUsU2iCFygcxqM8H2s6YydTpTlkGCa6mDS4mUCMX1JGLZRbEzNiwZ Kq1rV+Gez7X8+hnYVpDb6/ymTdLhuTHVxpOFSYJuxQp1m0u8oXiVsfhwY Q==; X-CSE-ConnectionGUID: M6W5mQuSSaWDMOCtxw+Ipw== X-CSE-MsgGUID: 8JW4qdKRQj6NJorBXmOXRQ== X-IronPort-AV: E=McAfee;i="6700,10204,11101"; a="18025237" X-IronPort-AV: E=Sophos;i="6.08,235,1712646000"; d="scan'208";a="18025237" Received: from fmviesa005.fm.intel.com ([10.60.135.145]) by fmvoesa107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Jun 2024 05:51:58 -0700 X-CSE-ConnectionGUID: Utvcll1JSQCwn24/2kfXcw== X-CSE-MsgGUID: cVLI9wtmTq2WxghZvDo5GQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,235,1712646000"; d="scan'208";a="44574633" Received: from unknown (HELO tlindgre-MOBL1.intel.com) ([10.245.247.210]) by fmviesa005-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Jun 2024 05:51:55 -0700 From: Tony Lindgren To: Greg Kroah-Hartman , Jiri Slaby , Petr Mladek , Steven Rostedt , John Ogness , Sergey Senozhatsky , Andy Shevchenko , Tony Lindgren Cc: =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= , linux-serial@vger.kernel.org, Tony Lindgren , linux-kernel@vger.kernel.org Subject: [PATCH v2 1/2] printk: Revert add_preferred_console_match() related commits Date: Thu, 13 Jun 2024 15:51:07 +0300 Message-ID: <20240613125113.219700-2-tony.lindgren@linux.intel.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240613125113.219700-1-tony.lindgren@linux.intel.com> References: <20240613125113.219700-1-tony.lindgren@linux.intel.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Recent changes to allow using DEVNAME:0.0 style console names caused a regression to the kernel command line handling for the console options. The last preferred console added gets used for init. This is documented in the comments for add_preferred_console(). Now the kernel command line options for console=3DttyS0,115200 console=3Dtty0 are wrongly handled and cause the /dev/console to be associated with ttyS0 instead of tty0. This happens because we are calling __add_preferred_console() later on from serial8250_isa_init_ports() after console_setup() and the console gets treated as the last added preferred console. As the DEVNAME:0.0 style console device is not known at console_setup() time, I added a call to __add_preferred_console() later on when the console is ready. To fix the issue, let's revert the printk related commits: f03e8c1060f8 ("printk: Save console options for add_preferred_console_match= ()") b73c9cbe4f1f ("printk: Flag register_console() if console is set on command= line") 8a831c584e6e ("printk: Don't try to parse DEVNAME:0.0 console options") We need to also drop the call for add_preferred_console_match() from serial_base_add_one_prefcon() added by commit 787a1cabac01 ("serial: core: Add support for DEVNAME:0.0 style naming for kernel console"). Petr has suggested a better way to handle the deferred consoles that does not rely on calling __add_preferred_console() again. Reported-by: Petr Mladek Link: https://lore.kernel.org/linux-serial/ZlC6_Um4P4b-_WQE@pathway.suse.cz/ Fixes: f03e8c1060f8 ("printk: Save console options for add_preferred_consol= e_match()") Signed-off-by: Tony Lindgren Reviewed-by: Petr Mladek --- drivers/tty/serial/serial_base_bus.c | 8 +- include/linux/printk.h | 3 - kernel/printk/Makefile | 2 +- kernel/printk/conopt.c | 146 --------------------------- kernel/printk/console_cmdline.h | 6 -- kernel/printk/printk.c | 23 +---- 6 files changed, 6 insertions(+), 182 deletions(-) delete mode 100644 kernel/printk/conopt.c diff --git a/drivers/tty/serial/serial_base_bus.c b/drivers/tty/serial/seri= al_base_bus.c index 73c6ee540c83..5ebacb982f9e 100644 --- a/drivers/tty/serial/serial_base_bus.c +++ b/drivers/tty/serial/serial_base_bus.c @@ -210,13 +210,7 @@ void serial_base_port_device_remove(struct serial_port= _device *port_dev) static int serial_base_add_one_prefcon(const char *match, const char *dev_= name, int port_id) { - int ret; - - ret =3D add_preferred_console_match(match, dev_name, port_id); - if (ret =3D=3D -ENOENT) - return 0; - - return ret; + return 0; } =20 #ifdef __sparc__ diff --git a/include/linux/printk.h b/include/linux/printk.h index 40afab23881a..65c5184470f1 100644 --- a/include/linux/printk.h +++ b/include/linux/printk.h @@ -60,9 +60,6 @@ static inline const char *printk_skip_headers(const char = *buffer) #define CONSOLE_LOGLEVEL_DEFAULT CONFIG_CONSOLE_LOGLEVEL_DEFAULT #define CONSOLE_LOGLEVEL_QUIET CONFIG_CONSOLE_LOGLEVEL_QUIET =20 -int add_preferred_console_match(const char *match, const char *name, - const short idx); - extern int console_printk[]; =20 #define console_loglevel (console_printk[0]) diff --git a/kernel/printk/Makefile b/kernel/printk/Makefile index 040fe7d1eda2..39a2b61c7232 100644 --- a/kernel/printk/Makefile +++ b/kernel/printk/Makefile @@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-only -obj-y =3D printk.o conopt.o +obj-y =3D printk.o obj-$(CONFIG_PRINTK) +=3D printk_safe.o nbcon.o obj-$(CONFIG_A11Y_BRAILLE_CONSOLE) +=3D braille.o obj-$(CONFIG_PRINTK_INDEX) +=3D index.o diff --git a/kernel/printk/conopt.c b/kernel/printk/conopt.c deleted file mode 100644 index 9d507bac3657..000000000000 --- a/kernel/printk/conopt.c +++ /dev/null @@ -1,146 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/* - * Kernel command line console options for hardware based addressing - * - * Copyright (C) 2023 Texas Instruments Incorporated - https://www.ti.com/ - * Author: Tony Lindgren - */ - -#include -#include -#include -#include - -#include - -#include "console_cmdline.h" - -/* - * Allow longer DEVNAME:0.0 style console naming such as abcd0000.serial:0= .0 - * in addition to the legacy ttyS0 style naming. - */ -#define CONSOLE_NAME_MAX 32 - -#define CONSOLE_OPT_MAX 16 -#define CONSOLE_BRL_OPT_MAX 16 - -struct console_option { - char name[CONSOLE_NAME_MAX]; - char opt[CONSOLE_OPT_MAX]; - char brl_opt[CONSOLE_BRL_OPT_MAX]; - u8 has_brl_opt:1; -}; - -/* Updated only at console_setup() time, no locking needed */ -static struct console_option conopt[MAX_CMDLINECONSOLES]; - -/** - * console_opt_save - Saves kernel command line console option for driver = use - * @str: Kernel command line console name and option - * @brl_opt: Braille console options - * - * Saves a kernel command line console option for driver subsystems to use= for - * adding a preferred console during init. Called from console_setup() onl= y. - * - * Return: 0 on success, negative error code on failure. - */ -int __init console_opt_save(const char *str, const char *brl_opt) -{ - struct console_option *con; - size_t namelen, optlen; - const char *opt; - int i; - - namelen =3D strcspn(str, ","); - if (namelen =3D=3D 0 || namelen >=3D CONSOLE_NAME_MAX) - return -EINVAL; - - opt =3D str + namelen; - if (*opt =3D=3D ',') - opt++; - - optlen =3D strlen(opt); - if (optlen >=3D CONSOLE_OPT_MAX) - return -EINVAL; - - for (i =3D 0; i < MAX_CMDLINECONSOLES; i++) { - con =3D &conopt[i]; - - if (con->name[0]) { - if (!strncmp(str, con->name, namelen)) - return 0; - continue; - } - - /* - * The name isn't terminated, only opt is. Empty opt is fine, - * but brl_opt can be either empty or NULL. For more info, see - * _braille_console_setup(). - */ - strscpy(con->name, str, namelen + 1); - strscpy(con->opt, opt, CONSOLE_OPT_MAX); - if (brl_opt) { - strscpy(con->brl_opt, brl_opt, CONSOLE_BRL_OPT_MAX); - con->has_brl_opt =3D 1; - } - - return 0; - } - - return -ENOMEM; -} - -static struct console_option *console_opt_find(const char *name) -{ - struct console_option *con; - int i; - - for (i =3D 0; i < MAX_CMDLINECONSOLES; i++) { - con =3D &conopt[i]; - if (!strcmp(name, con->name)) - return con; - } - - return NULL; -} - -/** - * add_preferred_console_match - Adds a preferred console if a match is fo= und - * @match: Expected console on kernel command line, such as console=3DDEVN= AME:0.0 - * @name: Name of the console character device to add such as ttyS - * @idx: Index for the console - * - * Allows driver subsystems to add a console after translating the command - * line name to the character device name used for the console. Options are - * added automatically based on the kernel command line. Duplicate preferr= ed - * consoles are ignored by __add_preferred_console(). - * - * Return: 0 on success, negative error code on failure. - */ -int add_preferred_console_match(const char *match, const char *name, - const short idx) -{ - struct console_option *con; - char *brl_opt =3D NULL; - - if (!match || !strlen(match) || !name || !strlen(name) || - idx < 0) - return -EINVAL; - - con =3D console_opt_find(match); - if (!con) - return -ENOENT; - - /* - * See __add_preferred_console(). It checks for NULL brl_options to set - * the preferred_console flag. Empty brl_opt instead of NULL leads into - * the preferred_console flag not set, and CON_CONSDEV not being set, - * and the boot console won't get disabled at the end of console_setup(). - */ - if (con->has_brl_opt) - brl_opt =3D con->brl_opt; - - console_opt_add_preferred_console(name, idx, con->opt, brl_opt); - - return 0; -} diff --git a/kernel/printk/console_cmdline.h b/kernel/printk/console_cmdlin= e.h index a125e0235589..3ca74ad391d6 100644 --- a/kernel/printk/console_cmdline.h +++ b/kernel/printk/console_cmdline.h @@ -2,12 +2,6 @@ #ifndef _CONSOLE_CMDLINE_H #define _CONSOLE_CMDLINE_H =20 -#define MAX_CMDLINECONSOLES 8 - -int console_opt_save(const char *str, const char *brl_opt); -int console_opt_add_preferred_console(const char *name, const short idx, - char *options, char *brl_options); - struct console_cmdline { char name[16]; /* Name of the driver */ diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c index 420fd310129d..dddb15f48d59 100644 --- a/kernel/printk/printk.c +++ b/kernel/printk/printk.c @@ -383,6 +383,9 @@ static int console_locked; /* * Array of consoles built from command line options (console=3D) */ + +#define MAX_CMDLINECONSOLES 8 + static struct console_cmdline console_cmdline[MAX_CMDLINECONSOLES]; =20 static int preferred_console =3D -1; @@ -2500,17 +2503,6 @@ static int __init console_setup(char *str) if (_braille_console_setup(&str, &brl_options)) return 1; =20 - /* Save the console for driver subsystem use */ - if (console_opt_save(str, brl_options)) - return 1; - - /* Flag register_console() to not call try_enable_default_console() */ - console_set_on_cmdline =3D 1; - - /* Don't attempt to parse a DEVNAME:0.0 style console */ - if (strchr(str, ':')) - return 1; - /* * Decode str into name, index, options. */ @@ -2541,13 +2533,6 @@ static int __init console_setup(char *str) } __setup("console=3D", console_setup); =20 -/* Only called from add_preferred_console_match() */ -int console_opt_add_preferred_console(const char *name, const short idx, - char *options, char *brl_options) -{ - return __add_preferred_console(name, idx, options, brl_options, true); -} - /** * add_preferred_console - add a device to the list of preferred consoles. * @name: device name @@ -3522,7 +3507,7 @@ void register_console(struct console *newcon) * Note that a console with tty binding will have CON_CONSDEV * flag set and will be first in the list. */ - if (preferred_console < 0 && !console_set_on_cmdline) { + if (preferred_console < 0) { if (hlist_empty(&console_list) || !console_first()->device || console_first()->flags & CON_BOOT) { try_enable_default_console(newcon); --=20 2.45.2 From nobody Thu Feb 12 10:54:05 2026 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.13]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B38B813E3F9; Thu, 13 Jun 2024 12:52:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.13 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718283134; cv=none; b=pj8afGp/dXlXuNhkMBu91Xt/mVNXQLxUSSSD/RVr/Ys4J32NPlK7XhKWTmEzr3ZZtHE/AbNA1qS/Yu10FVDY4zmyKUTMxFxLXkGfKZEpnBrs/hLH40/EmCKQdKPF5xPALhHvdVcejy40LcnN2oMJOdaTAEilw/DMphHQrSdIDko= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718283134; c=relaxed/simple; bh=Gitiy4jTy+Ji4p/AD8BHLreS0EPk0aagGgIQISBE594=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=BGeR0MwqjRxH6OdIvYJOzMlnNetjz7teeDjwLcE4rYUrt/0d3+Dq1yZGRklItDRpKFoTJicK/U96CZLZ+pRqN6b2kT16+6vIiaz4r2Hk0iBQ/bZJSRIkAu6lKNutJBAQF1IcxD00HEmIS8vH5j2YdmQF87t6GxlW4Zp9eq6fMnA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=ewoiRZSN; arc=none smtp.client-ip=192.198.163.13 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="ewoiRZSN" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1718283132; x=1749819132; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Gitiy4jTy+Ji4p/AD8BHLreS0EPk0aagGgIQISBE594=; b=ewoiRZSNB9Vc1pigc5/hBINodlJd2FAygqv1xtN17AG4M7PfGAVuZryL jz7drTOobSBVc7IgAA0c2+Fms8jWmP4MeBQj58Y6RVh7L0c2HLmC3Lljx Gs36424nwaqG2e5kG9OZshngwkkhjdpSm78Sstfe4Lyv96sLu3/SeBus6 6lSrYg0hpwEthwz8GdAsk9Q3WnJ7oB4/7vwTet7wu6cMhvG7dyVvhYfTZ vacKp0bqTcPndaaQKrbuaBDcxdEXsw+A9iayV+Y8VgGT/G9E3T8BdZG0h ZgwmlbbD7BwFi2fayeFfRArpC3vX87hin2G4nUpHo/o9D3qPc7va8F0sr w==; X-CSE-ConnectionGUID: Z16YeGlaT4CV/Mp0CzPJRg== X-CSE-MsgGUID: 32f+YVxlT6uQoNUDUwPYDw== X-IronPort-AV: E=McAfee;i="6700,10204,11101"; a="18025257" X-IronPort-AV: E=Sophos;i="6.08,235,1712646000"; d="scan'208";a="18025257" Received: from fmviesa005.fm.intel.com ([10.60.135.145]) by fmvoesa107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Jun 2024 05:52:11 -0700 X-CSE-ConnectionGUID: AeOb1njeSemVEI9wbQkMfw== X-CSE-MsgGUID: Hr+lrdwjTlumCh448BDEbQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,235,1712646000"; d="scan'208";a="44574648" Received: from unknown (HELO tlindgre-MOBL1.intel.com) ([10.245.247.210]) by fmviesa005-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Jun 2024 05:52:07 -0700 From: Tony Lindgren To: Greg Kroah-Hartman , Jiri Slaby , Petr Mladek , Steven Rostedt , John Ogness , Sergey Senozhatsky , Andy Shevchenko , Tony Lindgren Cc: =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= , linux-serial@vger.kernel.org, Tony Lindgren , linux-kernel@vger.kernel.org Subject: [PATCH v2 2/2] printk: Add update_preferred_console() Date: Thu, 13 Jun 2024 15:51:08 +0300 Message-ID: <20240613125113.219700-3-tony.lindgren@linux.intel.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240613125113.219700-1-tony.lindgren@linux.intel.com> References: <20240613125113.219700-1-tony.lindgren@linux.intel.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Let's add update_preferred_console() for driver subsystems to call during init when the console is ready, and it's character device name is known. For now, we use it only for the serial layer to allow console=3DDEVNAME:0.0 style hardware based addressing for consoles. The earlier attempt on doing this caused a regression with the kernel command line console order as it added calling __add_preferred_console() again later on during init. A better approach was suggested by Petr where we add the deferred console to the console_cmdline[] and update it later on when the console is ready. Suggested-by: Petr Mladek Co-developed-by: Petr Mladek Signed-off-by: Tony Lindgren --- drivers/tty/serial/serial_base_bus.c | 8 ++- include/linux/printk.h | 2 + kernel/printk/console_cmdline.h | 1 + kernel/printk/printk.c | 77 +++++++++++++++++++++++----- 4 files changed, 73 insertions(+), 15 deletions(-) diff --git a/drivers/tty/serial/serial_base_bus.c b/drivers/tty/serial/seri= al_base_bus.c index 5ebacb982f9e..a34f55ef6f37 100644 --- a/drivers/tty/serial/serial_base_bus.c +++ b/drivers/tty/serial/serial_base_bus.c @@ -210,7 +210,13 @@ void serial_base_port_device_remove(struct serial_port= _device *port_dev) static int serial_base_add_one_prefcon(const char *match, const char *dev_= name, int port_id) { - return 0; + int ret; + + ret =3D update_preferred_console(match, dev_name, port_id); + if (ret =3D=3D -ENOENT) + return 0; + + return ret; } =20 #ifdef __sparc__ diff --git a/include/linux/printk.h b/include/linux/printk.h index 65c5184470f1..fda935280e33 100644 --- a/include/linux/printk.h +++ b/include/linux/printk.h @@ -60,6 +60,8 @@ static inline const char *printk_skip_headers(const char = *buffer) #define CONSOLE_LOGLEVEL_DEFAULT CONFIG_CONSOLE_LOGLEVEL_DEFAULT #define CONSOLE_LOGLEVEL_QUIET CONFIG_CONSOLE_LOGLEVEL_QUIET =20 +int update_preferred_console(const char *match, const char *name, const sh= ort idx); + extern int console_printk[]; =20 #define console_loglevel (console_printk[0]) diff --git a/kernel/printk/console_cmdline.h b/kernel/printk/console_cmdlin= e.h index 3ca74ad391d6..0ab573b6d4dc 100644 --- a/kernel/printk/console_cmdline.h +++ b/kernel/printk/console_cmdline.h @@ -6,6 +6,7 @@ struct console_cmdline { char name[16]; /* Name of the driver */ int index; /* Minor dev. to use */ + char devname[32]; /* DEVNAME:0.0 style device name */ bool user_specified; /* Specified by command line vs. platform */ char *options; /* Options for the driver */ #ifdef CONFIG_A11Y_BRAILLE_CONSOLE diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c index dddb15f48d59..0e2e442593bd 100644 --- a/kernel/printk/printk.c +++ b/kernel/printk/printk.c @@ -2429,18 +2429,23 @@ static void set_user_specified(struct console_cmdli= ne *c, bool user_specified) console_set_on_cmdline =3D 1; } =20 -static int __add_preferred_console(const char *name, const short idx, char= *options, +static int __add_preferred_console(const char *name, const short idx, + const char *devname, char *options, char *brl_options, bool user_specified) { struct console_cmdline *c; int i; =20 + if (!name && !devname) + return -EINVAL; + /* * We use a signed short index for struct console for device drivers to * indicate a not yet assigned index or port. However, a negative index - * value is not valid for preferred console. + * value is not valid when the console name and index are defined on + * the command line. */ - if (idx < 0) + if (name && idx < 0) return -EINVAL; =20 /* @@ -2448,9 +2453,10 @@ static int __add_preferred_console(const char *name,= const short idx, char *opti * if we have a slot free. */ for (i =3D 0, c =3D console_cmdline; - i < MAX_CMDLINECONSOLES && c->name[0]; + i < MAX_CMDLINECONSOLES && (c->name[0] || c->devname[0]); i++, c++) { - if (strcmp(c->name, name) =3D=3D 0 && c->index =3D=3D idx) { + if ((name && strcmp(c->name, name) =3D=3D 0 && c->index =3D=3D idx) || + (devname && strcmp(c->devname, devname) =3D=3D 0)) { if (!brl_options) preferred_console =3D i; set_user_specified(c, user_specified); @@ -2461,7 +2467,10 @@ static int __add_preferred_console(const char *name,= const short idx, char *opti return -E2BIG; if (!brl_options) preferred_console =3D i; - strscpy(c->name, name, sizeof(c->name)); + if (name) + strscpy(c->name, name); + if (devname) + strscpy(c->devname, devname); c->options =3D options; set_user_specified(c, user_specified); braille_set_options(c, brl_options); @@ -2486,8 +2495,8 @@ __setup("console_msg_format=3D", console_msg_format_s= etup); */ static int __init console_setup(char *str) { - char buf[sizeof(console_cmdline[0].name) + 4]; /* 4 for "ttyS" */ - char *s, *options, *brl_options =3D NULL; + char buf[sizeof(console_cmdline[0].devname)]; /* name with "ttyS" prefix = or devname */ + char *s, *options, *brl_options =3D NULL, *chardev =3D NULL, *devname =3D= NULL; int idx; =20 /* @@ -2496,17 +2505,23 @@ static int __init console_setup(char *str) * for exactly this purpose. */ if (str[0] =3D=3D 0 || strcmp(str, "null") =3D=3D 0) { - __add_preferred_console("ttynull", 0, NULL, NULL, true); + __add_preferred_console("ttynull", 0, NULL, NULL, NULL, true); return 1; } =20 if (_braille_console_setup(&str, &brl_options)) return 1; =20 + /* For a DEVNAME:0.0 style console the character device is unknown early = */ + if (strchr(str, ':')) + devname =3D buf; + else + chardev =3D buf; + /* * Decode str into name, index, options. */ - if (isdigit(str[0])) + if (chardev && isdigit(str[0])) scnprintf(buf, sizeof(buf), "ttyS%s", str); else strscpy(buf, str); @@ -2523,12 +2538,12 @@ static int __init console_setup(char *str) #endif =20 for (s =3D buf; *s; s++) - if (isdigit(*s) || *s =3D=3D ',') + if ((chardev && isdigit(*s)) || *s =3D=3D ',') break; idx =3D simple_strtoul(s, NULL, 10); *s =3D 0; =20 - __add_preferred_console(buf, idx, options, brl_options, true); + __add_preferred_console(chardev, idx, devname, options, brl_options, true= ); return 1; } __setup("console=3D", console_setup); @@ -2548,7 +2563,38 @@ __setup("console=3D", console_setup); */ int add_preferred_console(const char *name, const short idx, char *options) { - return __add_preferred_console(name, idx, options, NULL, false); + return __add_preferred_console(name, idx, NULL, options, NULL, false); +} + +/** + * update_preferred_console - Updates a preferred console if a match is fo= und + * @devname: Expected console on kernel command line, such as console=3DDE= VNAME:0.0 + * @name: Name of the console character device to add such as ttyS + * @idx: Index for the console + * + * Allows driver subsystems to update a console after translating the comm= and + * line name to the character device name used for the console. + * + * Return: 0 on success, negative error code on failure. + */ +int update_preferred_console(const char *devname, const char *name, const = short idx) +{ + struct console_cmdline *c =3D console_cmdline; + int i; + + if (!devname || !strlen(devname) || !name || !strlen(name) || idx < 0) + return -EINVAL; + + for (i =3D 0; i < MAX_CMDLINECONSOLES && (c->name[0] || c->devname[0]); + i++, c++) { + if (!strcmp(devname, c->devname)) { + strscpy(c->name, name); + c->index =3D idx; + return 0; + } + } + + return -ENOENT; } =20 bool console_suspend_enabled =3D true; @@ -3318,8 +3364,11 @@ static int try_enable_preferred_console(struct conso= le *newcon, int i, err; =20 for (i =3D 0, c =3D console_cmdline; - i < MAX_CMDLINECONSOLES && c->name[0]; + i < MAX_CMDLINECONSOLES && (c->name[0] || c->devname[0]); i++, c++) { + /* Console not yet initialized? */ + if (!c->name[0]) + continue; if (c->user_specified !=3D user_specified) continue; if (!newcon->match || --=20 2.45.2