From: Fabian Vogt <fvogt@suse.de>
Date: Fri, 15 Aug 2025 11:33:28 +0000 (+0200)
Subject: tty: hvc_console: Call hvc_kick in hvc_write unconditionally
X-Git-Tag: v6.17-rc6~3^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cfd956dcb101aa3d25bac321fae923323a47c607;p=thirdparty%2Fkernel%2Fstable.git

tty: hvc_console: Call hvc_kick in hvc_write unconditionally

After hvc_write completes, call hvc_kick also in the case the output
buffer has been drained, to ensure tty_wakeup gets called.

This fixes that functions which wait for a drained buffer got stuck
occasionally.

Cc: stable <stable@kernel.org>
Closes: https://bugzilla.opensuse.org/show_bug.cgi?id=1230062
Signed-off-by: Fabian Vogt <fvogt@suse.de>
Link: https://lore.kernel.org/r/2011735.PYKUYFuaPT@fvogt-thinkpad
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/tty/hvc/hvc_console.c b/drivers/tty/hvc/hvc_console.c
index cd1f657f782df..13c663a154c4e 100644
--- a/drivers/tty/hvc/hvc_console.c
+++ b/drivers/tty/hvc/hvc_console.c
@@ -543,10 +543,10 @@ static ssize_t hvc_write(struct tty_struct *tty, const u8 *buf, size_t count)
 	}
 
 	/*
-	 * Racy, but harmless, kick thread if there is still pending data.
+	 * Kick thread to flush if there's still pending data
+	 * or to wakeup the write queue.
 	 */
-	if (hp->n_outbuf)
-		hvc_kick();
+	hvc_kick();
 
 	return written;
 }