From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=209.85.128.50 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794412122; b=XqWLpUNEf47KrDcoWqMbuhhF3TDzC1A30D3CnpBbqdl2bKi6EtXwBub0QBOHvFZluBC2 e9q7r7imUAKypB6X0kEoDcbsfqGcGlxwRMbezemSEOWytWgEux2v9boT4pMXNn5RS5AqK sHzHXheMarUInuXDXrrj5PMpCYsPmH4UKMgHPPSCqb1rH8xixjpz23icFS759nHamZ853 5WE/0wm467Ui1IphlJ9ziAPCYTK9sxlaIHHJhvqszcGRLDT7u7ZBZ4DULucJX6peMKh4D Xhtk1SLgaZupBc6V37uAacEEso/W/2IXE9CDK/gz3mT7vcn6rrWnjDZJFTwwlI/AZSA== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794412122; h=DMARC-Filter:Received:DKIM-Signature:X-Google-DKIM-Signature: X-Forwarded-Encrypted:X-Gm-Message-State:X-Gm-Gg:X-Received:Received: From:To:Cc:Subject:Date:Message-ID:X-Mailer:In-Reply-To:References: MIME-Version:Content-Transfer-Encoding; bh=sJakC65jRiJycFPLrWS53C7JIcLuQtZw3EKWHlPXzoI=; b=S0mHYiJTBs+TwhAocRJyJvl5wDHHvh5QFRWEBBVMXoXlSG63U/JgldNGZvWhoNPmx5UE Odvw1tT+G83ZHCORfCWBzyhhuTHo6lTgIpjtKQ80yDfEcuMjMNqrZuISl8ye2oXjXxsGW Ok6DuYA+u5D+nP0gKH/snk14jTJSoD+/8Y+9KwOKJZe/XCpXc/Y9ZnZ0gBs99yWRJceqC sjK9Za18UMMyk8PLtp8fcUITJp/I15zheIQRajccYQbVNjC5l8Orla4CqcioV2G6qM1wg ckq1+aFW1+zIr+FtremU4UBSrWucXiOd5yivPYBdVBq5E4Of6onSAPpf8rWI+7DyN/w== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=suse.com; spf=pass smtp.mailfrom=suse.com; dkim=pass header.d=suse.com header.i=@suse.com header.a=rsa-sha256 header.s=google header.b=Vr8KT2gS; arc=none smtp.remote-ip=209.85.128.50 Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CD775606A32D for ; Wed, 11 Nov 2026 15:48:41 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org CD775606A32D Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.a=rsa-sha256 header.s=google header.b=Vr8KT2gS Received: by mail-wm1-f50.google.com with SMTP id 5b1f17b1804b1-4a2072b9832so19348385e9.1 for ; Wed, 11 Nov 2026 07:48:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1794412120; x=1795016920; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=sJakC65jRiJycFPLrWS53C7JIcLuQtZw3EKWHlPXzoI=; b=Vr8KT2gSb+q2sNIO1hkg3LyhykvimTmnEj3rzP+qxQY+b69fED12uKdFCZmi3a0bu4 UCWp0R9SnfmCaMtBuSMZqrue7sv/l3CswyaSKm9GHyt+oIFBbwQz6avZd4SCam94e59X 8TojFAfk/aKuFtvrf5lTzF0zqcGdh5+ClA/BJoBJWoQM7qznUBHiKaKx7VodkR3F1gsg Sifo8qSEHDLdZYT8yz1SmDt2r8zLEZRSr/XFcVsKtfs30hC1/3D0vbwqeinFNF0KDd9X 8alZQXnj3dxX3IYIJSzyJqUoS172j+Q3pWHgfpdYykDrOAjikl86JKz8ubGq2tm8oCVb zYMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1794412120; x=1795016920; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=sJakC65jRiJycFPLrWS53C7JIcLuQtZw3EKWHlPXzoI=; b=DeR/5vNOJuqJJPG5SpCJ+mjhRFE+vGjZsS+GxjuIrWBIigPEAJ1sj0YGOHb9QuLcSk ytAv2foBTP5OkTySC+MyQ/zgFupuAxkgZglgqQfjT6txF8z2nuAQCL9uumKAWryCFvLw PMWbyEUTC1/uitMEVZLK6uEuKlhktN69OQzE3Wg6ZP5FAkOTdxYILZQJUcdy9IOzgPjs 3iChQzfC9AitlBYTTwIuUTjl55sSwn4vThWdBdKv5OYmMBcs6ItTTJEZcQbJQ4kU0mQ8 LYVtLk5zivfP6tWMe/V63GfpsBzbMmrBswpCF2o+zZdQMjTHQBIS4Ls5chSS+fK21T9N VZeA== X-Forwarded-Encrypted: i=1; AL+hErGdV9DTrF6RUoH3x0Zpyo919qNHyc69cbD2KK9eEfy2mnUUTfIz8P7odExokgCZLC7UW6Mdr3d8czsj3eE=@vger.kernel.org X-Gm-Message-State: APuU4Z8AL5kpjWsnXujeIJu0ebXrOdCtibvFJ+74wlPPrgdw9M/H9WWS Q2PmbuudHnfTeZLZyZeCfHAufgFTwEn267Nv/zLGuKxO0FkUKRY0vQjPuJx0K/umOJo= X-Gm-Gg: AYBFou0PyRBWiao65HUpXCIT/hDMguiv2pP/Qczk3POO2mri/+4Qwira840sUIHEB+V 9ObA/gs0HlDxEP/nc2hfz8kxjk2PSHwnm4OLFTcDcpgLW3wQu6j4rhsSgmBP5qXM+3Fd6pu+nRZ dNbRFlACwZCraR6zjNeFl1DbvhYe2w+s8oGNI8jbcznGrMyNBEETYVJAuYwPit14jSVzZHq41uX Xg++bZyZLYR2CIKu3sIqXTy81exrsjEicxCxKdpjrdKEeNyGj9k9Nm0OKr0UB4nMyi5zV4yT3mU fNvIQM6qZxnoNtc9ztiDFIwbAD3yr7x8gaJW0tAbcYTbxyi9ssrwonDbfkZbn0YZWRNmT6xuH6j UrEQOd7MqILDUqrtB08dZ48CFt33TrpqpjjHyhHZJaUXeMIbqqf13LDby8r7m9xk/7/x8yPBQwG He9VtZBB8vzqrOMH1AtitF8xa66PdWsHD38OtzpHUxTrXuyT5YNdXGuZCfeTOWIUJNKPutii4Sf JiS/S90I/cWSti6NPOCc++WFMCbC/StBBWyRDwImvV4qyYf6J9owN66S7Xaiva9/mL+TIc+dHaC wVIwPvCR8EletPfh9NXE0DjL+WdhajE= X-Received: by 2002:a05:600c:4594:b0:4a1:c6f5:2450 with SMTP id 5b1f17b1804b1-4ba0938142cmr50838095e9.17.1794412120095; Wed, 11 Nov 2026 07:48:40 -0800 (PST) Received: from pathway.suse.cz ([176.114.240.130]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4ba0953159dsm34230055e9.3.2026.11.11.07.48.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Nov 2026 07:48:39 -0800 (PST) From: Petr Mladek To: John Ogness Cc: Sergey Senozhatsky , Steven Rostedt , Marcos Paulo de Souza , Chris Down , Naveen Kumar Chaudhary , printk@lists.linux.dev, linux-kernel@vger.kernel.org, Petr Mladek Subject: [PATCH v7 01/17] printk: Rename struct console_cmdline to preferred_console Date: Wed, 11 Nov 2026 16:48:00 +0100 Message-ID: <20261111154816.71103-2-pmladek@suse.com> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261111154816.71103-1-pmladek@suse.com> References: <20261111154816.71103-1-pmladek@suse.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit The structure 'console_cmdline' was originally intended to store details about consoles defined on the kernel command line. However, its usage has since expanded; it now stores information for consoles preferred via SPCR, device tree, or by particular platforms, e.g. XEN. The current naming is misleading as it implies the configuration only originates from the command line. Rename the structure and associated artifacts to better reflect their current purpose, for example: - struct console_cmdline c -> struct preferred_console pc - console_cmdline[] -> preferred_consoles[] - console_cmdline.h -> console_register.h - c -> pc Additionally, renaming the header file to console_register.h would eventually allow to decouple console registration logic from the monolithic printk.c. Finally, renaming the local variable from "c" to "pc" helps to distinguish it from struct console variables. Note that "c" is used for struct console in some code, for example see vt_console_device() function definition. No functional changes. Signed-off-by: Petr Mladek Acked-by: Chris Down Acked-by: Marcos Paulo de Souza Reviewed-by: John Ogness --- kernel/printk/braille.c | 10 +-- kernel/printk/braille.h | 10 +-- .../{console_cmdline.h => console_register.h} | 6 +- kernel/printk/printk.c | 89 ++++++++++--------- 4 files changed, 58 insertions(+), 57 deletions(-) rename kernel/printk/{console_cmdline.h => console_register.h} (83%) diff --git a/kernel/printk/braille.c b/kernel/printk/braille.c index 17a9591e54ff..9d21a2bb1d38 100644 --- a/kernel/printk/braille.c +++ b/kernel/printk/braille.c @@ -6,7 +6,7 @@ #include #include -#include "console_cmdline.h" +#include "console_register.h" #include "braille.h" int _braille_console_setup(char **str, char **brl_options) @@ -35,14 +35,14 @@ int _braille_console_setup(char **str, char **brl_options) } int -_braille_register_console(struct console *console, struct console_cmdline *c) +_braille_register_console(struct console *console, struct preferred_console *pc) { int rtn = 0; - if (c->brl_options) { + if (pc->brl_options) { console->flags |= CON_BRL; - rtn = braille_register_console(console, c->index, c->options, - c->brl_options); + rtn = braille_register_console(console, pc->index, pc->options, + pc->brl_options); } return rtn; diff --git a/kernel/printk/braille.h b/kernel/printk/braille.h index 123154f86304..55cd3178a17a 100644 --- a/kernel/printk/braille.h +++ b/kernel/printk/braille.h @@ -5,9 +5,9 @@ #ifdef CONFIG_A11Y_BRAILLE_CONSOLE static inline void -braille_set_options(struct console_cmdline *c, char *brl_options) +braille_set_options(struct preferred_console *pc, char *brl_options) { - c->brl_options = brl_options; + pc->brl_options = brl_options; } /* @@ -21,7 +21,7 @@ int _braille_console_setup(char **str, char **brl_options); int -_braille_register_console(struct console *console, struct console_cmdline *c); +_braille_register_console(struct console *console, struct preferred_console *pc); int _braille_unregister_console(struct console *console); @@ -29,7 +29,7 @@ _braille_unregister_console(struct console *console); #else static inline void -braille_set_options(struct console_cmdline *c, char *brl_options) +braille_set_options(struct preferred_console *pc, char *brl_options) { } @@ -40,7 +40,7 @@ _braille_console_setup(char **str, char **brl_options) } static inline int -_braille_register_console(struct console *console, struct console_cmdline *c) +_braille_register_console(struct console *console, struct preferred_console *pc) { return 0; } diff --git a/kernel/printk/console_cmdline.h b/kernel/printk/console_register.h similarity index 83% rename from kernel/printk/console_cmdline.h rename to kernel/printk/console_register.h index 0ab573b6d4dc..9ab3e1cc749b 100644 --- a/kernel/printk/console_cmdline.h +++ b/kernel/printk/console_register.h @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: GPL-2.0 */ -#ifndef _CONSOLE_CMDLINE_H -#define _CONSOLE_CMDLINE_H +#ifndef _CONSOLE_REGISTER_H +#define _CONSOLE_REGISTER_H -struct console_cmdline +struct preferred_console { char name[16]; /* Name of the driver */ int index; /* Minor dev. to use */ diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c index 9a205f94bfac..b8d62fec2569 100644 --- a/kernel/printk/printk.c +++ b/kernel/printk/printk.c @@ -58,7 +58,7 @@ #include #include "printk_ringbuffer.h" -#include "console_cmdline.h" +#include "console_register.h" #include "braille.h" #include "internal.h" @@ -359,12 +359,11 @@ static void __up_console_sem(unsigned long ip) static int console_locked; /* - * Array of consoles built from command line options (console=) + * Array of consoles preferred via the command line, or by + * some platform-specific code, e.g. SPCR, or DT. */ - -#define MAX_CMDLINECONSOLES 8 - -static struct console_cmdline console_cmdline[MAX_CMDLINECONSOLES]; +#define MAX_PREFERRED_CONSOLES 8 +static struct preferred_console preferred_consoles[MAX_PREFERRED_CONSOLES]; static int preferred_console = -1; int console_set_on_cmdline; @@ -2544,16 +2543,16 @@ asmlinkage __visible void early_printk(const char *fmt, ...) } #endif -static void set_user_specified(struct console_cmdline *c, bool user_specified) +static void set_user_specified(struct preferred_console *pc, bool user_specified) { if (!user_specified) return; /* - * @c console was defined by the user on the command line. + * @pc console was defined by the user on the command line. * Do not clear when added twice also by SPCR or the device tree. */ - c->user_specified = true; + pc->user_specified = true; /* At least one console defined by the user on the command line. */ console_set_on_cmdline = 1; } @@ -2562,7 +2561,7 @@ 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; + struct preferred_console *pc; int i; if (!name && !devname) @@ -2581,30 +2580,30 @@ static int __add_preferred_console(const char *name, const short idx, * See if this tty is not yet registered, and * if we have a slot free. */ - for (i = 0, c = console_cmdline; - i < MAX_CMDLINECONSOLES && (c->name[0] || c->devname[0]); - i++, c++) { - if ((name && strcmp(c->name, name) == 0 && c->index == idx) || - (devname && strcmp(c->devname, devname) == 0)) { + for (i = 0, pc = preferred_consoles; + i < MAX_PREFERRED_CONSOLES && (pc->name[0] || pc->devname[0]); + i++, pc++) { + if ((name && strcmp(pc->name, name) == 0 && pc->index == idx) || + (devname && strcmp(pc->devname, devname) == 0)) { if (!brl_options) preferred_console = i; - set_user_specified(c, user_specified); + set_user_specified(pc, user_specified); return 0; } } - if (i == MAX_CMDLINECONSOLES) + if (i == MAX_PREFERRED_CONSOLES) return -E2BIG; if (!brl_options) preferred_console = i; if (name) - strscpy(c->name, name); + strscpy(pc->name, name); if (devname) - strscpy(c->devname, devname); - c->options = options; - set_user_specified(c, user_specified); - braille_set_options(c, brl_options); + strscpy(pc->devname, devname); + pc->options = options; + set_user_specified(pc, user_specified); + braille_set_options(pc, brl_options); - c->index = idx; + pc->index = idx; return 0; } @@ -2624,8 +2623,7 @@ __setup("console_msg_format=", console_msg_format_setup); */ static int __init console_setup(char *str) { - static_assert(sizeof(console_cmdline[0].devname) >= sizeof(console_cmdline[0].name) + 4); - char buf[sizeof(console_cmdline[0].devname)]; + char buf[sizeof(preferred_consoles[0].devname)]; char *brl_options = NULL; char *ttyname = NULL; char *devname = NULL; @@ -2633,6 +2631,9 @@ static int __init console_setup(char *str) char *s; int idx; + static_assert(sizeof(preferred_consoles[0].devname) >= + sizeof(preferred_consoles[0].name) + 4); + /* * console="" or console=null have been suggested as a way to * disable console output. Use ttynull that has been created @@ -2732,19 +2733,19 @@ int match_devname_and_update_preferred_console(const char *devname, const char *name, const short idx) { - struct console_cmdline *c = console_cmdline; + struct preferred_console *pc = preferred_consoles; int i; if (!devname || !strlen(devname) || !name || !strlen(name) || idx < 0) return -EINVAL; - for (i = 0; i < MAX_CMDLINECONSOLES && (c->name[0] || c->devname[0]); - i++, c++) { - if (!strcmp(devname, c->devname)) { + for (i = 0; i < MAX_PREFERRED_CONSOLES && (pc->name[0] || pc->devname[0]); + i++, pc++) { + if (!strcmp(devname, pc->devname)) { pr_info("associate the preferred console \"%s\" with \"%s%d\"\n", devname, name, idx); - strscpy(c->name, name); - c->index = idx; + strscpy(pc->name, name); + pc->index = idx; return 0; } } @@ -3903,33 +3904,33 @@ static int console_call_setup(struct console *newcon, char *options) static int try_enable_preferred_console(struct console *newcon, bool user_specified) { - struct console_cmdline *c; + struct preferred_console *pc; int i, err; - for (i = 0, c = console_cmdline; - i < MAX_CMDLINECONSOLES && (c->name[0] || c->devname[0]); - i++, c++) { + for (i = 0, pc = preferred_consoles; + i < MAX_PREFERRED_CONSOLES && (pc->name[0] || pc->devname[0]); + i++, pc++) { /* Console not yet initialized? */ - if (!c->name[0]) + if (!pc->name[0]) continue; - if (c->user_specified != user_specified) + if (pc->user_specified != user_specified) continue; if (!newcon->match || - newcon->match(newcon, c->name, c->index, c->options) != 0) { + newcon->match(newcon, pc->name, pc->index, pc->options) != 0) { /* default matching */ - BUILD_BUG_ON(sizeof(c->name) != sizeof(newcon->name)); - if (strcmp(c->name, newcon->name) != 0) + BUILD_BUG_ON(sizeof(pc->name) != sizeof(newcon->name)); + if (strcmp(pc->name, newcon->name) != 0) continue; if (newcon->index >= 0 && - newcon->index != c->index) + newcon->index != pc->index) continue; if (newcon->index < 0) - newcon->index = c->index; + newcon->index = pc->index; - if (_braille_register_console(newcon, c)) + if (_braille_register_console(newcon, pc)) return 0; - err = console_call_setup(newcon, c->options); + err = console_call_setup(newcon, pc->options); if (err) return err; } -- 2.56.0