Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752166AbcDWROh (ORCPT ); Sat, 23 Apr 2016 13:14:37 -0400 Received: from mail-pa0-f46.google.com ([209.85.220.46]:35861 "EHLO mail-pa0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751964AbcDWROe (ORCPT ); Sat, 23 Apr 2016 13:14:34 -0400 Message-ID: <571BAD78.4020609@gmail.com> Date: Sat, 23 Apr 2016 10:14:32 -0700 From: Frank Rowand Reply-To: frowand.list@gmail.com User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:17.0) Gecko/20130801 Thunderbird/17.0.8 MIME-Version: 1.0 To: Andy Gross , David Brown , Greg Kroah-Hartman , Jiri Slaby , "linux-arm-msm@vger.kernel.org" , linux-soc@vger.kernel.org, linux-serial@vger.kernel.org, Linux Kernel list , ivan.ivanov@linaro.org Subject: [PATCH 1/2] tty: serial: msm_serial regression fix data corruption References: <571BAC8B.80001@gmail.com> In-Reply-To: <571BAC8B.80001@gmail.com> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1385 Lines: 40 From: Frank Rowand Commit 3a878c430fd6 ("tty: serial: msm: Add TX DMA support") regression. The calculation of tx_count was moved from the old msm_handle_tx(), now renamed msm_handle_tx_pio(), to the new msm_handle_tx(). The move left out one size test. The regression seen on the qcom-apq8074-dragonboard is dropped characters and corrupted characters (values greater than 0x7f) when DMA is not enabled. Signed-off-by: Frank Rowand Cc: stable@vger.kernel.org --- drivers/tty/serial/msm_serial.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) Index: b/drivers/tty/serial/msm_serial.c =================================================================== --- a/drivers/tty/serial/msm_serial.c +++ b/drivers/tty/serial/msm_serial.c @@ -727,6 +727,8 @@ static void msm_handle_tx(struct uart_po } pio_count = CIRC_CNT(xmit->head, xmit->tail, UART_XMIT_SIZE); + pio_count = min3(pio_count, (unsigned int)UART_XMIT_SIZE - xmit->tail, + port->fifosize); dma_count = CIRC_CNT_TO_END(xmit->head, xmit->tail, UART_XMIT_SIZE); dma_min = 1; /* Always DMA */ @@ -738,9 +740,6 @@ static void msm_handle_tx(struct uart_po dma_count = UARTDM_TX_MAX; } - if (pio_count > port->fifosize) - pio_count = port->fifosize; - if (!dma->chan || dma_count < dma_min) msm_handle_tx_pio(port, pio_count); else