printk: Track nbcon consoles
BugLink: https://bugs.launchpad.net/bugs/2060704 Add a global flag @have_nbcon_console to identify if any nbcon consoles are registered. This will be used in follow-up commits to preserve legacy behavior when no nbcon consoles are registered. Signed-off-by: John Ogness <john.ogness@linutronix.de> Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Signed-off-by: Kevin Becker <kevin.becker@canonical.com>
This commit is contained in:
committed by
Kevin Becker
parent
f402f978e9
commit
39d010a426
+13
-1
@@ -470,6 +470,11 @@ static DEFINE_MUTEX(syslog_lock);
|
||||
*/
|
||||
static bool have_legacy_console;
|
||||
|
||||
/*
|
||||
* Specifies if an nbcon console is registered.
|
||||
*/
|
||||
static bool have_nbcon_console;
|
||||
|
||||
/*
|
||||
* Specifies if a boot console is registered. If boot consoles are present,
|
||||
* nbcon consoles cannot print simultaneously and must be synchronized by
|
||||
@@ -3559,6 +3564,7 @@ void register_console(struct console *newcon)
|
||||
console_init_seq(newcon, bootcon_registered);
|
||||
|
||||
if (newcon->flags & CON_NBCON) {
|
||||
have_nbcon_console = true;
|
||||
nbcon_init(newcon);
|
||||
|
||||
/*
|
||||
@@ -3645,6 +3651,7 @@ EXPORT_SYMBOL(register_console);
|
||||
static int unregister_console_locked(struct console *console)
|
||||
{
|
||||
bool found_legacy_con = false;
|
||||
bool found_nbcon_con = false;
|
||||
bool found_boot_con = false;
|
||||
struct console *c;
|
||||
int res;
|
||||
@@ -3701,13 +3708,18 @@ static int unregister_console_locked(struct console *console)
|
||||
for_each_console(c) {
|
||||
if (c->flags & CON_BOOT)
|
||||
found_boot_con = true;
|
||||
if (!(c->flags & CON_NBCON))
|
||||
|
||||
if (c->flags & CON_NBCON)
|
||||
found_nbcon_con = true;
|
||||
else
|
||||
found_legacy_con = true;
|
||||
}
|
||||
if (!found_boot_con)
|
||||
have_boot_console = found_boot_con;
|
||||
if (!found_legacy_con)
|
||||
have_legacy_console = found_legacy_con;
|
||||
if (!found_nbcon_con)
|
||||
have_nbcon_console = found_nbcon_con;
|
||||
|
||||
return res;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user