From nobody Sat Feb 7 22:26:28 2026 Received: from mail5.25mail.st (mail5.25mail.st [74.50.62.9]) (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 8284422615; Tue, 13 Feb 2024 08:47:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.50.62.9 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707814026; cv=none; b=YQJEy5Snqe02ywa99uNpE9jmQHxcbkgq4SNz4iJXEajGqpWM/QceNtr/WxSBZbIP0qUBBEnTjmBR8c+Dbo8z11qxJw+1cZS6mkyF6aArhW9keiNC10WngCO0nLJpLDYkWX+Bchm9sIwN6GUTvAEvcD7k1LM6NKHur43CBrTrB04= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707814026; c=relaxed/simple; bh=tKIrbz6p1FZo9G/GJlcOpas8Bg+sXgcNbcUoxa4D4rY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=u0UXNEM7hjd/7LqfBTxb141dZToub972raD926inxoBF5gwK3+3hDtKcnRcV3t9h7ZnIBBxU29ea1KQqQO9C2X4NK4jdYk176kUpOJKDlmZ6JiuhKbFoUveHt8dYRASh1r84ZFhNjZyDArrEmox3t71dBNkVqUG0mejSgEOEVCY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=atomide.com; spf=fail smtp.mailfrom=atomide.com; dkim=pass (2048-bit key) header.d=atomide.com header.i=@atomide.com header.b=gLb8uhaK; arc=none smtp.client-ip=74.50.62.9 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=atomide.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=atomide.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=atomide.com header.i=@atomide.com header.b="gLb8uhaK" Received: from localhost (91-158-86-216.elisa-laajakaista.fi [91.158.86.216]) by mail5.25mail.st (Postfix) with ESMTPSA id 5D77C6058D; Tue, 13 Feb 2024 08:46:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=atomide.com; s=25mailst; t=1707814023; bh=tKIrbz6p1FZo9G/GJlcOpas8Bg+sXgcNbcUoxa4D4rY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gLb8uhaK/YuCzv38odkHUYshbpGnQeryoDuOqdqla6kGxNH+Y5SsH4tetnCILqHvw fRO1DWNvBU1k3g6Cyv2di4mL3CZLeJh+leMuTD3qscWiqQNNfJKRgPkv1N284JQIZi TvxF7FyrCQuALay3DPK0goD1AB6rvllRqBheSL96gD5YiddK/2CcMaj8rsE0p3+9Fa 2rvmWPCsJbxA9Y7VbeNixOoVzVHea0a6scAhPEZfNgRkhMWx3fQKYOeHfimvHXzs88 WPh4ODZFugUefeE3dJF3kAJULC0/Db05saZAGjvqBOmOiddZO3XsCYeoAGi8Ch99hs dLhNi0xpGd3UA== From: Tony Lindgren To: Greg Kroah-Hartman , Jiri Slaby , Petr Mladek , Steven Rostedt , John Ogness , Sergey Senozhatsky Cc: "David S . Miller" , Andy Shevchenko , Dhruva Gole , =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= , Johan Hovold , Sebastian Andrzej Siewior , Vignesh Raghavendra , linux-kernel@vger.kernel.org, linux-serial@vger.kernel.org Subject: [PATCH v6 1/6] printk: Save console options for add_preferred_console_match() Date: Tue, 13 Feb 2024 10:45:08 +0200 Message-ID: <20240213084545.40617-2-tony@atomide.com> X-Mailer: git-send-email 2.43.1 In-Reply-To: <20240213084545.40617-1-tony@atomide.com> References: <20240213084545.40617-1-tony@atomide.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" Driver subsystems may need to translate the preferred console name to the character device name used. We already do some of this in console_setup() with a few hardcoded names, but that does not scale well. The console options are parsed early in console_setup(), and the consoles are added with __add_preferred_console(). At this point we don't know much about the character device names and device drivers getting probed. To allow driver subsystems to set up a preferred console, let's save the kernel command line console options. To add a preferred console from a driver subsystem with optional character device name translation, let's add a new function add_preferred_console_match(). This allows the serial core layer to support console=3DDEVNAME:0.0 style hardware based addressing in addition to the current console=3DttyS0 style naming. And we can start moving console_setup() character device parsing to the driver subsystem specific code. We use a separate array from the console_cmdline array as the character device name and index may be unknown at the console_setup() time. And eventually there's no need to call __add_preferred_console() until the subsystem is ready to handle the console. Adding the console name in addition to the character device name, and a flag for an added console, could be added to the struct console_cmdline. And the console_cmdline array handling could be modified accordingly. But that complicates things compared saving the console options, and then adding the consoles when the subsystems handling the consoles are ready. Signed-off-by: Tony Lindgren --- include/linux/printk.h | 3 + kernel/printk/Makefile | 2 +- kernel/printk/conopt.c | 143 ++++++++++++++++++++++++++++++++ kernel/printk/console_cmdline.h | 6 ++ kernel/printk/printk.c | 14 +++- 5 files changed, 164 insertions(+), 4 deletions(-) create mode 100644 kernel/printk/conopt.c diff --git a/include/linux/printk.h b/include/linux/printk.h --- a/include/linux/printk.h +++ b/include/linux/printk.h @@ -60,6 +60,9 @@ 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 --- a/kernel/printk/Makefile +++ b/kernel/printk/Makefile @@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-only -obj-y =3D printk.o +obj-y =3D printk.o conopt.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 new file mode 100644 --- /dev/null +++ b/kernel/printk/conopt.c @@ -0,0 +1,143 @@ +// 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; + const char *opt =3D NULL; + size_t namelen, optlen; + int i; + + namelen =3D strcspn(str, ","); + if (!namelen) + return -EINVAL; + + optlen =3D strlen(str) - namelen; + if (optlen > 1) + opt =3D str + namelen + 1; + + if (namelen >=3D CONSOLE_NAME_MAX || 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; + } + + strscpy(con->name, str, namelen + 1); + if (opt) + strscpy(con->opt, opt, optlen + 1); + + /* See _braille_console_setup(), both empty and NULL are valid */ + 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 --- a/kernel/printk/console_cmdline.h +++ b/kernel/printk/console_cmdline.h @@ -2,6 +2,12 @@ #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 --- a/kernel/printk/printk.c +++ b/kernel/printk/printk.c @@ -360,9 +360,6 @@ 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; @@ -2458,6 +2455,10 @@ 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; + /* * Decode str into name, index, options. */ @@ -2488,6 +2489,13 @@ 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 --=20 2.43.1 From nobody Sat Feb 7 22:26:28 2026 Received: from mail5.25mail.st (mail5.25mail.st [74.50.62.9]) (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 4C39B249E6; Tue, 13 Feb 2024 08:47:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.50.62.9 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707814063; cv=none; b=D9IjhWmSSrgEDxLtwVil5OThuZAFIz1BnwjKIU0hIcel3iR02ZuWdcZZ6Go3uFF7jqYXA30Dx/PmlzEJMSey/Rk+b6IujuvJVflzUd8rxLRD/+8th0fmL7RzfYj4HI7kGKhzCdG5THJdUntjzXEsCao3+VqL+1TkL9LNZCoDTjs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707814063; c=relaxed/simple; bh=5SV44SWLeGqXq0dV3Uad6OtCcRq0auYBygwlmprvpbM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Yd2C8xlTCcglBktpI1wQ1q/u/QRorqMcCFS8n65nsb7+L221PvjUN/vP3pc6T6KF2zJDG/SMFaod5+87YDB0mpbMONPCNhBtEsx8MTIumWBqpLVSi7XajPCYBLlE2QAjNyIBZDZKhykqZKDDT93C+O6lAKTqE9RsBy50xUnZ9lQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=atomide.com; spf=fail smtp.mailfrom=atomide.com; dkim=pass (2048-bit key) header.d=atomide.com header.i=@atomide.com header.b=o9xA/RzP; arc=none smtp.client-ip=74.50.62.9 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=atomide.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=atomide.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=atomide.com header.i=@atomide.com header.b="o9xA/RzP" Received: from localhost (91-158-86-216.elisa-laajakaista.fi [91.158.86.216]) by mail5.25mail.st (Postfix) with ESMTPSA id 5411E60505; Tue, 13 Feb 2024 08:47:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=atomide.com; s=25mailst; t=1707814061; bh=5SV44SWLeGqXq0dV3Uad6OtCcRq0auYBygwlmprvpbM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=o9xA/RzPs1l774vhxgA5A4E+pBjEEBZICMQZhaGgCDoT4JJPjuhAMoJ/gemVaJpzj AmO2NhG7WtllQl1n0bxkoLC4+04sLAAfxotqbVSR00hHGt7L/I87P5GsAtOuHpVKeG 2ORyWvG2j1WYAR7AjxStdpQPpkpTyQJxWqGW9bjAxQEiZ9+2R1yJdi/Y7IzpU9YWzR oHYkGvXna+Ufnrf95zY3kZai10noSAQZOI4a1d8vNWryocMupp2zmsvZgTGA+QOMX7 4g9mqUApsCbTK/TzALK6ZOiRQssPLkFVb836zZAqidHw9Q3SNXF09g2cvFvfq3o9to RlSQFHLOAqb6g== From: Tony Lindgren To: Greg Kroah-Hartman , Jiri Slaby , Petr Mladek , Steven Rostedt , John Ogness , Sergey Senozhatsky Cc: "David S . Miller" , Andy Shevchenko , Dhruva Gole , =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= , Johan Hovold , Sebastian Andrzej Siewior , Vignesh Raghavendra , linux-kernel@vger.kernel.org, linux-serial@vger.kernel.org Subject: [PATCH v6 2/6] printk: Don't try to parse DEVNAME:0.0 console options Date: Tue, 13 Feb 2024 10:45:09 +0200 Message-ID: <20240213084545.40617-3-tony@atomide.com> X-Mailer: git-send-email 2.43.1 In-Reply-To: <20240213084545.40617-1-tony@atomide.com> References: <20240213084545.40617-1-tony@atomide.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" Prepare to parse the console for a console=3DDEVNAME:0.0 style consoles. Currently console_setup() tries to make a console index out of any digits passed in the kernel command line for console. In the DEVNAME:0.0 case, the name can contain a device IO address, so bail out on console names with a ':'. Signed-off-by: Tony Lindgren --- kernel/printk/printk.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c --- a/kernel/printk/printk.c +++ b/kernel/printk/printk.c @@ -2459,6 +2459,10 @@ static int __init console_setup(char *str) if (console_opt_save(str, brl_options)) return 1; =20 + /* Don't attempt to parse a DEVNAME:0.0 style console */ + if (strchr(str, ':')) + return 1; + /* * Decode str into name, index, options. */ --=20 2.43.1 From nobody Sat Feb 7 22:26:28 2026 Received: from mail5.25mail.st (mail5.25mail.st [74.50.62.9]) (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 6946A20B02; Tue, 13 Feb 2024 08:48:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.50.62.9 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707814100; cv=none; b=bPEVuhedA1nhI45HNSrIJQ/0TpLALFId/ixnJflZHI7uJ4awzgqXPciIxYkmMkKL1yOnhN35CZMXGk8VDA8mHFEUyTwLjn+qXGwkQJhtZNox3vwrEHMK2AOiu4L4pM9ZvleBPLQ1ivZW/FK8eEdZfGSNFC85oBUhwcSkkikyY/s= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707814100; c=relaxed/simple; bh=sn7vv21RB73KdSX+wG/5mdCKt2LfgvUB4qrMtCZOKKI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ruba703/MxLtwUf4XBmKsWptGLysv8P2fAMYNC++Cno1zVGilIgFGcIiKCeXHMMkk723INmNGgaz55f8GTEQZoZLgGevCIh0y7+IdSzrjYBvS6Gft8DKeTY5/krCqr8KWtWtgmORq43b8kUoNDFde7K0jZKmzxE21rfWlirVM6w= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=atomide.com; spf=fail smtp.mailfrom=atomide.com; dkim=pass (2048-bit key) header.d=atomide.com header.i=@atomide.com header.b=YY6waZAJ; arc=none smtp.client-ip=74.50.62.9 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=atomide.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=atomide.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=atomide.com header.i=@atomide.com header.b="YY6waZAJ" Received: from localhost (91-158-86-216.elisa-laajakaista.fi [91.158.86.216]) by mail5.25mail.st (Postfix) with ESMTPSA id 557F760505; Tue, 13 Feb 2024 08:47:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=atomide.com; s=25mailst; t=1707814098; bh=sn7vv21RB73KdSX+wG/5mdCKt2LfgvUB4qrMtCZOKKI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YY6waZAJ7aPs9BTx+htes4TfteIi8fqtyJP7zKy7zXWsrhcPw5iWiYFEuC472ta13 u7rFe9cKLY7lf9hmtli512BnDGFzQoKZwfHR34snzb3OYvCZshrS2S7+Uyl0x2UgF6 W+6sa1JP97F7jYR6d7026lDk1MOBlLajpjGLKWbdzf8lzuM+gCx/4Vqdr5MNm5rodi x49jKYht/0A3LMFpRB8y1Ap1tcAGK50+XpXREHuAOVD+crRqHg9+PJaLfg/a/OqLUe GclSUf+AQ2GkwB2WHcNBc5o0LAj8qpugI9ncA2xb4bzYshcqOg9gmthzIucJNHHwJM qpcIgFDbsk/4A== From: Tony Lindgren To: Greg Kroah-Hartman , Jiri Slaby , Petr Mladek , Steven Rostedt , John Ogness , Sergey Senozhatsky Cc: "David S . Miller" , Andy Shevchenko , Dhruva Gole , =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= , Johan Hovold , Sebastian Andrzej Siewior , Vignesh Raghavendra , linux-kernel@vger.kernel.org, linux-serial@vger.kernel.org Subject: [PATCH v6 3/6] printk: Flag register_console() if console is set on command line Date: Tue, 13 Feb 2024 10:45:10 +0200 Message-ID: <20240213084545.40617-4-tony@atomide.com> X-Mailer: git-send-email 2.43.1 In-Reply-To: <20240213084545.40617-1-tony@atomide.com> References: <20240213084545.40617-1-tony@atomide.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" If add_preferred_console() is not called early in setup_console(), we can end up having register_console() call try_enable_default_console() before a console device has called add_preferred_console(). Let's set console_set_on_cmdline flag in console_setup() to prevent this from happening. Signed-off-by: Tony Lindgren --- kernel/printk/printk.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c --- a/kernel/printk/printk.c +++ b/kernel/printk/printk.c @@ -2459,6 +2459,9 @@ static int __init console_setup(char *str) if (console_opt_save(str, brl_options)) return 1; =20 + /* 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; @@ -3480,7 +3483,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) { + if (preferred_console < 0 && !console_set_on_cmdline) { if (hlist_empty(&console_list) || !console_first()->device || console_first()->flags & CON_BOOT) { try_enable_default_console(newcon); --=20 2.43.1 From nobody Sat Feb 7 22:26:28 2026 Received: from mail5.25mail.st (mail5.25mail.st [74.50.62.9]) (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 63BE3225A6; Tue, 13 Feb 2024 08:48:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.50.62.9 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707814138; cv=none; b=X1FNm7k8Qu+WB0AArzOusgzQPEUOoecVYxr5d2iyKCj7idYQlG5imja2bsocSOAf/ZIbAiFFaB7/obt+XJ3jUNTwEiLl1K2ZsdrsuWTYn0HB7yFrInPt6gcJ0yr/Aijcv2T1ayGWaChz8wHshsTlBelssi7gawZDr6Tt55AsODI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707814138; c=relaxed/simple; bh=HP/nAQf0hc97FJJQlEek4Zdn+VOnOOBXHNyhefrmmVI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=aibH5DWs73ali8JfZuDpNLHmnbpIp0X3gnfozU1HwqBGLiqX6AQu/RlkqPpR3XrZqME+ZvSpY4w+Ek0kQ282Vi7PsXdREW9XGYmJ59lbZLUy3M0LrsotqaOzgCDn+IurFWI2mSbc984St1YnqgRXH47L0dm0sOTMYIca4B53lEg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=atomide.com; spf=fail smtp.mailfrom=atomide.com; dkim=pass (2048-bit key) header.d=atomide.com header.i=@atomide.com header.b=TFB1F96b; arc=none smtp.client-ip=74.50.62.9 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=atomide.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=atomide.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=atomide.com header.i=@atomide.com header.b="TFB1F96b" Received: from localhost (91-158-86-216.elisa-laajakaista.fi [91.158.86.216]) by mail5.25mail.st (Postfix) with ESMTPSA id 7ED176058D; Tue, 13 Feb 2024 08:48:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=atomide.com; s=25mailst; t=1707814135; bh=HP/nAQf0hc97FJJQlEek4Zdn+VOnOOBXHNyhefrmmVI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TFB1F96bSWnlA1rp8zvEKfD8ujW2nj7GCaT2NvAnZmk3ZYVVgGDQuLNw+s5huu940 OBTYTWvIkTI3wpY9Plwo+tm5Npb4pQTVLb1cCyqj1B1nxfgIEVuw5SXndjGkkFmHk6 ke2QQcCzDGXBKwwqXLx0Ff6A8qg8Nk/OY6SHw//ogz9HHg2h6aeQBi4WrsuXz0Omsm 1LKdtSAqfs1mM/gDvEVLH7dRA4ALRB2sl0l7PLiHDgoi3WOH07/BRI+pWnvBWH91To 7cTsiCnTfGrDdMWmIolETWNWULqVRCE8603D/Rj5CXK20LKoFASEy07+rpapVw22HS IKBv6Jeq+Uelw== From: Tony Lindgren To: Greg Kroah-Hartman , Jiri Slaby , Petr Mladek , Steven Rostedt , John Ogness , Sergey Senozhatsky Cc: "David S . Miller" , Andy Shevchenko , Dhruva Gole , =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= , Johan Hovold , Sebastian Andrzej Siewior , Vignesh Raghavendra , linux-kernel@vger.kernel.org, linux-serial@vger.kernel.org Subject: [PATCH v6 4/6] serial: core: Add support for DEVNAME:0.0 style naming for kernel console Date: Tue, 13 Feb 2024 10:45:11 +0200 Message-ID: <20240213084545.40617-5-tony@atomide.com> X-Mailer: git-send-email 2.43.1 In-Reply-To: <20240213084545.40617-1-tony@atomide.com> References: <20240213084545.40617-1-tony@atomide.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" We can now add hardware based addressing for serial ports. Starting with commit 84a9582fd203 ("serial: core: Start managing serial controllers to enable runtime PM"), and all the related fixes to this commit, the serial core now knows to which serial port controller the ports are connected. The serial ports can be addressed with DEVNAME:0.0 style naming. The names are something like 00:04:0.0 for a serial port on qemu, and something like 2800000.serial:0.0 on platform device using systems like ARM64 for example. The DEVNAME is the unique serial port hardware controller device name, AKA the name for port->dev. The 0.0 are the serial core controller id and port id. Typically 0.0 are used for each controller and port instance unless the serial port hardware controller has multiple controllers or ports. Using DEVNAME:0.0 style naming actually solves two long term issues for addressing the serial ports: 1. According to Andy Shevchenko, using DEVNAME:0.0 style naming fixes an issue where depending on the BIOS settings, the kernel serial port ttyS instance number may change if HSUART is enabled 2. Device tree using architectures no longer necessarily need to specify aliases to find a specific serial port, and we can just allocate the ttyS instance numbers dynamically in whatever probe order To do this, let's match the hardware addressing style console name to the character device name used, and add a preferred console using the character device name. Note that when using console=3DDEVNAME:0.0 style kernel command line, the 8250 serial console gets enabled later compared to using console=3DttyS naming for ISA ports. This is because the serial port DEVNAME to character device mapping is not known until the serial driver probe time. If used together with earlycon, this issue is avoided. Signed-off-by: Tony Lindgren --- drivers/tty/serial/serial_base.h | 16 +++++++ drivers/tty/serial/serial_base_bus.c | 66 ++++++++++++++++++++++++++++ drivers/tty/serial/serial_core.c | 4 ++ 3 files changed, 86 insertions(+) diff --git a/drivers/tty/serial/serial_base.h b/drivers/tty/serial/serial_b= ase.h --- a/drivers/tty/serial/serial_base.h +++ b/drivers/tty/serial/serial_base.h @@ -45,3 +45,19 @@ void serial_ctrl_unregister_port(struct uart_driver *drv= , struct uart_port *port =20 int serial_core_register_port(struct uart_driver *drv, struct uart_port *p= ort); void serial_core_unregister_port(struct uart_driver *drv, struct uart_port= *port); + +#ifdef CONFIG_SERIAL_CORE_CONSOLE + +int serial_base_add_preferred_console(struct uart_driver *drv, + struct uart_port *port); + +#else + +static inline +int serial_base_add_preferred_console(struct uart_driver *drv, + struct uart_port *port) +{ + return 0; +} + +#endif diff --git a/drivers/tty/serial/serial_base_bus.c b/drivers/tty/serial/seri= al_base_bus.c --- a/drivers/tty/serial/serial_base_bus.c +++ b/drivers/tty/serial/serial_base_bus.c @@ -8,6 +8,7 @@ * The serial core bus manages the serial core controller instances. */ =20 +#include #include #include #include @@ -204,6 +205,71 @@ void serial_base_port_device_remove(struct serial_port= _device *port_dev) put_device(&port_dev->dev); } =20 +#ifdef CONFIG_SERIAL_CORE_CONSOLE + +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; +} + +static int serial_base_add_prefcon(const char *name, int idx) +{ + const char *char_match __free(kfree) =3D NULL; + + /* Handle the traditional character device name style console=3DttyS0 */ + char_match =3D kasprintf(GFP_KERNEL, "%s%i", name, idx); + if (!char_match) + return -ENOMEM; + + return serial_base_add_one_prefcon(char_match, name, idx); +} + +/** + * serial_base_add_preferred_console - Adds a preferred console + * @drv: Serial port device driver + * @port: Serial port instance + * + * Tries to add a preferred console for a serial port if specified in the + * kernel command line. Supports both the traditional character device such + * as console=3DttyS0, and a hardware addressing based console=3DDEVNAME:0= .0 + * style name. + * + * Translates the kernel command line option using a hardware based addres= sing + * console=3DDEVNAME:0.0 to the serial port character device such as ttyS0. + * Cannot be called early for ISA ports, depends on struct device. + * + * Note that duplicates are ignored by add_preferred_console(). + * + * Return: 0 on success, negative error code on failure. + */ +int serial_base_add_preferred_console(struct uart_driver *drv, + struct uart_port *port) +{ + const char *port_match __free(kfree); + int ret; + + ret =3D serial_base_add_prefcon(drv->dev_name, port->line); + if (ret) + return ret; + + port_match =3D kasprintf(GFP_KERNEL, "%s:%i.%i", dev_name(port->dev), + port->ctrl_id, port->port_id); + if (!port_match) + return -ENOMEM; + + /* Translate a hardware addressing style console=3DDEVNAME:0.0 */ + return serial_base_add_one_prefcon(port_match, drv->dev_name, port->line); +} + +#endif + static int serial_base_init(void) { int ret; diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_c= ore.c --- a/drivers/tty/serial/serial_core.c +++ b/drivers/tty/serial/serial_core.c @@ -3395,6 +3395,10 @@ int serial_core_register_port(struct uart_driver *dr= v, struct uart_port *port) if (ret) goto err_unregister_ctrl_dev; =20 + ret =3D serial_base_add_preferred_console(drv, port); + if (ret) + goto err_unregister_port_dev; + ret =3D serial_core_add_one_port(drv, port); if (ret) goto err_unregister_port_dev; --=20 2.43.1 From nobody Sat Feb 7 22:26:28 2026 Received: from mail5.25mail.st (mail5.25mail.st [74.50.62.9]) (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 A63381B598; Tue, 13 Feb 2024 08:49:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.50.62.9 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707814175; cv=none; b=JFlIcNUCqjA2lYfweTTp9A8CC0GvSIblkAfmgc8GPa3wejmxfPcGCFtSLCkFfA7Er9Zxz+So7ANaIfScCvR60HinyC2mHLF7lLXtVlvo43yE0PcgChnwhrv9cavoKfz/B8anCXBncWNQhvKW0yy7urFR8KVMSgL61um090kVQmQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707814175; c=relaxed/simple; bh=rz4JcM8VahfCNX3woN71uZO8vOJEYNCoO2bOK1Cp9iY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=UiPF/SyGHO97tj2S4HG/QdK7NJcrAx8koAT88i70IHR7Mdo8cHU2vojF/ss0uVxMKeZdURY9hYld518so6retkwpxXCAlGCeKnvlyvcKV6mpiS4YxsrbODXUzOA2Q+0gX3DGau6mTchn4dkdIOA816PmO88rs3uF3fTnO0QdC/k= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=atomide.com; spf=fail smtp.mailfrom=atomide.com; dkim=pass (2048-bit key) header.d=atomide.com header.i=@atomide.com header.b=WFc/QEsF; arc=none smtp.client-ip=74.50.62.9 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=atomide.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=atomide.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=atomide.com header.i=@atomide.com header.b="WFc/QEsF" Received: from localhost (91-158-86-216.elisa-laajakaista.fi [91.158.86.216]) by mail5.25mail.st (Postfix) with ESMTPSA id CA61A60505; Tue, 13 Feb 2024 08:49:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=atomide.com; s=25mailst; t=1707814172; bh=rz4JcM8VahfCNX3woN71uZO8vOJEYNCoO2bOK1Cp9iY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WFc/QEsFVnpeGM/KcSUtWxtdMucDp3wZZTotFlWXrMM7YjY1GnvEN/iYrOHemRgjc HjZJdHCpH5yJDA23d8QOiTQZZzEjZf+HiPsHVuUWehCxfrrhGMYuxrquG4IWfhTeVx yQqgHC97RemNrWRKPV45QIsKFQyVPVx4xtEhMZV63F9gisogLPq1XjlRtq1kBJ1SbX W89NCnANAwC2EcaJphr2DpuaMRnVbVAaP7/80S2nW1kEe1Ugfn1PArDCK2gpkzsew+ p1i3+d8z68tDhhK4suT+vnFqpWnspwyEVEnPb9EnxmIlJzHDZFbMaw3Iw/ljTARsu/ sZzdwKksfG2rA== From: Tony Lindgren To: Greg Kroah-Hartman , Jiri Slaby , Petr Mladek , Steven Rostedt , John Ogness , Sergey Senozhatsky Cc: "David S . Miller" , Andy Shevchenko , Dhruva Gole , =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= , Johan Hovold , Sebastian Andrzej Siewior , Vignesh Raghavendra , linux-kernel@vger.kernel.org, linux-serial@vger.kernel.org Subject: [PATCH v6 5/6] serial: core: Handle serial console options Date: Tue, 13 Feb 2024 10:45:12 +0200 Message-ID: <20240213084545.40617-6-tony@atomide.com> X-Mailer: git-send-email 2.43.1 In-Reply-To: <20240213084545.40617-1-tony@atomide.com> References: <20240213084545.40617-1-tony@atomide.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" In order to start moving the serial console quirks out of console_setup(), let's add parsing for the quirks to the serial core layer. We can use serial_base_add_one_prefcon() to handle the quirks. Note that eventually we may want to set up driver specific console quirk handling for the serial port device drivers to use. But we need to figure out which driver(s) need to call the quirk. So for now, we just handle the sparc quirk directly. Signed-off-by: Tony Lindgren --- drivers/tty/serial/serial_base_bus.c | 49 ++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/drivers/tty/serial/serial_base_bus.c b/drivers/tty/serial/seri= al_base_bus.c --- a/drivers/tty/serial/serial_base_bus.c +++ b/drivers/tty/serial/serial_base_bus.c @@ -219,9 +219,58 @@ static int serial_base_add_one_prefcon(const char *mat= ch, const char *dev_name, return ret; } =20 +#ifdef __sparc__ + +/* Handle Sparc ttya and ttyb options as done in console_setup() */ +static int serial_base_add_sparc_console(const char *dev_name, int idx) +{ + const char *name =3D NULL; + + switch (idx) { + case 0: + name =3D "ttya"; + break; + case 1: + name =3D "ttyb"; + break; + default: + return 0; + } + + return serial_base_add_one_prefcon(name, dev_name, idx); +} + +#else + +static inline int serial_base_add_sparc_console(const char *dev_name, int = idx) +{ + return 0; +} + +#endif + static int serial_base_add_prefcon(const char *name, int idx) { const char *char_match __free(kfree) =3D NULL; + const char *nmbr_match __free(kfree) =3D NULL; + int ret; + + /* Handle ttyS specific options */ + if (str_has_prefix(name, "ttyS")) { + /* No name, just a number */ + nmbr_match =3D kasprintf(GFP_KERNEL, "%i", idx); + if (!nmbr_match) + return -ENODEV; + + ret =3D serial_base_add_one_prefcon(nmbr_match, name, idx); + if (ret) + return ret; + + /* Sparc ttya and ttyb */ + ret =3D serial_base_add_sparc_console(name, idx); + if (ret) + return ret; + } =20 /* Handle the traditional character device name style console=3DttyS0 */ char_match =3D kasprintf(GFP_KERNEL, "%s%i", name, idx); --=20 2.43.1 From nobody Sat Feb 7 22:26:28 2026 Received: from mail5.25mail.st (mail5.25mail.st [74.50.62.9]) (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 B2E5C225AC; Tue, 13 Feb 2024 08:50:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.50.62.9 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707814212; cv=none; b=fjaS85tU3o5kDc6lZQx5zV/cBO1UMKocS7I9mSOSxCzzfu5j+xsA6IczKPA67q9sGYnbg63U/e9zU5R2ZLi2mCcWPUvF8iGRMnXgXn8ybx3AcBPExmq0b+l7+pEQpStYW10WbhdPVvWAwjJzeH7cQ9lGBRnIe7x9kxfV8CpvZMI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707814212; c=relaxed/simple; bh=9k7N7FYP2C1sLmo1nycrn7Te4UNF5x2lWFrdUPXOets=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=h965mUfwugZM5sRzg7h/Ugh73D5tbwc+HpGtbMrsaDDKYik2SxRx+qa+cVB7DNk06INzo3C244Srn/mZObpgiq9rRTveUrPTEHXsjZbnkDsMflvseRd8cRCw/Aq/x9T/EUDHBUcsgrr9WVOu0gHpuk43pQY2NFDIvuJlM8GjIL8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=atomide.com; spf=fail smtp.mailfrom=atomide.com; dkim=pass (2048-bit key) header.d=atomide.com header.i=@atomide.com header.b=mcaoHpsk; arc=none smtp.client-ip=74.50.62.9 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=atomide.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=atomide.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=atomide.com header.i=@atomide.com header.b="mcaoHpsk" Received: from localhost (91-158-86-216.elisa-laajakaista.fi [91.158.86.216]) by mail5.25mail.st (Postfix) with ESMTPSA id D94BD60505; Tue, 13 Feb 2024 08:49:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=atomide.com; s=25mailst; t=1707814209; bh=9k7N7FYP2C1sLmo1nycrn7Te4UNF5x2lWFrdUPXOets=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mcaoHpskNQrJBnYqyHQp8P8XujBiM88xEhIADWFiHFzeZrE+6N7cphUuuVw3esTOz X3S6Gtp2HxcZBWbqxisBRpqwCpgrLYQUPGhz0px7zAGXlOD1tNmvuD3jZX3V3T+Rsc 7jdpCcHIt8jvwO2nvXF6sWWrjyHA89jqUMjhZ+7AAXePpnXUt+99ycixjGLrHc0QlQ bJQ0otdmPAEXoCVwbsTZgG+Ov4OtOT6WlhaIVLIL47B6emO1xjFRX9h85+Pha9OO8p /wxvB1gzoZE1/bljAfT61k15a0nO1Dg3ceCFI89ZgP0BNxpLMwJoDrA6WBGEFwJaik N3pHkFfCuGMVw== From: Tony Lindgren To: Greg Kroah-Hartman , Jiri Slaby , Petr Mladek , Steven Rostedt , John Ogness , Sergey Senozhatsky Cc: "David S . Miller" , Andy Shevchenko , Dhruva Gole , =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= , Johan Hovold , Sebastian Andrzej Siewior , Vignesh Raghavendra , linux-kernel@vger.kernel.org, linux-serial@vger.kernel.org Subject: [PATCH v6 6/6] serial: 8250: Add preferred console in serial8250_isa_init_ports() Date: Tue, 13 Feb 2024 10:45:13 +0200 Message-ID: <20240213084545.40617-7-tony@atomide.com> X-Mailer: git-send-email 2.43.1 In-Reply-To: <20240213084545.40617-1-tony@atomide.com> References: <20240213084545.40617-1-tony@atomide.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" Prepare 8250 ISA ports to drop kernel command line serial console handling from console_setup(). We need to set the preferred console in serial8250_isa_init_ports() to drop a dependency to setup_console() handling the ttyS related quirks. Otherwise when console_setup() handles the ttyS related options, console gets enabled only at driver probe time. Note that this mostly affects x86 as this happens based on define SERIAL_PORT_DFNS. Signed-off-by: Tony Lindgren --- drivers/tty/serial/8250/8250_core.c | 5 +++++ drivers/tty/serial/serial_base.h | 8 ++++++++ drivers/tty/serial/serial_base_bus.c | 21 +++++++++++++++++++++ 3 files changed, 34 insertions(+) diff --git a/drivers/tty/serial/8250/8250_core.c b/drivers/tty/serial/8250/= 8250_core.c --- a/drivers/tty/serial/8250/8250_core.c +++ b/drivers/tty/serial/8250/8250_core.c @@ -15,6 +15,7 @@ */ =20 #include +#include #include #include #include @@ -41,6 +42,8 @@ =20 #include =20 +#include "../serial_base.h" /* For serial_base_add_isa_preferred_console()= */ + #include "8250.h" =20 /* @@ -563,6 +566,8 @@ static void __init serial8250_isa_init_ports(void) port->irqflags |=3D irqflag; if (serial8250_isa_config !=3D NULL) serial8250_isa_config(i, &up->port, &up->capabilities); + + serial_base_add_isa_preferred_console(serial8250_reg.dev_name, i); } } =20 diff --git a/drivers/tty/serial/serial_base.h b/drivers/tty/serial/serial_b= ase.h --- a/drivers/tty/serial/serial_base.h +++ b/drivers/tty/serial/serial_base.h @@ -51,6 +51,8 @@ void serial_core_unregister_port(struct uart_driver *drv,= struct uart_port *port int serial_base_add_preferred_console(struct uart_driver *drv, struct uart_port *port); =20 +int serial_base_add_isa_preferred_console(const char *name, int idx); + #else =20 static inline @@ -60,4 +62,10 @@ int serial_base_add_preferred_console(struct uart_driver= *drv, return 0; } =20 +static inline +int serial_base_add_isa_preferred_console(const char *name, int idx) +{ + return 0; +} + #endif diff --git a/drivers/tty/serial/serial_base_bus.c b/drivers/tty/serial/seri= al_base_bus.c --- a/drivers/tty/serial/serial_base_bus.c +++ b/drivers/tty/serial/serial_base_bus.c @@ -317,6 +317,27 @@ int serial_base_add_preferred_console(struct uart_driv= er *drv, return serial_base_add_one_prefcon(port_match, drv->dev_name, port->line); } =20 +#ifdef CONFIG_SERIAL_8250_CONSOLE + +/* + * Early ISA ports initialize the console before there is no struct device. + * This should be only called from serial8250_isa_init_preferred_console(), + * other callers are likely wrong and should rely on earlycon instead. + */ +int serial_base_add_isa_preferred_console(const char *name, int idx) +{ + return serial_base_add_prefcon(name, idx); +} + +#else + +int serial_base_add_isa_preferred_console(const char *name, int idx) +{ + return 0; +} + +#endif + #endif =20 static int serial_base_init(void) --=20 2.43.1