From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 931AE20010A for ; Thu, 4 Jun 2026 10:15:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.46 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780568138; cv=none; b=IuUnooAMOI+21DWOSc3Ed4lGS3FE0jfeNtav8L2vdWHTsO+qphCBt9af/DJw48D/PCrGC6Di9+EU0rS4pXRm+mpZTdmNMtC53lM3uPc98ikW8spcKfQWOCqP006kX44Z106IT1yHZo7KUeblaOAY1KL66qDV2NKGkzFGTZyooE0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780568138; c=relaxed/simple; bh=+WorEY/IOf0/D5vGdyDQd3uLXDJwVW0EZ2F9dhr7O3w=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=WNnMIjXgdOgGANWUOMPsj/M+a8AMisFSmSjUzHwBaaMw1I+CCeLG5V/npkROusVhCc/YYOk6nQW4ZGoVaPO2zc9Ga4xhNhapNMdQeNYSGx2cDsSykTPEn9Lf8wySyoYizK0q1KAHimVwCVx/CyxftPDumsq4PCDzogw0sn3Pqg8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com; spf=pass smtp.mailfrom=suse.com; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b=dMqYV2/7; arc=none smtp.client-ip=209.85.128.46 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.b="dMqYV2/7" Received: by mail-wm1-f46.google.com with SMTP id 5b1f17b1804b1-490b1bbcf3aso4156305e9.1 for ; Thu, 04 Jun 2026 03:15:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1780568135; x=1781172935; 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; bh=rBj1cyuAXhQLBxGyy9ST5XMG0xF2iGQCJJomXoK/dBA=; b=dMqYV2/7Lric0BMCD0Dg5ctEkBNdovvt6Kbb/gyjsN6U+pigAppI0wr4+DGRaHBMU+ VAjGtabz8R3fBWWsq00MhhF6nrfzGFKqdRIN4JfVuoQ9mJgrh2vjdvYqyLXu22O/w94q rkV3V+iEMTM0ewYPcVSi0k29o+GuNDSUQI8gj3hnXVj74an0Dmxh/ydU3Qxr8ciVLbCa jxHebfH51w8RqVVGxF7dEHQVURNLcbMuAMAqbyV2IjiUds/mlKDnGhHF35xaCeMJTynv jnJwYYrWJr5gSEgzuCxgdlcYN7zK2RTAMPfq0xrm3wNA3xBktxRDpoqBjtcHC6jBGYOQ TW1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780568135; x=1781172935; 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; bh=rBj1cyuAXhQLBxGyy9ST5XMG0xF2iGQCJJomXoK/dBA=; b=Mq39A1KnEUVdwq+2LMA6FH/lR3vEKrA0SV/Yg3QC89J6uoao2ww/uncmDcmLJ/H0A6 TrqQ8Ei5rKfbrlrSVOKcDpteMFZCrfHB1AXTz92Tm8bog4wt9BHfpMxfVLZPmD66npyo hGkc0a9SDejRGDqY8KJqCqfVR9HWuhgAg+5kueE3YYi8pptOvKOFIV4PtMqRIYveTEr4 ZKutDSutvpiCFl+P5tDr5S2j2+EyEArgpW1BsuYZGyudAT+/X4CaWsoSc2oBTK/DhdlV o1G1ShsSSCEL9Ka4l6AE72QFA4njWcaLhTw7/2mfQjuEuo5xTzKO5kbVrEx4U6Jce9Wk 55GQ== X-Forwarded-Encrypted: i=1; AFNElJ9L+FZw8wYoN4v7AUSHJiyQUjPnXnNsWaID1hUEI2nHJRz0W4FKDmQcNDAAx7BRYk/MMi8Fv3FWGoPiBdA=@vger.kernel.org X-Gm-Message-State: AOJu0YwhyHPQ79lRzGv5gTDrBSq2iAkaybTUeGwMkojepHzZWfDqxZ4o FfgqHmLQQDGRa4GNztIJVJRaI1W7RJRIRVmddEv+Wv94yQVXzdoGgBwbwSziTnIFmFw= X-Gm-Gg: Acq92OFtVniiH21Aajv+eGNpyo1aTqKBJyo2aOLwAtc4oc+Cy/9i2Z2tC7kcwIcufpn haGjgr4ZisiphDCnknDr13n6ZYND7epoXOwIpW5QefvpJ/GRSX8MHnl654OREMS6kUggdAYXRBj 414Y8Q8wLzJ2/f6A5korSiXgA9NX3yBkAWL1YJyxcUyGyyTQmuz5kf64B9G4tAeAsjufBoIAXK5 itdhwxyayWVmG3rVY0loTfeP9LF8WQd+LiGjab1Sm/gJ6J0srQnW0p5qaZr7dSo9OMyALXTsrzj 9iLPQNlYJPXhSssCsYVNhVICJWEltIrsSi3LyWjs5eS/RKOEtp+yrNZZ3TJplcUUlYJ5ZilE1Ug +XpWecm+uWDQy2Vmzwztygup/0409kmlNGnWjJIx+SdWF7CXP/+sX8TzVVgMblRwZGWtLD2oRFR I/hcor5suwIi6ZFdDh/jmhtR71fBCyv95yFS5j X-Received: by 2002:a05:600c:5288:b0:490:5191:6e26 with SMTP id 5b1f17b1804b1-490b5ecbd41mr116250245e9.18.1780568134839; Thu, 04 Jun 2026 03:15:34 -0700 (PDT) Received: from pathway.suse.cz ([176.114.240.130]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-490bc3cc140sm72381395e9.9.2026.06.04.03.15.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Jun 2026 03:15:34 -0700 (PDT) From: Petr Mladek To: John Ogness Cc: Sergey Senozhatsky , Steven Rostedt , Marcos Paulo de Souza , Chris Down , Naveen Kumar Chaudhary , linux-kernel@vger.kernel.org, Petr Mladek Subject: [PATCH v4 02/11] printk: Rename struct console_cmdline to preferred_console Date: Thu, 4 Jun 2026 12:14:49 +0200 Message-ID: <20260604101459.393162-3-pmladek@suse.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260604101459.393162-1-pmladek@suse.com> References: <20260604101459.393162-1-pmladek@suse.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: 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 | 85 ++++++++++--------- 4 files changed, 57 insertions(+), 54 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 aa53d57a524b..0099e46a223b 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" @@ -362,9 +362,9 @@ static int console_locked; * Array of consoles built from command line options (console=) */ -#define MAX_CMDLINECONSOLES 8 +#define MAX_PREFERRED_CONSOLES 8 -static struct console_cmdline console_cmdline[MAX_CMDLINECONSOLES]; +static struct preferred_console preferred_consoles[MAX_PREFERRED_CONSOLES]; static int preferred_console = -1; int console_set_on_cmdline; @@ -2544,16 +2544,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 +2562,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 +2581,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 +2624,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 +2632,10 @@ 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 @@ -2730,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; } } @@ -3894,33 +3897,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.54.0