From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 36645C2D0DB for ; Fri, 24 Jan 2020 10:00:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id F170C218AC for ; Fri, 24 Jan 2020 10:00:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579860031; bh=ZLxW+0yI//kMKBjy4FmBsVDollm6lPFnd/WcNHFHJu4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=pt4B12ixynh5GEyySVMEDTOakBFXTdRGX1IxsJpC5BP/EjnYX4jwdEMJ0mU1MuaSx /SkJg/l8fZh012C74t+stSo2anr83Fxg5rgtPzjufmbeNIywxbB4cpvDHKV33usZQu NXz4qXpGy7ytbxfAAIbKxd6RaaIzVV22RH+KxWgM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388763AbgAXKA3 (ORCPT ); Fri, 24 Jan 2020 05:00:29 -0500 Received: from mail.kernel.org ([198.145.29.99]:35884 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730996AbgAXKA2 (ORCPT ); Fri, 24 Jan 2020 05:00:28 -0500 Received: from localhost (unknown [145.15.244.15]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 679D120709; Fri, 24 Jan 2020 10:00:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579860027; bh=ZLxW+0yI//kMKBjy4FmBsVDollm6lPFnd/WcNHFHJu4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=euKG6kLpaLYt+HCJcGCZfJkaDK2e6D7vcKfH6no0vwYAhz+JotRYOK68aWheSNPZN 5y8gg0jm/mOC8KMFnU9oiW0+EIojws8sFBX5gOL64lU+gfFbs/BE3GQNUj9GLg5Zar LwO+iJn+yOJrBRjAHv5WN1VCJfRgDLEKLm22UpiQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Erwan Le Ray , Sasha Levin Subject: [PATCH 4.14 219/343] serial: stm32: fix transmit_chars when tx is stopped Date: Fri, 24 Jan 2020 10:30:37 +0100 Message-Id: <20200124092948.845426204@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200124092919.490687572@linuxfoundation.org> References: <20200124092919.490687572@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Erwan Le Ray [ Upstream commit b83b957c91f68e53f0dc596e129e8305761f2a32 ] Disables the tx irq when the transmission is ended and updates stop_tx conditions for code cleanup. Fixes: 48a6092fb41f ("serial: stm32-usart: Add STM32 USART Driver") Signed-off-by: Erwan Le Ray Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/tty/serial/stm32-usart.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/drivers/tty/serial/stm32-usart.c b/drivers/tty/serial/stm32-usart.c index c435900773723..a1e31913bcf9a 100644 --- a/drivers/tty/serial/stm32-usart.c +++ b/drivers/tty/serial/stm32-usart.c @@ -310,13 +310,8 @@ static void stm32_transmit_chars(struct uart_port *port) return; } - if (uart_tx_stopped(port)) { - stm32_stop_tx(port); - return; - } - - if (uart_circ_empty(xmit)) { - stm32_stop_tx(port); + if (uart_circ_empty(xmit) || uart_tx_stopped(port)) { + stm32_clr_bits(port, ofs->cr1, USART_CR1_TXEIE); return; } @@ -329,7 +324,7 @@ static void stm32_transmit_chars(struct uart_port *port) uart_write_wakeup(port); if (uart_circ_empty(xmit)) - stm32_stop_tx(port); + stm32_clr_bits(port, ofs->cr1, USART_CR1_TXEIE); } static irqreturn_t stm32_interrupt(int irq, void *ptr) -- 2.20.1