From mboxrd@z Thu Jan 1 00:00:00 1970 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=1793212891; b=OEUuQwau8bKJmIvulT9pstnWnfL+jjdbUQtIMujNwrqSwEs6/focWiE0I2NxMzG/diGb zqqCAD6uD6ooUfLeMEo/HaGgT11/ZdzIBwyNFkUFRxfrgdUFFfXT/yk/kUrAj7WQLVRX5 a0Ku49A3dpUZybKoZM74uHI750AmYWFfhQu/NJWezZl5TmEMM9zLt1IzMlxGOpcnUQSRW s3mmjk8miOlGfshPtcI5GuErQghPUKz8gYU6y6Ju0m9bnzYczxr9z/HglIdACVxc8d2ih m2DDdCxctfTTL7hZGspKOeBbYc1MhREjdZLIfSqIuoDo+lV3IkO/uQiykDK8Eo6LAng== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1793212891; 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=O0r36f3bx1jby2vMAefy61qlOyv3HBnJ0YOLqYDQWMk=; b=LrPA7Hut1rlEFbqerX/3/IZK0y/eJwmXCFPJF0kUf/LJpq5PSjT7Xe3iX5HKABngqRfk 5x6iKHeGRa2AkGjbaRJdPUXPFQ3CXjtBYwX6fuio1hneQt34mByqej9i2QO05nqu+Hlne 5MGYa+eFBb+H7birJYi/7Obc8XWLG03+3zXDQQI7tYend8uHpJ90Y4yYNRrGp1WLcG6pV q/HZRPMDgW6M363QJFw23rBo/+VL3F1TjePUn6U94v7Wn0YrBn5LySY3QV4OcfHnQv9qT AL75mkq3js1yEFAjp9XYt6VuI4WMspBo2uZu/7lNF21SO2l1USqilMh+hJjg+NdFPyQ== 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=EzwFcMgl; 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 2E9CD606A31A; Wed, 28 Oct 2026 18:41:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key, unprotected) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=EzwFcMgl Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7AE351F031E0; Wed, 28 Oct 2026 18:41:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1793212891; bh=O0r36f3bx1jby2vMAefy61qlOyv3HBnJ0YOLqYDQWMk=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=EzwFcMglmtkC+ebABkPGqShghYywAZLrFaUHXBNuPhTbLuc5zTVQmTfHF/GzoRcq6 oqyjjqJckIXCUtDujTt+sW69oH9BuPfhfEYe79VhXKL9M4Odx+GnrAKgx98MsApjDC x928Zkz9XA5PaI1eqbROZc8CdMbTPhsIUMYYA9Vg= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, stable@kernel.org, Simon Gassner Subject: [PATCH 6.1 0296/1887] serial: tegra: dont clear the Tx FIFO on an Rx-only reset Date: Wed, 28 Oct 2026 17:39:52 +0100 Message-ID: <20261028170505.965389386@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261028170459.200466217@linuxfoundation.org> References: <20261028170459.200466217@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 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Simon Gassner commit 8aebfde6e84dceb7d47fe8001e50b754eb45d5df upstream. tegra_uart_fifo_reset() applies the Tegra30 workaround for "cannot clear the Tx FIFO while FIFO mode is enabled" unconditionally: it leaves FIFO mode, writes the requested FCR clear bits, and re-enters FIFO mode. Leaving FIFO mode empties both FIFOs, so an Rx-only reset discards queued Tx data as well. The break handler in tegra_uart_decode_rx_error() calls it with UART_FCR_CLEAR_RCVR only. On a half-duplex RS485 board whose Rx line is pulled low while the transceiver drives the bus, every transmission raises a spurious break, and all but the first character of the frame is lost. Only take the FIFO-mode path when the caller actually asked for CLEAR_XMIT. Likewise only wait for TEMT in that case: with the Tx FIFO deliberately left intact, that loop would otherwise spin for a full frame time in hard IRQ context with the port lock held. Tested on a Colibri T30 (Tegra30) with Rx DMA: - Break during transmission: the reset still fires from tegra_uart_decode_rx_error(), and the complete frame now reaches the peer. Before this change only the character in the shift register was sent. - Internal loopback with a generated break: the Rx FIFO is correctly cleared by the plain FCR write, and subsequent receive works with no frame, parity or overrun errors. Fixes: e9ea096dd225 ("serial: tegra: add serial driver") Cc: stable@kernel.org Signed-off-by: Simon Gassner Link: https://patch.msgid.link/20261001060539.32659-1-simon.gassner@noxsystems.com Signed-off-by: Greg Kroah-Hartman --- drivers/tty/serial/serial-tegra.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) --- a/drivers/tty/serial/serial-tegra.c +++ b/drivers/tty/serial/serial-tegra.c @@ -307,11 +307,19 @@ static void tegra_uart_fifo_reset(struct { unsigned long fcr = tup->fcr_shadow; unsigned int lsr, tmout = 10000; + bool clear_tx = !!(fcr_bits & UART_FCR_CLEAR_XMIT); if (tup->rts_active) set_rts(tup, false); - if (tup->cdata->allow_txfifo_reset_fifo_mode) { + /* + * Leaving FIFO mode below is a workaround for a Tegra30 + * restriction on clearing the Tx FIFO while FIFO mode is + * enabled. It empties both FIFOs, so applying it to an + * Rx-only reset would destroy an in-flight transmission. + * Only take that path when the caller asked for CLEAR_XMIT. + */ + if (tup->cdata->allow_txfifo_reset_fifo_mode || !clear_tx) { fcr |= fcr_bits & (UART_FCR_CLEAR_RCVR | UART_FCR_CLEAR_XMIT); tegra_uart_write(tup, fcr, UART_FCR); } else { @@ -336,9 +344,15 @@ static void tegra_uart_fifo_reset(struct */ tegra_uart_wait_cycle_time(tup, 32); + /* + * Only wait for the transmitter to drain when the Tx FIFO was + * part of the reset. For an Rx-only reset it is left intact, + * and waiting for TEMT here would spin for a full frame time. + */ do { lsr = tegra_uart_read(tup, UART_LSR); - if ((lsr & UART_LSR_TEMT) && !(lsr & UART_LSR_DR)) + if ((!clear_tx || (lsr & UART_LSR_TEMT)) && + !(lsr & UART_LSR_DR)) break; udelay(1); } while (--tmout);