From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.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 18C823431EF for ; Thu, 4 Jun 2026 10:16:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.46 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780568208; cv=none; b=AVLfSoyeeoZ4hAyXDx8IK6MkfW8vlV3pqp+qcHTGdix9pj+jZ+Lu7EarN0Gv03IoNHaBrYLmvuplAKG43cFrWczGR00sjqVmSqTR7jS0HCKJCt922TTy/RZya4eOVfVsDj2x4tNM/R29Xt1y0Pkqfzcb09YJtopEVaH7vWK54ZU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780568208; c=relaxed/simple; bh=at0OIgZBiCeeSsvWFnZVpQSCQeUWoWqhwj7/d5V8a48=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=kQVTGNFTb+6DvAeK3yzGGVvhYloIQOaJ6zRHov7D+QjY7tDKp3+tlnXWJQEYOkM9+Ubs3DdusJKngXgajmKJ+Abg+H2NXVg9zEJdN6tZJT3eGCbNKu2lZzZUCMU82Qzu2BWxQB/CSP7G+3CVAfA7QTzzJITTx13KroSLfCXHvPw= 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=CWqHH2xn; arc=none smtp.client-ip=209.85.221.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="CWqHH2xn" Received: by mail-wr1-f46.google.com with SMTP id ffacd0b85a97d-45e9f4a3510so290957f8f.1 for ; Thu, 04 Jun 2026 03:16:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1780568205; x=1781173005; 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=7CkHpXRMc1nizWSGdPZBUG3xtGvnOF2T1RLJ8fvw1Y4=; b=CWqHH2xn1OQ+dHZp3AxqIiAla0x1pdWaniDwGSYUNfDWns+OO8tQFK0XfHiGm4pmhx +tril7Te6WbSFQm1YP6EYROhLy4mrB9FfKS8DD3Tm7Epk+IDcXQGKf/LOmw3XNQMNTNi XONAIK44B0iDDJhpF1WbJHTfN+E6zC66GIeXpuarwtzk5WUreoxO4fmjx72cwg1R6qjY sWxe1X+wxg3ia/2ud3CYaNF7DjvxOI7HDZPV9VpvBM+Uck/81RCYQeLECFWifHZH7DcW 465K7abUOoh8FquMTg5CZo7m2CBSf9ZSl6rbVQ1trn+3+QS1UFVBlQCrNKjeDfYGE3Xp FFfQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780568205; x=1781173005; 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=7CkHpXRMc1nizWSGdPZBUG3xtGvnOF2T1RLJ8fvw1Y4=; b=gT86JVRD1s8Yz7YAdQOtCM/Owrtj4li69a+W/Uhy+MWgM7IuFEn4yt+gm1BNPTuQ5q 0OvDQd01poC+77W458oHvaVnddvcRFReFrQOOogz61rHhtMsRJGukfC18jHe5feXFsCR KbAoxR6qLPC9p48JhCJKLmDqehMKQBTXOhR0l+rnRzhDEugY3ZTmR7IzeKHyzrJAgrTM lmRQTMIf4OPPhx1E8Qm7SyquT/4FvEbe6S6CkGwY6mkxIjfNT6VE6xukVY8wpUj91ZM2 tB90Cy2/qoHyrenr9B4uM27wxVsWtaXCQ6TCCTzmPSktq4jNTAg8VAs3rfUIwUFuX9fD g9yQ== X-Forwarded-Encrypted: i=1; AFNElJ9pLS/0lpggHSMvcilYEARzsB1VIkitbl3p28dAT9wq9zmZEC8omBvbxHhYbW3CZaGSohbmTqsePQmXXOk=@vger.kernel.org X-Gm-Message-State: AOJu0YzHk4dH44UHGnLbl4QhHfzpr92oUn1VkIEeWB5rOI8XUfauswdM r0qXs5xV8mgZFq6bdep5T1zocpdMffbd5pZt5yl9CzAHKz8BXa9KY3KwRVgviwWxSdw= X-Gm-Gg: Acq92OE6EM7RaMLBBFRSiZWEGH+/IeWWtzNPpwmwa44w2t6XpzTdxzzPH4GMUd3kmE2 ZgFI/NbBljbwstsxgKdAy9W5Ak3OO/RBEChdLtz3A5wp7Xrzma8gvdNdZ+EF2HWbza0bvjyAJmf cyRk1cSZsfm+aodqDHslLjYCw8Ky+F/b4dkcuzzk6LEu5oDU6v3JAVZ4yvjU5xydbO1oPWrFOIO 6tZWp0rhuoLpeInVstPvfIEu8LBTAOjZcizwxp//Y9w5ANHFllVqiqvHCoZW1brM69+O9I+wmUU chb0EvCe02eFNE+k3pS7I0Y8a9DyhiUlbxT1JpyabBn1/RxoJ9f51Y4VxOz9d44VBNSQuKhwuNf b6gice6bt7K5QrjLYDlsKSjqA/4+Lxzkl2wOqn4qAUUrKDUnJHi/G2JQgf6DEPQwISIzK3NNRr4 rlPN6pZ6DVHATn4GPMhmnHhZ5Wm7SeojVdWdkTom6pclEw7LI= X-Received: by 2002:adf:e743:0:b0:43d:733f:aee6 with SMTP id ffacd0b85a97d-460217920damr7772447f8f.10.1780568205412; Thu, 04 Jun 2026 03:16:45 -0700 (PDT) Received: from pathway.suse.cz ([176.114.240.130]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4601f2dcad5sm16421060f8f.5.2026.06.04.03.16.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Jun 2026 03:16:44 -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 08/11] printk: Try to register each console as Braille first Date: Thu, 4 Jun 2026 12:14:55 +0200 Message-ID: <20260604101459.393162-9-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-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 5fb9581804c7..3a645558c18a 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; /* @@ -3977,8 +3980,9 @@ static int console_call_setup(struct console *newcon, char *options) * by either the command line or add_preferred_console() and * setup/enable it. */ -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; @@ -3989,8 +3993,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 */ @@ -4003,7 +4018,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); @@ -4019,6 +4034,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) { @@ -4041,6 +4067,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