From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753734AbbIJNm3 (ORCPT ); Thu, 10 Sep 2015 09:42:29 -0400 Received: from mailout1.samsung.com ([203.254.224.24]:55293 "EHLO mailout1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752157AbbIJNll (ORCPT ); Thu, 10 Sep 2015 09:41:41 -0400 X-AuditID: cbfee61a-f79a06d000005c6f-46-55f188948621 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 3/4] serial: samsung: introduce s3c24xx_serial_rx_drain_fifo() function Date: Thu, 10 Sep 2015 15:41:15 +0200 Message-id: <1441892476-14273-4-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+NgFupnluLIzCtJLcpLzFFi42I5/e+xgO6Ujo+hBl//KVk0L17PZjFlwwcm i9cvDC0u75rDZnFmcS+7xdojd9ktHhzeye7A7rF/7hp2j74tqxg91m+5yuLxeZNcAEsUl01K ak5mWWqRvl0CV0br8adsBZcFKu79X8rSwHiFt4uRk0NCwERi3YE+JghbTOLCvfVsILaQwFJG iY8H9LoYuYDsn4wSlz69ZQFJsAnoSGz5PoERxBYRkJN4cvsPM0gRs8A6RolXM16wdjFycAgL xEh8+x4JUsMioCrxcHED2AJeAVeJmfO/MkIsk5M4eWwyK4jNKeAm8XzBPxaQViGgmqt7HScw 8i5gZFjFKJFakFxQnJSea5iXWq5XnJhbXJqXrpecn7uJERxMz6R2MB7c5X6IUYCDUYmHN+Hi h1Ah1sSy4srcQ4wSHMxKIrxnWj6GCvGmJFZWpRblxxeV5qQWH2KU5mBREueVXfksVEggPbEk NTs1tSC1CCbLxMEp1cCYyPTo+/IDv9kuXLx880bRmaVxOq7NKROcf2kukcmZlbrzQNzNssdf tJU570+cta72l7VkifEC/z0sXJs3bYlaefCcdeaPm6+2CX/ksxWIDbLRm75P5Y/ujMXr9h8N WmW9v8rv6e8pB9UZw+r1frwqL6jsNZHft9LFceXpAlP1BXVRv3ZMffqtQYmlOCPRUIu5qDgR ANiidxYiAgAA Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch introduces s3c24xx_serial_rx_drain_fifo() which reads data from RX FIFO and writes it to tty buffer. It also checks for special conditions (such as 'break') and handles it. This function has been separated from s3c24xx_serial_rx_chars_pio() as it contains code which can be used also in DMA mode. Signed-off-by: Robert Baldyga --- drivers/tty/serial/samsung.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/drivers/tty/serial/samsung.c b/drivers/tty/serial/samsung.c index dc4be54..1d7dd86 100644 --- a/drivers/tty/serial/samsung.c +++ b/drivers/tty/serial/samsung.c @@ -621,16 +621,12 @@ finish: return IRQ_HANDLED; } -static irqreturn_t s3c24xx_serial_rx_chars_pio(void *dev_id) +static void s3c24xx_serial_rx_drain_fifo(struct s3c24xx_uart_port *ourport) { - struct s3c24xx_uart_port *ourport = dev_id; struct uart_port *port = &ourport->port; unsigned int ufcon, ch, flag, ufstat, uerstat; - unsigned long flags; int max_count = port->fifosize; - spin_lock_irqsave(&port->lock, flags); - while (max_count-- > 0) { ufcon = rd_regl(port, S3C2410_UFCON); ufstat = rd_regl(port, S3C2410_UFSTAT); @@ -654,9 +650,7 @@ static irqreturn_t s3c24xx_serial_rx_chars_pio(void *dev_id) ufcon |= S3C2410_UFCON_RESETRX; wr_regl(port, S3C2410_UFCON, ufcon); rx_enabled(port) = 1; - spin_unlock_irqrestore(&port->lock, - flags); - goto out; + return; } continue; } @@ -702,10 +696,19 @@ static irqreturn_t s3c24xx_serial_rx_chars_pio(void *dev_id) ch, flag); } - spin_unlock_irqrestore(&port->lock, flags); tty_flip_buffer_push(&port->state->port); +} + +static irqreturn_t s3c24xx_serial_rx_chars_pio(void *dev_id) +{ + struct s3c24xx_uart_port *ourport = dev_id; + struct uart_port *port = &ourport->port; + unsigned long flags; + + spin_lock_irqsave(&port->lock, flags); + s3c24xx_serial_rx_drain_fifo(ourport); + spin_unlock_irqrestore(&port->lock, flags); -out: return IRQ_HANDLED; } -- 1.9.1