[22/33] serial: 8250: extract serial8250_set_ier()

Message ID	20250611100319.186924-23-jirislaby@kernel.org
State	New
Headers	show Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2259926FDB6; Wed, 11 Jun 2025 10:04:04 +0000 (UTC) From: "Jiri Slaby (SUSE)" <jirislaby@kernel.org> To: gregkh@linuxfoundation.org Cc: linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org, "Jiri Slaby (SUSE)" <jirislaby@kernel.org> Subject: [PATCH 22/33] serial: 8250: extract serial8250_set_ier() Date: Wed, 11 Jun 2025 12:03:08 +0200 Message-ID: <20250611100319.186924-23-jirislaby@kernel.org> In-Reply-To: <20250611100319.186924-1-jirislaby@kernel.org> References: <20250611100319.186924-1-jirislaby@kernel.org> Precedence: bulk MIME-Version: 1.0 Content-Transfer-Encoding: 8bit
Series	tty: summer cleanup \| expand [00/33] tty: summer cleanup [02/33] powerpc/legacy_serial: cache serial port and info in add_legacy_port() [04/33] m68k: remove unneeded tty includes [06/33] tty: vt: use sane types for userspace API [08/33] serial: 8250: sanitize uart_port::serial_{in,out}() types [10/33] serial: 8250: invert conditions in RSA functions [12/33] serial: 8250: move RSA functions to 8250_rsa.c [14/33] serial: 8250: extract serial8250_set_TRG_levels() [16/33] serial: 8250: extract serial8250_initialize() [18/33] serial: 8250: extract serial8250_set_mini() [20/33] serial: 8250: extract serial8250_set_afe() [22/33] serial: 8250: extract serial8250_set_ier() [24/33] serial: 8250: extract serial8250_set_fcr() [26/33] serial: 8250: drop unused frac from serial8250_do_get_divisor() [28/33] serial: 8250: remove debug prints from ISR [30/33] serial: 8250: invert serial8250_register_8250_port() CIR condition [32/33] serial: 8250: use hashtable

Message ID

20250611100319.186924-23-jirislaby@kernel.org

State

New

Headers

From: "Jiri Slaby (SUSE)" <jirislaby@kernel.org>
To: gregkh@linuxfoundation.org
Cc: linux-serial@vger.kernel.org,
	linux-kernel@vger.kernel.org,
	"Jiri Slaby (SUSE)" <jirislaby@kernel.org>
Subject: [PATCH 22/33] serial: 8250: extract serial8250_set_ier()
Date: Wed, 11 Jun 2025 12:03:08 +0200
Message-ID: <20250611100319.186924-23-jirislaby@kernel.org>
In-Reply-To: <20250611100319.186924-1-jirislaby@kernel.org>
References: <20250611100319.186924-1-jirislaby@kernel.org>
Precedence: bulk
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit

Series

tty: summer cleanup | expand

Commit Message

Jiri Slaby (SUSE) June 11, 2025, 10:03 a.m. UTC

serial8250_do_set_termios() consists of many registers and up flags
settings. Extract all these into separate functions. This time, setting
of IER.

Signed-off-by: Jiri Slaby (SUSE) <jirislaby@kernel.org>
---
 drivers/tty/serial/8250/8250_port.c | 31 ++++++++++++++++-------------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/drivers/tty/serial/8250/8250_port.c b/drivers/tty/serial/8250/8250_port.c
index 6bb7f004d607..2c045a4369fc 100644
--- a/drivers/tty/serial/8250/8250_port.c
+++ b/drivers/tty/serial/8250/8250_port.c
@@ -2752,6 +2752,22 @@  static void serial8250_set_errors_and_ignores(struct uart_port *port, struct kte
 		port->ignore_status_mask |= UART_LSR_DR;
 }
 
+static void serial8250_set_ier(struct uart_port *port, struct ktermios *termios)
+{
+	struct uart_8250_port *up = up_to_u8250p(port);
+
+	/* CTS flow control flag and modem status interrupts */
+	up->ier &= ~UART_IER_MSI;
+	if (!(up->bugs & UART_BUG_NOMSR) && UART_ENABLE_MS(&up->port, termios->c_cflag))
+		up->ier |= UART_IER_MSI;
+	if (up->capabilities & UART_CAP_UUE)
+		up->ier |= UART_IER_UUE;
+	if (up->capabilities & UART_CAP_RTOIE)
+		up->ier |= UART_IER_RTOIE;
+
+	serial_port_out(port, UART_IER, up->ier);
+}
+
 void
 serial8250_do_set_termios(struct uart_port *port, struct ktermios *termios,
 		          const struct ktermios *old)
@@ -2780,20 +2796,7 @@  serial8250_do_set_termios(struct uart_port *port, struct ktermios *termios,
 	serial8250_set_afe(port, termios);
 	uart_update_timeout(port, termios->c_cflag, baud);
 	serial8250_set_errors_and_ignores(port, termios);
-
-	/*
-	 * CTS flow control flag and modem status interrupts
-	 */
-	up->ier &= ~UART_IER_MSI;
-	if (!(up->bugs & UART_BUG_NOMSR) &&
-			UART_ENABLE_MS(&up->port, termios->c_cflag))
-		up->ier |= UART_IER_MSI;
-	if (up->capabilities & UART_CAP_UUE)
-		up->ier |= UART_IER_UUE;
-	if (up->capabilities & UART_CAP_RTOIE)
-		up->ier |= UART_IER_RTOIE;
-
-	serial_port_out(port, UART_IER, up->ier);
+	serial8250_set_ier(port, termios);
 
 	if (up->capabilities & UART_CAP_EFR) {
 		unsigned char efr = 0;

[22/33] serial: 8250: extract serial8250_set_ier()

Commit Message

Patch