Received: by 2002:a25:8b91:0:0:0:0:0 with SMTP id j17csp8330856ybl; Thu, 16 Jan 2020 14:46:31 -0800 (PST) X-Google-Smtp-Source: APXvYqxmloWR0aLKjIe+vt04FxIjWqDZ7WLVVFpGk+447+yFNh8K7zdxtN/4hQj1cQnZov4/Vu9S X-Received: by 2002:aca:c256:: with SMTP id s83mr1223719oif.57.1579214791333; Thu, 16 Jan 2020 14:46:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1579214791; cv=none; d=google.com; s=arc-20160816; b=xIJuC/KUTYhMmw3n2cDVll5IG1OP4+NiTdlDcNdl8RNFnrs/HGJcgqs5jw/1tRBxtP fZYgPN4eezntWN6LKFLTOnOcPrJv9qf+zFD9vejVjT17Ebd04ITXTzYm1RF//bCt8XoT vyNtmD2snt7LWXUWzTD3vd7estCU1yGYn9phbKod89hCZJDIy1mJ7jfcLbldoX5YAQZE iQ9mnolzpfpo1ZtNl3GBfS3WzE7t/hSGYbAkrADeORCX8KKx5QSvo7q6NxyfDEQAzb3R Bav0qg8heSdSmPdErnaHieD/RJIWMQ1rfLusJO0/lGa9jxijwU2K9r2FPJPL21NrgGZq OoZw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=bip0IbKdMLLWvEAV9sVDURKdVen53dqlodRwfcByhAk=; b=zcqdSVyTGu5yxV7f7xjG4Ha7bkklQ862ERang+MREpv8UBlaTDEhiYUGzjbSLY0Ow1 sGvaUhlEfQzDRYvU4Y64mjG/nF7Zeqtu78R2oABCQHLlxPEJzgRDy/HOvsdWR9Kymiby SRRrs98ghCVrAz5kpCtqhdVCI/R1apIS/qsZjGbZEyu6UDXlFEMzVvDHkeO7FaTOunBW I1wjYUGNa4XLAEcwNlBrrg4eA05PZTJ3MMD/1U/GCb8ms8ah2TzuIkRVFwwsfVB+/yWY E98GKCokVb/n+wFhlQHbpCTQilGtM5rWaLDWTYLYnrP97wvZbrCrgu6mqOgjqaWVVWOn 8eqw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="gZNXl/mT"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n137si12059579oig.127.2020.01.16.14.46.19; Thu, 16 Jan 2020 14:46:31 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="gZNXl/mT"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2407130AbgAPSHL (ORCPT + 99 others); Thu, 16 Jan 2020 13:07:11 -0500 Received: from mail.kernel.org ([198.145.29.99]:55388 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388465AbgAPRjN (ORCPT ); Thu, 16 Jan 2020 12:39:13 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 15CD72470B; Thu, 16 Jan 2020 17:39:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579196353; bh=UNs+FSMFE5y+swkCJ1aDB112pLnvBCrA4j+3vrVOtCc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gZNXl/mTbICGnk57ECMmoa+e89YNPWSo69iXneV793Fkq9LHrj48vQI2AW+iOMYhZ N8dcshzCQweula9DxQELodtl2LKRZO95cuMAXZRIsu9qiXuAJjKGCytM1P9AfnFDwi KRngyNJmxOBHXWPDTBTECTaYzVgnB9R7WDRf913A= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Erwan Le Ray , Greg Kroah-Hartman , Sasha Levin , linux-serial@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org Subject: [PATCH AUTOSEL 4.9 146/251] serial: stm32: fix transmit_chars when tx is stopped Date: Thu, 16 Jan 2020 12:34:55 -0500 Message-Id: <20200116173641.22137-106-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200116173641.22137-1-sashal@kernel.org> References: <20200116173641.22137-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore 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 033856287ca2..ea8b591dd46f 100644 --- a/drivers/tty/serial/stm32-usart.c +++ b/drivers/tty/serial/stm32-usart.c @@ -293,13 +293,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; } @@ -312,7 +307,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