Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795061526; b=s/cgz/KclhFQv7TrbFMD4Fe+yHmjp0tHeRAHHTSME7gVCOFdrzeXxKVCf3QUUKZrQzZn x5AppmUKRHezOt7+LK5i7ur9NkEa9mX0NPHOOnvjd0XQBWQSRRJvr6t4QMk3c9ygn3ntK VkcSh1SwmXqEdD65gzAOWm8NRox2DnHS82LO6yUGK0UsfZuXd7fCKf4VKiu+rL5P3CRq1 3men0+Lxeh8SGjVubLVPMAYWjZC6ivKTCuzr40csxU9TktdKCq9ahafCLyE5JfC6+zkqK Q6S4EveZgki08v/sjTQtI6SQZFaPVRBQwOW3toZM0K0OC1ASiKcB9lkZVxKuQJHllnQ== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795061526; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=zD7WCyXzfS6nEFOkVZQVxZI12yv2m4D3PR9Act09pZA=; b=G5OZWYdORw9xhAXguvzUT42lAxmZlETxJ3eJkvF2D7AyEBziqyR+92BWyCwGh2vKyguB 7QV37TNyKDbkv8tjVNZm/tWC9VZg6Aztlgn5Hawmy0hmqmTKudIv+vlzK/UtiqG/AnX+O 2mZrNat8xkctJXrse1CMGGgUx79/Yz6Qc+zoyu2IfFE0/Wh0zMo4i8IYPEmvCHuzajypY I9aw/+kSWKgCqIrqiCXoAby5QrbdiGavs0y5bezvI/pu2TtAb8rC8495n8rxMKZ4ANGS7 v8/eHX5fulGxcuKxPxvKJMPyzK5cPkyqImO1qahyxQr+sgzONEJ792vOLLVHelEe9vg== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=hHSMV+ji; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6C50C60A2603; Thu, 19 Nov 2026 04:12:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=hHSMV+ji Received: by smtp.kernel.org (Postfix) with ESMTPSA id BEA0F1F000C4; Thu, 19 Nov 2026 04:12:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795061526; bh=zD7WCyXzfS6nEFOkVZQVxZI12yv2m4D3PR9Act09pZA=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=hHSMV+jiXqbg2S7ScaTvLi6hID1v0Yn64BKawm1LHMFL+vZ1xlY9Pi4woiq8KuSE5 7NT90Wrrg3rr5hpF4OHkItx1ae38Tup5YGAqcb0kbfwVX3xKiz3jnESHsihWTzSSSY d3Y9to/eDIS2WJHVN+ogJVS2d4B8lhIDbdveERys= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Tapio Reijonen , Sasha Levin Subject: [PATCH 5.10 1583/1848] serial: max310x: dont clobber the TX break bit in set_termios Date: Wed, 18 Nov 2026 16:00:21 +0100 Message-ID: <20261118150025.829673725@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118145911.150052362@linuxfoundation.org> References: <20261118145911.150052362@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: patches@lists.linux.dev List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: Tapio Reijonen [ Upstream commit 3b2de448ec0332c1cb8c38b4c5ff0c8e860befbc ] A TX break asserted with TIOCSBRK ends early, with no error reported, as soon as any termios change lands on the port: a break is a state that must hold until TIOCCBRK, but max310x_set_termios() overwrites the whole LCR register, and LCR also carries the TX break bit that break_ctl() drives. No concurrency is required - a baud or parity change from the same process ends the break just as well, and break-led protocols lose their break with nothing in the logs. Update only the LCR bits that are derived from termios and leave the TX break and RTS pin control bits untouched. Since nothing clears a break when a port is closed with the break still asserted - the tty core sends no break-off on release, and the unconditional write here was the accidental recovery - clear TXBREAK in startup(), the same way 8250 does. Fixes: f65444187a66 ("serial: New serial driver MAX310X") Assisted-by: Claude:claude-fable-5 Signed-off-by: Tapio Reijonen Link: https://patch.msgid.link/20261008-max310x-rs485-sw-delay-v8-1-6ba881f81e1f@vaisala.com Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/tty/serial/max310x.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/drivers/tty/serial/max310x.c b/drivers/tty/serial/max310x.c index 9cbfaa0c0b051..8a706ab80706d 100644 --- a/drivers/tty/serial/max310x.c +++ b/drivers/tty/serial/max310x.c @@ -154,6 +154,8 @@ #define MAX310X_LCR_FORCEPARITY_BIT (1 << 5) /* 9-bit multidrop parity */ #define MAX310X_LCR_TXBREAK_BIT (1 << 6) /* TX break enable */ #define MAX310X_LCR_RTS_BIT (1 << 7) /* RTS pin control */ +/* LCR bits owned by termios; TX break and RTS are driven elsewhere */ +#define MAX310X_LCR_TERMIOS_MASK GENMASK(5, 0) /* IRDA register bits */ #define MAX310X_IRDA_IRDAEN_BIT (1 << 0) /* IRDA mode enable */ @@ -962,8 +964,12 @@ static void max310x_set_termios(struct uart_port *port, if (termios->c_cflag & CSTOPB) lcr |= MAX310X_LCR_STOPLEN_BIT; /* 2 stops */ - /* Update LCR register */ - max310x_port_write(port, MAX310X_LCR_REG, lcr); + /* + * Update LCR register. Leave the TX break bit alone: it is driven by + * break_ctl(), and a whole-register write here would end a break in + * progress. + */ + max310x_port_update(port, MAX310X_LCR_REG, MAX310X_LCR_TERMIOS_MASK, lcr); /* Set read status mask */ port->read_status_mask = MAX310X_LSR_RXOVR_BIT; @@ -1083,6 +1089,13 @@ static int max310x_startup(struct uart_port *port) s->devtype->power(port, 1); + /* + * Clear a latched break: nothing clears TXBREAK when a port is + * closed with a break still asserted, and set_termios() no longer + * rewrites it. + */ + max310x_port_update(port, MAX310X_LCR_REG, MAX310X_LCR_TXBREAK_BIT, 0); + /* Configure MODE1 register */ max310x_port_update(port, MAX310X_MODE1_REG, MAX310X_MODE1_TRNSCVCTRL_BIT, 0); -- 2.53.0