From mboxrd@z Thu Jan 1 00:00:00 1970 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 2756F15B0FE; Tue, 2 Jul 2024 17:14:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719940455; cv=none; b=ODKruN3H2ttLFDcELAQl3Zw6vlWgUJ49tqznfG6HurqotKSKNbL1myvYvg3qP6mdgrWz/oIBSUXDLgyq1u1jLOvwulOookvfsXNdV5V7j9Zp8jnZD4xSYj8CxpHUn6XtxtX+HArgS8kE/6+iRCvHgrgG17lJ64z6fA8kRcp6Y3o= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719940455; c=relaxed/simple; bh=F+7IBiwpBpmlXmNBw4Uj9RVRFD4/rUiQh2LGIv4mdAE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=F+9Yl3Nqs6+H+Ih1X7M9u0CcS1/NoScrcnTxXQ8Hd9xCXvrxmMIFJ+y/8DaUK9POdJ7IIZIk0sPmfW2Zgx2HQLWRkk9nc4sQ6APC0eogrtDg/z7J+swM6+p8BvJIpHrOzopwoz1VolSfqk/+E7PEpziHRL6f4VjQND4288Y5iTg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=R3uhroBJ; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="R3uhroBJ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 875B0C116B1; Tue, 2 Jul 2024 17:14:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1719940455; bh=F+7IBiwpBpmlXmNBw4Uj9RVRFD4/rUiQh2LGIv4mdAE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=R3uhroBJTVDxqGT8Wf09uKdNOdWlxhawod1iiWiV97WCdxz9vi05WTNo2yyIz7l8+ reeMXgV1yom0a81PAzTr8exm8Im4Qjm0DytvvmMWx9rjhF9/iC4Io0wFRR1AueVg/f thfGy69bvwEubRg4973SaLzbtUWdO1Bgzk6gaez0= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Jonas Gorski , Doug Brown Subject: [PATCH 6.9 160/222] serial: bcm63xx-uart: fix tx after conversion to uart_port_tx_limited() Date: Tue, 2 Jul 2024 19:03:18 +0200 Message-ID: <20240702170250.093503815@linuxfoundation.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240702170243.963426416@linuxfoundation.org> References: <20240702170243.963426416@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.9-stable review patch. If anyone has any objections, please let me know. ------------------ From: Jonas Gorski commit ea55c65dedf40e9c1911dc1e63e26bc9a59692b9 upstream. When bcm63xx-uart was converted to uart_port_tx_limited(), it implicitly added a call to stop_tx(). This causes garbage to be put out on the serial console. To fix this, pass UART_TX_NOSTOP in flags, and manually call stop_tx() ourselves analogue to how a similar issue was fixed in commit 7be50f2e8f20 ("serial: mxs-auart: fix tx"). Fixes: d11cc8c3c4b6 ("tty: serial: use uart_port_tx_limited()") Cc: stable@vger.kernel.org Signed-off-by: Jonas Gorski Signed-off-by: Doug Brown Link: https://lore.kernel.org/r/20240606195632.173255-4-doug@schmorgal.com Signed-off-by: Greg Kroah-Hartman --- drivers/tty/serial/bcm63xx_uart.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) --- a/drivers/tty/serial/bcm63xx_uart.c +++ b/drivers/tty/serial/bcm63xx_uart.c @@ -308,8 +308,8 @@ static void bcm_uart_do_tx(struct uart_p val = bcm_uart_readl(port, UART_MCTL_REG); val = (val & UART_MCTL_TXFIFOFILL_MASK) >> UART_MCTL_TXFIFOFILL_SHIFT; - - pending = uart_port_tx_limited(port, ch, port->fifosize - val, + pending = uart_port_tx_limited_flags(port, ch, UART_TX_NOSTOP, + port->fifosize - val, true, bcm_uart_writel(port, ch, UART_FIFO_REG), ({})); @@ -320,6 +320,9 @@ static void bcm_uart_do_tx(struct uart_p val = bcm_uart_readl(port, UART_IR_REG); val &= ~UART_TX_INT_MASK; bcm_uart_writel(port, val, UART_IR_REG); + + if (uart_tx_stopped(port)) + bcm_uart_stop_tx(port); } /*