From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ed1-f49.google.com (mail-ed1-f49.google.com [209.85.208.49]) (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 A83743C9888 for ; Tue, 2 Jun 2026 08:54:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.49 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780390500; cv=none; b=JULd7uONSFeuOtLyIhbfdOlZPvNILwVK7LeTc+XPvAHJ9R5aJY7YtMVICUPcuQdFE/Lc1eNAYc5QrGYnnAAh38vZj9Ha5j0E5KjMaAArSu4Vw06OaVuSgvsXqkrgkhAEPHpDZ5IVTzT6YZrzQeRY6Ue7fQTdDweeYx6jgm02yg8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780390500; c=relaxed/simple; bh=r4gjHMrPvYagKtkxVn/aOP7Aw6tIo/dCWyNDGzAEXVE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=cThc/ayoyo3+qF77v6snpWFj0o9w0leMWbUTpD+YnqV6ndgXEG2dA8ld2IK4xLrA5duSV1ivrkuLE2/fpGP87Wz6fbt5dHu2iJOSdOA9UqJpRiv6krd/HzsnsWvtdKpK14atHbny3/0rdsN8eQ6XOcnAExZDkzkPweHya+TTKMc= 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=RRQ5LO9a; arc=none smtp.client-ip=209.85.208.49 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="RRQ5LO9a" Received: by mail-ed1-f49.google.com with SMTP id 4fb4d7f45d1cf-68d234218bcso4435259a12.2 for ; Tue, 02 Jun 2026 01:54:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1780390497; x=1780995297; 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=gqrj4xVPWGLmCrkZBPqs0EHz2T5zlLU+/FlWHn0jxHM=; b=RRQ5LO9a4H8vIAK7L4ZMIHrypj9tt4iFw1xbtvwvKQbUB1hiFB7N5plgKC59VV38HH i7PN1nRkDDGYbwx9dxcUC4Wa7N4Kjrnc2iB5OyNxgXgvu8MGdyYQ2eAJtyn53EG/nVQc DFk7dSValVJDJMTZ5HFvsOm8oEtM7zCRdfIAOL3TvH4Qa5NVqhIXp0hH+Q+9z0YavkJY xjhP/kbhqEPd3E2PRFjCLCoIHrrdY7CsPfbID0t8Q6joybrTAUTM8K0UoYJV2bb25E1o gVUWkD2sCfGWh4CJLux4CPtlVgb2p343+Xx+NJsvieUt2KttGSVvEUU0A+dj50FX0jOH WOHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780390497; x=1780995297; 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=gqrj4xVPWGLmCrkZBPqs0EHz2T5zlLU+/FlWHn0jxHM=; b=jTI8ZkTSaEa2o/hnAhhZtsXjXz7gm0qylELX0T6f0qF2V9CPuD5xVhgcXUq3JwHCRY X/2549WZN7/dQKg9oqfuNP5OUEGW6I6B2hHFyJz0knFfVEiNQlIv1QKG9JTpc14fNDPX Vrfs/4kGML8tynmExJ7vrpkfn9hTdGOKGoZ3tUHRzzhxvSkUmCGfKn83wkNIXdupN5Ey TSGAS+7qZLThutxurwp+etXGzsLbwEiEEcUrvfM8gEGrHfIgDl4t3BaBXXq30oq58R17 SE+DXAKH0ukRchZlT0cGYpSDPok/45XJGB6uWO2Vy+5wqu2yDz5R4GH+/Qoiv+aK+ySz wTKw== X-Forwarded-Encrypted: i=1; AFNElJ8GCXkLw1nojnG/GQCsrqJx04jIY+aKRUl3kWGrN7nn6BLCtVyDSX6fRnOJ27a4zMPqEyQ4ABFiQVSPDZ4=@vger.kernel.org X-Gm-Message-State: AOJu0YysoSS4nFoJuOZybg5Lo6i9mPRXr6HGdQBtuAww9spWMhXFtTjk StOsc99PwQpXDm+JSV9uJ7ELIJM1Xcfp9DzxWkp6Cyh9i4VZ+i9fzJM1CYWDItcqS7UesU8LX+r izL4C X-Gm-Gg: Acq92OGn7o8qeDrjFz56ZqzNOacp3vWmG2AazIn8+abuvPk94sJ2NpWQzLuwKK+0CPG vE5mddKfdfPMGvb1W1Br6B2FEUBXMcEuCqVy09KKze2IRVpZKYOs8e1nNlQOLiDDlLnZlxN2wqX ntsk3FmaMIlqPXn0+bzmO0pDZR6tIAYN3ydFtzGmBm4R6NMN2w51XMTb63bw6s4P0ipeqydo3Or 36T3yOcu69OJhjIVxPSMH6XHI0NjPdXE9e24xKTr7j0ClniFR8Hii2g9VU5O3dUlEtDMMqtt7B3 WK4PJJD+iV9997V/tj5zciSbkbfc48dHPdIfBxA8/9RhLTU32YJ66DyVWjClEY2Cj1m/dnOUF0A Qe8N0j/VSXOcg9iXKFkGHaYHDAoDBVe9LMXVUK4Il4fd+TmTQjBFXEwDL0a6OMv/cXx8RqKc8GH E1bkdDVv016gxbbg8+3HYGdKutLHb05bFi/qmSIgGjSPcldLA= X-Received: by 2002:a17:906:fd8b:b0:bdc:ac75:73b9 with SMTP id a640c23a62f3a-beab66dcc4fmr844954866b.43.1780390495270; Tue, 02 Jun 2026 01:54:55 -0700 (PDT) Received: from pathway.suse.cz ([176.114.240.130]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45ef34b834esm31605817f8f.11.2026.06.02.01.54.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Jun 2026 01:54:54 -0700 (PDT) From: Petr Mladek To: John Ogness Cc: Sergey Senozhatsky , Steven Rostedt , Marcos Paulo de Souza , Chris Down , linux-kernel@vger.kernel.org, Petr Mladek Subject: [PATCH v3 07/11] printk: Try to register each console as Braille first Date: Tue, 2 Jun 2026 10:53:08 +0200 Message-ID: <20260602085312.228251-8-pmladek@suse.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260602085312.228251-1-pmladek@suse.com> References: <20260602085312.228251-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-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Braille consoles are unique: they can only be enabled via the command line and use the preferred console framework for initialization, yet they are never added to the console_list or associated with /dev/console. Because of this, the preferred_console variable remains unset when only a Braille console is requested. Currently, try_enable_preferred_console() must be called even when "preferred_dev_console" variable is not set, just to catch these "hidden" Braille requests. Refactor the logic by adding a parameter to try_enable_preferred_console() to explicitly handle Braille vs. non-Braille cases. It will eventually allow to skip try_enable_preferred_console() when there are no preferred consoles. This improves code robustness by ensuring the console setup is explicit and only performed once. Note that _braille_register_console() is skipped when the given console driver has a match() callback and it succeeded. It means that it took over an early console and can't be used as a Braille console. As a result try_enable_braille_console() might return success even when it did not enabled the console in the Braille mode. It is the reason why register_console() has to explicitly check whether CON_BRL flag was really set and could skip the further steps. The refactoring even fixes two subtle bugs: 1. When only the Braille console is defined on the command line, the original code might attempt to enable the same console twice—once as a default and once as a Braille console. This results in calling the setup() callback twice and incorrectly setting the CON_CONSDEV flag. 2. When the same console is defined on the command line using devname and then as Braille console, for example: console=00:00:0.0,115200 console=brl,ttyS0,115200 It would have two separate entries in preferred_consoles[] array. The 2nd (Braille) entry would be used when univ8250_console_init() tries to register the generic "ttyS" console driver. Note that the 1st entry still does not have defined the "name" entry at this stage. The 1st non-Braille entry would be used later when serial8250_init() registers all found devices, assigns "tty0" for the given "00:00:0.0" devname and tries to register the same struct console once again. The original code would call newcon->setup() twice in this scenario. It won't add the console into console_list only because the later check in register_console() would detect CON_BRL flag set from the 1st registration and return early. Signed-off-by: Petr Mladek --- kernel/printk/printk.c | 56 +++++++++++++++++++++++++++++++++++++----- 1 file changed, 50 insertions(+), 6 deletions(-) diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c index 6b23a3b677b7..4a7ecef97b04 100644 --- a/kernel/printk/printk.c +++ b/kernel/printk/printk.c @@ -367,6 +367,7 @@ static int console_locked; static struct preferred_console preferred_consoles[MAX_PREFERRED_CONSOLES]; static int preferred_dev_console = -1; +static bool want_braille_console; int console_set_on_cmdline; EXPORT_SYMBOL(console_set_on_cmdline); @@ -2648,7 +2649,9 @@ static int add_or_update_preferred_console(unsigned int i, braille_update_options(pc, brl_options); - if (!brl_options) + if (brl_options) + want_braille_console = true; + else preferred_dev_console = i; /* @@ -3980,8 +3983,9 @@ static int console_call_setup(struct console *newcon, char *options) * Care need to be taken with consoles that are statically * enabled such as netconsole */ -static int try_enable_preferred_console(struct console *newcon, - bool user_specified) +static int __try_enable_preferred_console(struct console *newcon, + bool user_specified, + bool try_only_braille) { struct preferred_console *pc; int i, err; @@ -3992,8 +3996,19 @@ static int try_enable_preferred_console(struct console *newcon, /* Console not yet initialized? */ if (!pc->name[0]) continue; - if (pc->user_specified != user_specified) - continue; + + /* + * @try_only_braille and @user_specifified define which + * preferred console entries are handled in this round. + */ + if (try_only_braille) { + if (!is_braille_console_preferred(pc)) + continue; + } else { + if (pc->user_specified != user_specified) + continue; + } + if (!newcon->match || newcon->match(newcon, pc->name, pc->index, pc->options) != 0) { /* default matching */ @@ -4006,7 +4021,7 @@ static int try_enable_preferred_console(struct console *newcon, if (newcon->index < 0) newcon->index = pc->index; - if (is_braille_console_preferred(pc)) + if (try_only_braille) return _braille_register_console(newcon, pc); err = console_call_setup(newcon, pc->options); @@ -4030,6 +4045,17 @@ static int try_enable_preferred_console(struct console *newcon, return -ENOENT; } +static int try_enable_preferred_console(struct console *newcon, + bool user_specified) +{ + return __try_enable_preferred_console(newcon, user_specified, false); +} + +static int try_enable_braille_console(struct console *newcon) +{ + return __try_enable_preferred_console(newcon, true, true); +} + /* Try to enable the console unconditionally */ static void try_enable_default_console(struct console *newcon) { @@ -4052,6 +4078,24 @@ static int try_enable_console(struct console *newcon) { int err; + /* + * First, try to enable the console driver as a Braille console. + * It would have metadata in the preferred_consoles[] array. + * But it won't be counted as @preferred_console because + * it does not get printk() messages and is not associated + * with /dev/console. + * + * Note that it might succeed also when the driver has a match() + * callback and it took over a boot console. In this case, + * the driver will continue working as a classic non-Braille + * console. + */ + if (want_braille_console) { + err = try_enable_braille_console(newcon); + if (err != -ENOENT) + return err; + } + /* * See if we want to enable this console driver by default. * -- 2.54.0