From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) (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 2959C31D371 for ; Thu, 23 Apr 2026 13:02:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.48 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776949358; cv=none; b=UN6jfJHCMwOULXVkxLcQPKcv0apXDceDJCHcLFYg5BgVwSaOhb2lyrvw23fm5H89bL46QZVqSvUPR2yezE4OiEn1T+WgeT93CIbtMzVwNz6EXaXaK56WIjw+kciXh8Q+2yb3K6fkivj7xqHpVXCvG8zFKk/yMiLdLi4tfBo8sb8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776949358; c=relaxed/simple; bh=/drvUAizRl/Dl9+3bX9DGCBpeNYp5eNhrImtniHgd1s=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=m4thOgu/p2ERnycqVarZYInHX9wzBLsixaD9QTlAbpTEDX8A5cguWMTMptxCgJ2V8VHi0cP4w7RVcrVKKCCGccamMEQ4eGS+ProETtseRy94njWunVKIFwkAL1yP7C4M2QmMYedpZlrl6PCZfAsDlD6NX1XV8P4SXcjEXC9HZpE= 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=DLcEUNbx; arc=none smtp.client-ip=209.85.128.48 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="DLcEUNbx" Received: by mail-wm1-f48.google.com with SMTP id 5b1f17b1804b1-488b3f8fa2bso67476925e9.1 for ; Thu, 23 Apr 2026 06:02:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1776949355; x=1777554155; 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=0sEt6Z5ht7ZI5bmj5Y6lMPZxl22n/lWDugMJLpnDkd8=; b=DLcEUNbxONADEdAt81zFMQpiaqKCD5cPVAiEJOmymhcefcGj0y9q5tKKzdpHfQR/H1 l8K0knQ++2FlC2d3TqhXeTrnuu34cPVs76c0c8kTKOkmRmOpGsyTi9DRRQOOnx6/cAk+ Q/4zf8qSaYL466FjRKMkh4mNca2RnjgL7Q1am0VZP2XX5He6khgfoX86VFwo+2j+H59l ryxtc+HmPKiYeoP9BN90sGhTaTUDubEaamqZOLe3uFLIPD3LO56cAkNc93AdkN0zzwD+ BXDCXqPNRUh8GpWRpIUqev0GCJKwIA1T4ES+eVn+dSaEzql3c5/nH+sZRmy7pkOvwE10 Od4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776949355; x=1777554155; 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=0sEt6Z5ht7ZI5bmj5Y6lMPZxl22n/lWDugMJLpnDkd8=; b=OLrljR3VyXKa5MLhrKXNlLBW4vkTTq5yVKp8zYB9+Wy+8VkUMC9vUBE66aGG4BOAro OcYo8a/GpCN/OjMFzk05+Lsr5qM+l8SNsDXGmD5m5fzZ5g/EI/fponMBe4+mtgNlG648 XLG+cYKjwxJUz/8iUde2WCDDcC3TKUMBuf+CF+Xe34RQC4A3pngyssJHdP+g5BpWxxaq /CmwJZnLv0DQrD6kSY0J3P4g+j0JLEuSZzLF8kR48kjqtY20oG3HxrT7gYmoHA/zHyAL ymIJMZBwXU6qWifw4yK1xpmZUQud/VTNHUvB2uys4u7T1d7N5O6Ko9IgeySBfD5qf6pK IwxQ== X-Forwarded-Encrypted: i=1; AFNElJ9flKHt6Ban7yaSHAVYrHgHtEVXMEtiAKT2qhh82P23sf2nuA7mOUMEG0kfcPx387PXG/O9MZosEqC2eKk=@vger.kernel.org X-Gm-Message-State: AOJu0Yy5UmYASWfFCaLe3d5ZI9TfwA8myWLpDNU5PVewSR08ReVNEpEW kfrSgcZegKCEGzaXLoE1eeDlI09CjrAuB6LdjmXjEPZnZkha3pvFypjPqE5NXetY/FE= X-Gm-Gg: AeBDieuL2yVLmsLrzVlk8qVIMHKFHTkxtB09fbvEaxzVnuYisy8nZpiiJ0pKBQGAqcs lUQBy/v3KfFvFvhXadu4S0LUd6dJc0EaUYGTwjH4l95Xoo2CHJWYSUar1nczSMsrm8TCzHbxLWe cweXYfN6lJX9dYANJ3AvHecnqahA3ZTi4nL/WyetluzEJE+Kd1hohq1VsSSXlM3oL8IgwrjxdC6 8HreqU6WClIz+OibrguDmvf0XuuBUcpM2zrnhkG1jOoHu7g+7EW6FUffjlE5f/vUoR6wi6SsSD2 hCqeuGGdBi8eqX9JeFOZ6AytqF1wbl9SKSkQp1inxQRBO+HMH4m3v7SSQBjMS8sYXJ2exwvm6Uv cDWa6uPoeR8FP4BsLK75mk3PKfENTv6Lyn7dsuzzX/QwZSJA6QsE/A3KYZ1tPk+VsBqolM+I7EJ QcA/7T4KVfF4s8pwLk/7A5kOVE1DTeEIJmY6Z7qwDZt4lnrCo= X-Received: by 2002:a05:600c:b96:b0:48a:5339:a46 with SMTP id 5b1f17b1804b1-48a53390f6cmr184055395e9.9.1776949355253; Thu, 23 Apr 2026 06:02:35 -0700 (PDT) Received: from pathway.suse.cz ([176.114.240.130]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-488fb75ab25sm161120155e9.11.2026.04.23.06.02.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Apr 2026 06:02:34 -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 9/9] printk: Try enable preferred consoles only when there are any Date: Thu, 23 Apr 2026 15:00:14 +0200 Message-ID: <20260423130015.85175-10-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-Transfer-Encoding: 8bit try_enable_preferred_console() used to be always called because it had several hidden effects, namely: - enabled Braille consoles which were ignored by "preferred_dev_console" because they were not associated with /dev/console. - returned success when a console was pre-enabled using CON_ENABLED flag. - returned success when a console was enabled by default because try_enable_default_console() did not return success. The first two hidden effects were removed in previous patches. Remove the last one so that try_enable_preferred_console() can be called only when any non-Braille console is preferred. Signed-off-by: Petr Mladek --- 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 91c3be6843bc..4098ed3b735f 100644 --- a/kernel/printk/printk.c +++ b/kernel/printk/printk.c @@ -4055,18 +4055,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() \ @@ -4109,7 +4114,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.53.0