From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753606AbbIJNly (ORCPT ); Thu, 10 Sep 2015 09:41:54 -0400 Received: from mailout3.samsung.com ([203.254.224.33]:33621 "EHLO mailout3.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753377AbbIJNlq (ORCPT ); Thu, 10 Sep 2015 09:41:46 -0400 X-AuditID: cbfee61b-f79d56d0000048c5-74-55f188984c42 From: Robert Baldyga To: gregkh@linuxfoundation.org Cc: jslaby@suse.com, linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org, m.szyprowski@samsung.com, k.kozlowski@samsung.com, Robert Baldyga Subject: [PATCH v2 4/4] serial: samsung: Fix UART status handling in DMA mode Date: Thu, 10 Sep 2015 15:41:16 +0200 Message-id: <1441892476-14273-5-git-send-email-r.baldyga@samsung.com> X-Mailer: git-send-email 1.9.1 In-reply-to: <1441892476-14273-1-git-send-email-r.baldyga@samsung.com> References: <1441892476-14273-1-git-send-email-r.baldyga@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprALMWRmVeSWpSXmKPExsVy+t9jAd0ZHR9DDd6e47VoXryezWLKhg9M Fq9fGFpc3jWHzeLM4l52i7VH7rJbPDi8k92B3WP/3DXsHn1bVjF6rN9ylcXj8ya5AJYoLpuU 1JzMstQifbsErozTHY0sBW+FKtYvOMzcwPiYv4uRg0NCwETiwWP7LkZOIFNM4sK99WxdjFwc QgJLGSU2HOlihXB+AjnL77GCVLEJ6Ehs+T6BEcQWEZCTeHL7DzNIEbPAOkaJVzNegBUJC/hK tH0+wg5iswioSmzc+BisgVfAVeLS6guMEOvkJE4emwxWzyngJvF8wT8WkIuEgGqu7nWcwMi7 gJFhFaNEakFyQXFSeq5RXmq5XnFibnFpXrpecn7uJkZwOD2T3sF4eJf7IUYBDkYlHt6Eix9C hVgTy4orcw8xSnAwK4nwnmn5GCrEm5JYWZValB9fVJqTWnyIUZqDRUmcV3bls1AhgfTEktTs 1NSC1CKYLBMHp1QDI8PGC0eVZZfZN8clPiz8VBC43+n7ivqPivfefZsp4XDcZ+EhjrsSl2aG R83c8CLH/kxTyj+js4tzpp1yVd6V8O/1L9snhY9lvrB+2B+277PWls747Lr0vNW3PqlU7Gfc Mm3JifuOl0r4NYz6xeYJylZGHKpndl+iyvOY5xUbQ591UQlv6BG3BiWW4oxEQy3mouJEAE54 E4ojAgAA Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch fixes UART status handling in DMA mode. For this purpose we use s3c24xx_serial_rx_drain_fifo() instead of uart_rx_drain_fifo(), which does the same thing plus checks for special conditions (such as 'break'). Thanks to this we have, for example, Magic SysRq handling, which was missing in DMA mode so far. Since we can use UART in DMA mode as serial console, this is a quite important improvement. This change additionally simplifies RX handling code, as we no longer need uart_rx_drain_fifo() function, so we can remove it. Reported-by: Marek Szyprowski Signed-off-by: Robert Baldyga --- drivers/tty/serial/samsung.c | 30 +++--------------------------- 1 file changed, 3 insertions(+), 27 deletions(-) diff --git a/drivers/tty/serial/samsung.c b/drivers/tty/serial/samsung.c index 1d7dd86..d72cd73 100644 --- a/drivers/tty/serial/samsung.c +++ b/drivers/tty/serial/samsung.c @@ -385,32 +385,6 @@ static void s3c24xx_uart_copy_rx_to_tty(struct s3c24xx_uart_port *ourport, } } -static int s3c24xx_serial_rx_fifocnt(struct s3c24xx_uart_port *ourport, - unsigned long ufstat); - -static void uart_rx_drain_fifo(struct s3c24xx_uart_port *ourport) -{ - struct uart_port *port = &ourport->port; - struct tty_port *tty = &port->state->port; - unsigned int ch, ufstat; - unsigned int count; - - ufstat = rd_regl(port, S3C2410_UFSTAT); - count = s3c24xx_serial_rx_fifocnt(ourport, ufstat); - - if (!count) - return; - - while (count-- > 0) { - ch = rd_regb(port, S3C2410_URXH); - - ourport->port.icount.rx++; - tty_insert_flip_char(tty, ch, TTY_NORMAL); - } - - tty_flip_buffer_push(tty); -} - static void s3c24xx_serial_stop_rx(struct uart_port *port) { struct s3c24xx_uart_port *ourport = to_ourport(port); @@ -573,6 +547,8 @@ static void enable_rx_pio(struct s3c24xx_uart_port *ourport) ourport->rx_mode = S3C24XX_RX_PIO; } +static void s3c24xx_serial_rx_drain_fifo(struct s3c24xx_uart_port *ourport); + static irqreturn_t s3c24xx_serial_rx_chars_dma(void *dev_id) { unsigned int utrstat, ufstat, received; @@ -606,7 +582,7 @@ static irqreturn_t s3c24xx_serial_rx_chars_dma(void *dev_id) enable_rx_pio(ourport); } - uart_rx_drain_fifo(ourport); + s3c24xx_serial_rx_drain_fifo(ourport); if (tty) { tty_flip_buffer_push(t); -- 1.9.1