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=1795056102; b=MKqB/rFE8mWS21GXmkvOBhom7EdRvg0A97+B4p6xNWe8fsJuR/xT0dTxQF3C5nw0Dfyn eR7AFB1Ztlpor668JChGR1M0g8noKeV5/1HDdcIhXKWrwZJ2zpwTsU7+0BmJov71ziMla rkF88YmypVq+QRge1XmRinYdJA7CQD/xJBxicli9RXAJr4AqKBFOQPCtQp5TPjeDA3y+F f/lGItEc5VAZlFfmVoVBZtuM63Ssgzg17gZFjevr589aQ0QQspPFqAO38vhT0lgNU3vs6 yFGsgShjmyS6gbbJ2aA/d0Et0rkClxTT+BvaRUxNyrP/GL4wAAxmonCe8dIWq/t7pSA== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795056102; 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=Uc+P1MM9y3t0dlqLYZIFW1UVl4y/L1usRzqh/uFjaLY=; b=P2nuHnEKCjQWadzPWyY6q3uM8tQ5Z8c3OU8OhcEQye84nPnSUa1EGruk7ndjhelp4KWt tX0N38KHhFAlgz4X6eIVr4JUR+MN/QH5JJOaZI8u60F/ccopvxm8xDvINSeqQcFh0d2lv DIxfEPsjRLbAG7vMdbapwKYWJxG8wHwEBKb5+CIsTVcf0e1FXvHkKmMwI+QBGvkLiWlyZ NW1oCRsJYh5VA+KKoahQu3Izp3CkXk8JbjNGHVyY11jx9PvydVvKz39Fjh0U5+xkxoKSe eD8icxFo05phZBFgpmHPvh+xS/RTkO2n5ELh/nnM5Rw+slzPZ+D4D7zJRx8+B3dsm1g== 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=C9SZ1pfQ; 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 5A9CE606A320; Thu, 19 Nov 2026 02:41:42 +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=C9SZ1pfQ Received: by smtp.kernel.org (Postfix) with ESMTPSA id A9AAC1F000C4; Thu, 19 Nov 2026 02:41:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795056102; bh=Uc+P1MM9y3t0dlqLYZIFW1UVl4y/L1usRzqh/uFjaLY=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=C9SZ1pfQ7anTy5FnKUicBeC66p5j6OQmRTkz8NtVpHd68uhlp6OqnR6DEU+lAxX7o Y2//xsixsTAVriYfXDuoiKqs49VOJIujqhtApcqnnVsB0AjuFeMPhq1DaZlguiAcYQ 4PTOIDbSc81DTh5Vz3SySXwFTH40Rd0gAVp0O1Gc= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Tapio Reijonen , Sasha Levin Subject: [PATCH 5.15 1869/2214] serial: max310x: dont clobber the TX break bit in set_termios Date: Wed, 18 Nov 2026 15:59:05 +0100 Message-ID: <20261118150126.064346130@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118150009.797899913@linuxfoundation.org> References: <20261118150009.797899913@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.15-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 8e7aa24da2327..387ab54e5af6b 100644 --- a/drivers/tty/serial/max310x.c +++ b/drivers/tty/serial/max310x.c @@ -152,6 +152,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 */ @@ -940,8 +942,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; @@ -1061,6 +1067,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