All of lore.kernel.org
 help / color / mirror / Atom feed
From: Petr Mladek <pmladek@suse.com>
To: John Ogness <john.ogness@linutronix.de>
Cc: Sergey Senozhatsky <senozhatsky@chromium.org>,
	Steven Rostedt <rostedt@goodmis.org>,
	Marcos Paulo de Souza <mpdesouza@suse.com>,
	Chris Down <chris@chrisdown.name>,
	Naveen Kumar Chaudhary <naveen.osdev@gmail.com>,
	linux-kernel@vger.kernel.org, Petr Mladek <pmladek@suse.com>
Subject: [PATCH v4 10/11] printk: Modify try_enable_default_console() to return error/success
Date: Thu,  4 Jun 2026 12:14:57 +0200	[thread overview]
Message-ID: <20260604101459.393162-11-pmladek@suse.com> (raw)
In-Reply-To: <20260604101459.393162-1-pmladek@suse.com>

Currently, try_enable_default_console() has a void return type, and
its potential failures (specifically when console_call_setup() fails)
are ignored by its caller, try_enable_console().

Modify try_enable_default_console() to return error/success, and update
try_enable_console() to capture and propagate this error.

With this change, try_enable_console() will no longer return success
for a pre-enabled console if try_enable_default_console() failed (such
as when newcon->setup() fails). While this might change existing behavior,
it is the correct approach to ensure setup errors are not silently ignored
or treated as successful registrations simply because the console was
marked pre-enabled.

Assisted-by: Gemini:gemini-3 # commit message
Signed-off-by: Petr Mladek <pmladek@suse.com>
---
 kernel/printk/printk.c | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
index a4eaf157cece..b0df4a23252d 100644
--- a/kernel/printk/printk.c
+++ b/kernel/printk/printk.c
@@ -4060,18 +4060,23 @@ static int try_enable_braille_console(struct console *newcon)
 }
 
 /* Try to enable the console unconditionally */
-static void try_enable_default_console(struct console *newcon)
+static int try_enable_default_console(struct console *newcon)
 {
+	int err;
+
 	if (newcon->index < 0)
 		newcon->index = 0;
 
-	if (console_call_setup(newcon, NULL) != 0)
-		return;
+	err = console_call_setup(newcon, NULL);
+	if (err)
+		return err;
 
 	newcon->flags |= CON_ENABLED;
 
 	if (newcon->device)
 		newcon->flags |= CON_CONSDEV;
+
+	return 0;
 }
 
 #define console_first()				\
@@ -4114,7 +4119,9 @@ static int try_enable_console(struct console *newcon)
 	if (preferred_dev_console < 0) {
 		if (hlist_empty(&console_list) || !console_first()->device ||
 		    console_first()->flags & CON_BOOT) {
-			try_enable_default_console(newcon);
+			err = try_enable_default_console(newcon);
+			if (err != -ENOENT)
+				return err;
 		}
 	}
 
-- 
2.54.0


  parent reply	other threads:[~2026-06-04 10:17 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-06-04 10:14 [PATCH v4 00/11] printk: Clean up preferred console handling Petr Mladek
2026-06-04 10:14 ` [PATCH v4 01/11] printk: Handle pre-enabled consoles in the top-level register_console() Petr Mladek
2026-07-14 13:33   ` John Ogness
2026-07-15 14:43     ` Petr Mladek
2026-06-04 10:14 ` [PATCH v4 02/11] printk: Rename struct console_cmdline to preferred_console Petr Mladek
2026-06-04 10:14 ` [PATCH v4 03/11] printk: Rename preferred_console to preferred_dev_console Petr Mladek
2026-06-04 10:14 ` [PATCH v4 04/11] printk: Separate code for adding/updating preferred console metadata Petr Mladek
2026-07-14 14:35   ` John Ogness
2026-07-15 15:52     ` Petr Mladek
2026-06-04 10:14 ` [PATCH v4 05/11] printk: Cleanup _braille_(un)register_console() wrappers Petr Mladek
2026-06-04 10:14 ` [PATCH v4 06/11] console/braille: Lock console->setup() call during the registration Petr Mladek
2026-07-15 14:41   ` John Ogness
2026-06-04 10:14 ` [PATCH v4 07/11] printk: Separate code for enabling console Petr Mladek
2026-07-15 16:01   ` John Ogness
2026-06-04 10:14 ` [PATCH v4 08/11] printk: Try to register each console as Braille first Petr Mladek
2026-06-04 10:14 ` [PATCH v4 09/11] printk: Do not set Braille console as preferred_console Petr Mladek
2026-06-04 10:14 ` Petr Mladek [this message]
2026-06-04 10:14 ` [PATCH v4 11/11] printk: Try enable preferred consoles only when there are any Petr Mladek
2026-07-14  8:42 ` [PATCH v4 00/11] printk: Clean up preferred console handling Petr Mladek

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20260604101459.393162-11-pmladek@suse.com \
    --to=pmladek@suse.com \
    --cc=chris@chrisdown.name \
    --cc=john.ogness@linutronix.de \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mpdesouza@suse.com \
    --cc=naveen.osdev@gmail.com \
    --cc=rostedt@goodmis.org \
    --cc=senozhatsky@chromium.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.