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 18/33] serial: 8250: extract serial8250_set_mini()
Date: Wed, 11 Jun 2025 12:03:04 +0200 [thread overview]
Message-ID: <20250611100319.186924-19-jirislaby@kernel.org> (raw)
In-Reply-To: <20250611100319.186924-1-jirislaby@kernel.org>
serial8250_do_set_termios() consists of many registers and up flags
settings. Extract all these into separate functions. This time, setting
of CSIZE for UART_CAP_MINI ports.
Signed-off-by: Jiri Slaby (SUSE) <jirislaby@kernel.org>
---
drivers/tty/serial/8250/8250_port.c | 24 +++++++++++++++++-------
1 file changed, 17 insertions(+), 7 deletions(-)
diff --git a/drivers/tty/serial/8250/8250_port.c b/drivers/tty/serial/8250/8250_port.c
index a73f4db22feb..edfbaa6b7a1b 100644
--- a/drivers/tty/serial/8250/8250_port.c
+++ b/drivers/tty/serial/8250/8250_port.c
@@ -2670,6 +2670,22 @@ void serial8250_update_uartclk(struct uart_port *port, unsigned int uartclk)
}
EXPORT_SYMBOL_GPL(serial8250_update_uartclk);
+static void serial8250_set_mini(struct uart_port *port, struct ktermios *termios)
+{
+ struct uart_8250_port *up = up_to_u8250p(port);
+
+ if (!(up->capabilities & UART_CAP_MINI))
+ return;
+
+ termios->c_cflag &= ~(CSTOPB | PARENB | PARODD | CMSPAR);
+
+ tcflag_t csize = termios->c_cflag & CSIZE;
+ if (csize == CS5 || csize == CS6) {
+ termios->c_cflag &= ~CSIZE;
+ termios->c_cflag |= CS7;
+ }
+}
+
void
serial8250_do_set_termios(struct uart_port *port, struct ktermios *termios,
const struct ktermios *old)
@@ -2679,14 +2695,8 @@ serial8250_do_set_termios(struct uart_port *port, struct ktermios *termios,
unsigned long flags;
unsigned int baud, quot, frac = 0;
- if (up->capabilities & UART_CAP_MINI) {
- termios->c_cflag &= ~(CSTOPB | PARENB | PARODD | CMSPAR);
- if ((termios->c_cflag & CSIZE) == CS5 ||
- (termios->c_cflag & CSIZE) == CS6)
- termios->c_cflag = (termios->c_cflag & ~CSIZE) | CS7;
- }
+ serial8250_set_mini(port, termios);
cval = serial8250_compute_lcr(up, termios->c_cflag);
-
baud = serial8250_get_baud_rate(port, termios, old);
quot = serial8250_get_divisor(port, baud, &frac);
--
2.49.0
next prev parent reply other threads:[~2025-06-11 10:03 UTC|newest]
Thread overview: 91+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-06-11 10:02 [PATCH 00/33] tty: summer cleanup Jiri Slaby (SUSE)
2025-06-11 10:02 ` [PATCH 01/33] tty: introduce and use tty_port_tty_vhangup() helper Jiri Slaby (SUSE)
2025-06-11 11:13 ` Ilpo Järvinen
2025-06-23 7:30 ` Jiri Slaby
2025-06-11 10:02 ` [PATCH 02/33] powerpc/legacy_serial: cache serial port and info in add_legacy_port() Jiri Slaby (SUSE)
2025-06-11 11:15 ` Ilpo Järvinen
2025-06-11 10:02 ` [PATCH 03/33] powerpc/legacy_serial: use %pa for phys_addr_t prints Jiri Slaby (SUSE)
2025-06-11 10:02 ` [PATCH 04/33] m68k: remove unneeded tty includes Jiri Slaby (SUSE)
2025-06-11 11:22 ` Ilpo Järvinen
2025-06-17 12:29 ` Geert Uytterhoeven
2025-06-11 10:02 ` [PATCH 05/33] powerpc/powermac: " Jiri Slaby (SUSE)
2025-06-11 11:25 ` Ilpo Järvinen
2025-06-11 10:02 ` [PATCH 06/33] tty: vt: use sane types for userspace API Jiri Slaby (SUSE)
2025-06-11 14:38 ` Nicolas Pitre
2025-06-11 10:02 ` [PATCH 07/33] tty: vt: use _IO() to define ioctl numbers Jiri Slaby (SUSE)
2025-06-11 11:30 ` Ilpo Järvinen
2025-06-11 14:42 ` Nicolas Pitre
2025-07-31 14:35 ` Christophe Leroy
2025-07-31 14:41 ` Christophe Leroy
2025-07-31 20:58 ` Nicolas Pitre
2025-08-01 4:47 ` Jiri Slaby
2025-08-01 7:38 ` Greg KH
2025-06-11 10:02 ` [PATCH 08/33] serial: 8250: sanitize uart_port::serial_{in,out}() types Jiri Slaby (SUSE)
2025-06-11 15:12 ` Andy Shevchenko
2025-06-23 6:55 ` Jiri Slaby
2025-06-11 10:02 ` [PATCH 09/33] serial: 8250: remove CONFIG_SERIAL_8250_RSA inline macros from code Jiri Slaby (SUSE)
2025-06-11 11:42 ` Ilpo Järvinen
2025-06-11 11:46 ` Ilpo Järvinen
2025-06-11 10:02 ` [PATCH 10/33] serial: 8250: invert conditions in RSA functions Jiri Slaby (SUSE)
2025-06-11 11:45 ` Ilpo Järvinen
2025-06-11 10:02 ` [PATCH 11/33] serial: 8250: put RSA functions to their namespace Jiri Slaby (SUSE)
2025-06-11 11:54 ` Ilpo Järvinen
2025-06-11 10:02 ` [PATCH 12/33] serial: 8250: move RSA functions to 8250_rsa.c Jiri Slaby (SUSE)
2025-06-11 11:49 ` Ilpo Järvinen
2025-06-11 10:02 ` [PATCH 13/33] serial: 8250: extract serial8250_startup_special() Jiri Slaby (SUSE)
2025-06-11 11:53 ` Ilpo Järvinen
2025-06-11 10:03 ` [PATCH 14/33] serial: 8250: extract serial8250_set_TRG_levels() Jiri Slaby (SUSE)
2025-06-11 12:07 ` Ilpo Järvinen
2025-06-11 10:03 ` [PATCH 15/33] serial: 8250: extract serial8250_THRE_test() Jiri Slaby (SUSE)
2025-06-11 12:03 ` Ilpo Järvinen
2025-06-12 8:54 ` Jiri Slaby
2025-06-12 9:18 ` Ilpo Järvinen
2025-06-11 10:03 ` [PATCH 16/33] serial: 8250: extract serial8250_initialize() Jiri Slaby (SUSE)
2025-06-11 12:19 ` Ilpo Järvinen
2025-06-23 6:59 ` Jiri Slaby
2025-06-11 10:03 ` [PATCH 17/33] serial: 8250: extract serial8250_clear_interrupts() Jiri Slaby (SUSE)
2025-06-11 12:27 ` Ilpo Järvinen
2025-06-11 10:03 ` Jiri Slaby (SUSE) [this message]
2025-06-11 12:29 ` [PATCH 18/33] serial: 8250: extract serial8250_set_mini() Ilpo Järvinen
2025-06-11 10:03 ` [PATCH 19/33] serial: 8250: extract serial8250_set_trigger_for_slow_speed() Jiri Slaby (SUSE)
2025-06-11 12:34 ` Ilpo Järvinen
2025-06-11 10:03 ` [PATCH 20/33] serial: 8250: extract serial8250_set_afe() Jiri Slaby (SUSE)
2025-06-11 12:35 ` Ilpo Järvinen
2025-06-11 10:03 ` [PATCH 21/33] serial: 8250: extract serial8250_set_errors_and_ignores Jiri Slaby (SUSE)
2025-06-11 12:43 ` Ilpo Järvinen
2025-06-11 10:03 ` [PATCH 22/33] serial: 8250: extract serial8250_set_ier() Jiri Slaby (SUSE)
2025-06-11 12:47 ` Ilpo Järvinen
2025-06-11 10:03 ` [PATCH 23/33] serial: 8250: extract serial8250_set_efr() Jiri Slaby (SUSE)
2025-06-11 12:58 ` Ilpo Järvinen
2025-06-12 10:01 ` Jiri Slaby
2025-06-12 10:04 ` Jiri Slaby
2025-06-12 13:33 ` Andy Shevchenko
2025-06-12 18:54 ` Andy Shevchenko
2025-06-23 7:20 ` Jiri Slaby
2025-06-11 10:03 ` [PATCH 24/33] serial: 8250: extract serial8250_set_fcr() Jiri Slaby (SUSE)
2025-06-11 13:01 ` Ilpo Järvinen
2025-06-11 10:03 ` [PATCH 25/33] serial: 8250: lcr compute cleanup Jiri Slaby (SUSE)
2025-06-11 13:03 ` Ilpo Järvinen
2025-06-11 10:03 ` [PATCH 26/33] serial: 8250: drop unused frac from serial8250_do_get_divisor() Jiri Slaby (SUSE)
2025-06-11 13:04 ` Ilpo Järvinen
2025-06-11 10:03 ` [PATCH 27/33] serial: 8250: extract serial_get_or_create_irq_info() Jiri Slaby (SUSE)
2025-06-11 13:09 ` Ilpo Järvinen
2025-06-11 10:03 ` [PATCH 28/33] serial: 8250: remove debug prints from ISR Jiri Slaby (SUSE)
2025-06-11 13:09 ` Ilpo Järvinen
2025-06-11 10:03 ` [PATCH 29/33] serial: 8250: drop DEBUG_AUTOCONF() macro Jiri Slaby (SUSE)
2025-06-11 13:10 ` Ilpo Järvinen
2025-06-17 11:32 ` Maciej W. Rozycki
2025-06-17 11:42 ` Greg Kroah-Hartman
2025-06-17 13:21 ` Maciej W. Rozycki
2025-06-11 10:03 ` [PATCH 30/33] serial: 8250: invert serial8250_register_8250_port() CIR condition Jiri Slaby (SUSE)
2025-06-11 13:21 ` Ilpo Järvinen
2025-06-18 5:48 ` Andy Shevchenko
2025-06-20 21:48 ` Maciej S. Szmigiero
2025-06-21 19:08 ` Andy Shevchenko
2025-06-23 7:05 ` Jiri Slaby
2025-06-23 7:17 ` Andy Shevchenko
2025-06-11 10:03 ` [PATCH 31/33] serial: 8250: invert condition to avoid a goto label Jiri Slaby (SUSE)
2025-06-18 5:45 ` Andy Shevchenko
2025-06-11 10:03 ` [PATCH 32/33] serial: 8250: use hashtable Jiri Slaby (SUSE)
2025-06-11 13:25 ` Ilpo Järvinen
2025-06-11 10:03 ` [PATCH 33/33] serial: 8250_omap: use uart_port pointer when available Jiri Slaby (SUSE)
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250611100319.186924-19-jirislaby@kernel.org \
--to=jirislaby@kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-serial@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox