From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) (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 3F7A6188596 for ; Thu, 23 Apr 2026 13:02:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.53 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776949323; cv=none; b=oX3rRHuqLiYjqwD5Fk+pcBFhRRatsRMmpxrHfP7wCv3NdkMlMB6y6PUhY1ATYhgTPfq7OZnvFczXTVtGN9ieooYztaFj/8umIsCTgm6WfG35C2hwkYXdg/jxyK3etBN1wFGq4fZt2U2Nhibgw3VUVYKOgJinK7qN5x73sojBuA4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776949323; c=relaxed/simple; bh=HqypRryrIx0l1ROVYu2Nc7w30ewF8sWRBOBcXjHqBC0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=r9SNgggn1v46RbqfzeFAWa6jf8QtY+VdAQ31saRrqVQWEH/bPog0cM0TEvPQdfWa1R+9joAO6ixW1SW1Gxoy51doBns2NEUtWbT+i5zd1DVIxEz0p22rmU8ZTNFp/dSv7ljZrrH6BuoT5hdI//7SDaSgYVo8gaDY7JqlmU65f7k= 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=Q89LQ+hn; arc=none smtp.client-ip=209.85.128.53 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="Q89LQ+hn" Received: by mail-wm1-f53.google.com with SMTP id 5b1f17b1804b1-48374014a77so86685365e9.3 for ; Thu, 23 Apr 2026 06:02:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1776949320; x=1777554120; 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=/Ebd2u/ZqiKgN+HwpCewwG6tt0VL6ZGdK3iSPAdPLro=; b=Q89LQ+hnSAd0T9JM+PHvdKoMdZa6FMlUuMe2/faGuGTgMr++MeMIp/QKFFFeDj0xrP MxRtkm/Ig+hYk81py2txnyIaZ/RLxctGT+Bk0kJ6NQnyP9TBEsdBSTe7ADTfpIozh/e0 GJ+rF6SdsvCDhmLNFzhXN4v8lPnixqqYwN33rFtCJavTmBBG4rQxQsK44B1c/QU39ZDu uDTjLigRGazAAbmduyjQMTj2WetKliXW4DiE5n3hLSnZY/WQS1U/x2GvDrsCmn27FeTz GF/LduEJOPFee8Zhjy/mMT1ZbQKKGiWFssEXly9S9aZHpQy391oM9fXUSGRCdvXCMacY J1jw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776949320; x=1777554120; 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=/Ebd2u/ZqiKgN+HwpCewwG6tt0VL6ZGdK3iSPAdPLro=; b=aAHeN3JNiKAWka3Y0TNIdp3BzjgWtcLLA3jPhp3sx3mhdlVtXguCJ194XWL4wNkH4F BhG4/qZydkXNHGva79Xs09bz6Me9sL92MBaAh9MLLFh0hzdh4Rin9He3aqeZiqSuWxm3 uh2bdDSeM4ydtkp1LXa/XE2nJmCE2Mz89O/whba+1lM1r//hmu5JST63zjT2a5+dWC9j sdNsSTTrPQtmK5+EyA4c7EgIWY6swgWfwwd8ImIKwqk6/It/VT3Jhp0MaLYqUKFabmQf ITyG0s9eemYSbiOBmpjuCoDZ+uGP6BFNA2Fc7xAp6H29jUKJZ0iQnhOT1DJfK3tHvJ0H AsZA== X-Forwarded-Encrypted: i=1; AFNElJ+4l2vaaTXn7crryBPbPFeKq8Io1GWkXD0jeMyBCzVgIbf2g+uEUIrC41IloWa7F8R7O25o5g7oE/JyCXk=@vger.kernel.org X-Gm-Message-State: AOJu0YxhGH5jOnO2A3q1XKYH/SNhjewTYTk5lobEnPFqxPyH+DNj/E/o swNWNCW0ox0MQPX/bCOLn4mOvjo0GxRK2L83onnGIU7g7iIVP0wzSyZVe269hyLA2b0= X-Gm-Gg: AeBDiesIYcDjPh3CRivDehDSgmquEZkrZxZb1h5wiZyIrxubWd+QXEzobLRGu25I1rS QrZSG0MsnmuM+UIshtmIgK89r7GQYZJV8u0MbLktjL74IE3SvwSmFq722HHPAmGP6Ok1D6ijs9p ZJTu6y/fYZuiiodlOeLsDu0m3HewMkeIqOep1BrGM9KAPuqqC1kniQ2fn0BExfd7uJ6FNQWs34G ZAkbmpwJNCAStwrxZ6j8vNDyw0Q9QVvkeshRQPsDlCS2pVWfxveOmyzn4GG1R1S11j53x+3SYgE aYubOtOOIrSuCBb+z8p9s7+LeP305gofS0Y8qpqy+ga8xtRIum+JBFQcndtxoCqjrzyIwrDXL+1 Eqsm8xfeChWG/DIcv2+oc9l8KIqfuGJGeNr6oaYt2lAwotRW94ECXsHc1vE3IbZZg11L84wFCBA mR9Yq+lQlpXM0mnunxzC3JL9KKiYDzEqnjsw2X X-Received: by 2002:a05:600c:a108:b0:488:a82f:bbb4 with SMTP id 5b1f17b1804b1-488fb78a0famr331074955e9.26.1776949320307; Thu, 23 Apr 2026 06:02:00 -0700 (PDT) Received: from pathway.suse.cz ([176.114.240.130]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48a575ad67asm163356365e9.2.2026.04.23.06.01.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Apr 2026 06:01:58 -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 v2 6/9] printk: Try to register each console as Braille first Date: Thu, 23 Apr 2026 15:00:11 +0200 Message-ID: <20260423130015.85175-7-pmladek@suse.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260423130015.85175-1-pmladek@suse.com> References: <20260423130015.85175-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 2543c810efcb..e34955189d16 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); @@ -2644,7 +2645,9 @@ static int 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; /* @@ -3975,8 +3978,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; @@ -3987,8 +3991,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 */ @@ -4001,7 +4016,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); @@ -4025,6 +4040,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) { @@ -4047,6 +4073,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.53.0