Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Sherry Sun <sherry.sun@nxp.com>
To:     gregkh@linuxfoundation.org, jirislaby@kernel.org
Cc:     linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org,
        linux-imx@nxp.com
Subject: [PATCH] tty: serial: fsl_lpuart: avoid checking for transfer complete when UARTCTRL_SBK is asserted in lpuart32_tx_empty
Date:   Thu, 23 Mar 2023 13:44:15 +0800
Message-Id: <20230323054415.20363-1-sherry.sun@nxp.com>
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?7sQmJD62orDzXX83RWfm9uu9TikL/C6qTkyrgBiqBgBrVj6c4dzyh0XWPAHx?=
 =?us-ascii?Q?1b2bwJRrKbzMAjpwBActNnouK3aakx8JIeVWrIKKxM+PKng7+aHeS5wFjiRg?=
 =?us-ascii?Q?TDJG43Jd9pVP64SAYsSPV2eFCsVEsMe4sVJJqm2JkiJK7jHHDTQ/cZjLZqvY?=
 =?us-ascii?Q?BFYMzGfEKJO5lJIgpul1N9C7Uk5slkXRnairZRvr3+ygQm1opATkg9d3IJpA?=
 =?us-ascii?Q?+k+yqu50/M1kQbY2rwg4syzFTXXWg+5h56BRi+m0hoWozSJ3bdXHVAlarISe?=
 =?us-ascii?Q?vHvQNvJwzz+CdaQeg/YLHTksxwvRirZ5NNPTACoX0RNg/QJKFXF1HHF90PmJ?=
 =?us-ascii?Q?Ezzrr6DsVoCHPlMN/DGcsp4ketcgs+Tjf6mRk2vF7Hgimf0Dg8ce6KtVP/jb?=
 =?us-ascii?Q?09bil/K91B2GhuI1VEWoOhI7o0FkQWIJkdBuKfzZ4RAfYr9VVt59xsqulGMt?=
 =?us-ascii?Q?9zx/xwZwPyB3KUyYBKqFJ8XHY3TQpT55HGpqvh23xm4lSVI2slc8I65hAcCZ?=
 =?us-ascii?Q?JIdRP19Y2LiG8Czo4TPRJCkqcATJhw1Ml/vltR5xmYrEU9b+Fx6Gm8iOa9T2?=
 =?us-ascii?Q?hBlKR74RxNq1ivhZ3ti04TlFDh1J9mRgK2nTwvMU1T3mQV2Fm1gGfQ7YQFpz?=
 =?us-ascii?Q?2I/OiOgUVfp3C4PSYtI/iJXYJ2ForIeUzA1L6JFSIIkwik0QuYphucmfuiwl?=
 =?us-ascii?Q?+hky4OcvVOk3ZAdMfEQy/nWI9mPa0ku5m0EMlKXxTYRffFlK9VIMioQTLaKB?=
 =?us-ascii?Q?PDMMxaITZiidTsfB0/pjp5ihfT3sVEIqZysD1uT89RweWKrv9xCGgBqMUaeu?=
 =?us-ascii?Q?oaxSWgtn3smsT/34muks2/g1bwV8mLvB3aPTf6HORU9Ss3KwzD9NXbd6rCfU?=
 =?us-ascii?Q?RGJ87jlYsmrAk0Er/b/uV0L48L1K9+1fH7TrHuHm2BKOOZiuwlwJnUhEGbEM?=
 =?us-ascii?Q?y97ItSM2ff894CYN373BEifB2khyMZDnwLYYRiwA13ENhehYDqtVGHjopJaV?=
 =?us-ascii?Q?+jntm637+JZD09o3sQ06CowGVkpHqLrVI2Jw/m3NnSNjVisGbgmSRTDI5ZdQ?=
 =?us-ascii?Q?mvVF4gJ9Wz0gXIjytWgIFvqhS8U3fgz2fxNqcvLKvnEAsspC0ggvIaurkoMF?=
 =?us-ascii?Q?Gkjmh6CZsM05W0i6+as0xybStpburVgPX62B39QF4EBO8+ufiduqWX6jFSOm?=
 =?us-ascii?Q?AWAXe+6EzQ4JlWlGXG/gTVGHAOgqmBKaSPlK08DGOdqXBpZSeLtauAG+VHrz?=
 =?us-ascii?Q?JHOP9QccNJVclMc9iFOlMbBuYaEEcx6iralmuJsLdYiQd/1AH2lhRuX4ya13?=
 =?us-ascii?Q?vxRUxWAeggXevaF48BoHMAtk5+VF6MlotqwrMcVu0+z9itbnyAR2qeOom5xN?=
 =?us-ascii?Q?BDidG4wwd/KRCXWXuZvzWdOyXHF4fPfGao/g0HFlTovRZv5C+gpfHENn2Ckn?=
 =?us-ascii?Q?74zh+aJUGZ1DqG1i3Rg0LoZucRQSDnKTTQTiKSZ5wOA0ACkUjBceE1ue3hdT?=
 =?us-ascii?Q?XJzxDtoUuqpdwmKdMcdHlhkEpOVrw3cKF5TltUG+D0u64/ZtPTAPaAFHBqP4?=
 =?us-ascii?Q?YXGIY7W6XsAw2INfvL2dGfURTJ4/PE59ZaSLhfEL?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 0b2a153a-0198-4b71-4245-08db2b621213
X-MS-Exchange-CrossTenant-AuthSource: AS8PR04MB8404.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Mar 2023 05:47:21.5441
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: tkY8wlo6fTtidTyxkV9EIb2r7XSUobRCw4IsdMZqQHV6hDno3Vtqb5ZWh/NoFcp1IgGHdV9HQmKTvbvP3RclrQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR04MB7743
X-Spam-Status: No, score=-0.2 required=5.0 tests=DKIM_SIGNED,DKIM_VALID,
        DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,
        SPF_HELO_PASS,SPF_PASS autolearn=unavailable autolearn_force=no
        version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

According to LPUART RM, Transmission Complete Flag becomes 0 if queuing
a break character by writing 1 to CTRL[SBK], so here need to avoid
checking for transmission complete when UARTCTRL_SBK is asserted,
otherwise the lpuart32_tx_empty may never get TIOCSER_TEMT.

Commit 2411fd94ceaa("tty: serial: fsl_lpuart: skip waiting for
transmission complete when UARTCTRL_SBK is asserted") only fix it in
lpuart32_set_termios(), here also fix it in lpuart32_tx_empty().

Fixes: 380c966c093e ("tty: serial: fsl_lpuart: add 32-bit register interface support")
Signed-off-by: Sherry Sun <sherry.sun@nxp.com>
---
 drivers/tty/serial/fsl_lpuart.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/drivers/tty/serial/fsl_lpuart.c b/drivers/tty/serial/fsl_lpuart.c
index c974a1d88f88..3281e81e1723 100644
--- a/drivers/tty/serial/fsl_lpuart.c
+++ b/drivers/tty/serial/fsl_lpuart.c
@@ -863,11 +863,17 @@ static unsigned int lpuart32_tx_empty(struct uart_port *port)
 			struct lpuart_port, port);
 	unsigned long stat = lpuart32_read(port, UARTSTAT);
 	unsigned long sfifo = lpuart32_read(port, UARTFIFO);
+	unsigned long ctrl = lpuart32_read(port, UARTCTRL);
 
 	if (sport->dma_tx_in_progress)
 		return 0;
 
-	if (stat & UARTSTAT_TC && sfifo & UARTFIFO_TXEMPT)
+	/*
+	 * LPUART Transmission Complete Flag may never be set while queuing a break
+	 * character, so avoid checking for transmission complete when UARTCTRL_SBK
+	 * is asserted.
+	 */
+	if ((stat & UARTSTAT_TC && sfifo & UARTFIFO_TXEMPT) || ctrl & UARTCTRL_SBK)
 		return TIOCSER_TEMT;
 
 	return 0;
-- 
2.17.1