From patchwork Sat Oct 6 12:46:07 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Russell King X-Patchwork-Id: 1557711 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id 9D9483FD56 for ; Sat, 6 Oct 2012 13:02:52 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TKTys-0000p8-MC; Sat, 06 Oct 2012 12:59:48 +0000 Received: from [2002:4e20:1eda::1] (helo=caramon.arm.linux.org.uk) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TKTll-00048m-QY for linux-arm-kernel@lists.infradead.org; Sat, 06 Oct 2012 12:46:14 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=arm.linux.org.uk; s=caramon; h=Date:Sender:Message-Id:Subject:Cc:To:From:References:In-Reply-To; bh=dCeOX4vhK/8FB0Sk43YnjFlxZJ/WzFSv058ljOHdu4Q=; b=Zw/hezIn2hbcdbUO0AjhmgzertIhE4xXBYcM1CCrdFDSJx2t0tbwUVoaMZnvvnsoSoujy1iDX6z8jiOgjuTTRBXS9XAxJqa1WQ1FffkFdxxOEU/vo78wndQMPiJQ49yTmsD5YhOZdEXugAz8eqZhmYLPinyonY419IpHFBxZVsE=; Received: from e0022681537dd.dyn.arm.linux.org.uk ([2002:4e20:1eda:1:222:68ff:fe15:37dd]:39612 helo=rmk-PC.arm.linux.org.uk) by caramon.arm.linux.org.uk with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.76) (envelope-from ) id 1TKTlg-0008A4-AP; Sat, 06 Oct 2012 13:46:08 +0100 Received: from rmk by rmk-PC.arm.linux.org.uk with local (Exim 4.76) (envelope-from ) id 1TKTlf-0002nm-Pn; Sat, 06 Oct 2012 13:46:07 +0100 In-Reply-To: <20121006123803.GD15246@n2100.arm.linux.org.uk> References: <20121006123803.GD15246@n2100.arm.linux.org.uk> From: Russell King To: Tony Lindgren , Alan Cox , Greg Kroah-Hartman Subject: [RFC 21/24] SERIAL: omap: use tx buffer allocation API Message-Id: Date: Sat, 06 Oct 2012 13:46:07 +0100 X-Bad-Reply: References and In-Reply-To but no 'Re:' in Subject. X-Spam-Note: CRM114 invocation failed X-Spam-Score: -1.2 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.8 RDNS_NONE Delivered to internal network by a host with no rDNS X-Mailman-Approved-At: Sat, 06 Oct 2012 08:53:04 -0400 Cc: linux-omap@vger.kernel.org, linux-serial@vger.kernel.org, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Rather than working around serial_core, use the newly provided buffer allocation API to allow a saner method to manage this buffer. Signed-off-by: Russell King --- drivers/tty/serial/omap-serial.c | 38 +++++++++++++++++++++++++++++--------- 1 files changed, 29 insertions(+), 9 deletions(-) diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c index b497187..6054fc8 100644 --- a/drivers/tty/serial/omap-serial.c +++ b/drivers/tty/serial/omap-serial.c @@ -604,11 +604,6 @@ static int serial_omap_startup(struct uart_port *port) up->msr_saved_flags = 0; if (up->use_dma) { - free_page((unsigned long)up->port.state->xmit.buf); - up->port.state->xmit.buf = dma_alloc_coherent(NULL, - UART_XMIT_SIZE, - (dma_addr_t *)&(up->uart_dma.tx_buf_dma_phys), - 0); init_timer(&(up->uart_dma.rx_timer)); up->uart_dma.rx_timer.function = serial_omap_rxdma_poll; up->uart_dma.rx_timer.data = up->port.line; @@ -665,10 +660,6 @@ static void serial_omap_shutdown(struct uart_port *port) if (serial_in(up, UART_LSR) & UART_LSR_DR) (void) serial_in(up, UART_RX); if (up->use_dma) { - dma_free_coherent(up->port.dev, - UART_XMIT_SIZE, up->port.state->xmit.buf, - up->uart_dma.tx_buf_dma_phys); - up->port.state->xmit.buf = NULL; serial_omap_stop_rx(port); dma_free_coherent(up->port.dev, up->uart_dma.rx_buf_size, up->uart_dma.rx_buf, @@ -680,6 +671,33 @@ static void serial_omap_shutdown(struct uart_port *port) free_irq(up->port.irq, up); } +static int serial_omap_alloc_xmit(struct uart_port *port, struct circ_buf *xmit) +{ + struct uart_omap_port *up = (struct uart_omap_port *)port; + + if (up->use_dma) { + xmit->buf = dma_alloc_coherent(NULL, UART_XMIT_SIZE, + &up->uart_dma.tx_buf_dma_phys, 0); + } else { + unsigned long page = get_zeroed_page(GFP_KERNEL); + xmit->buf = (unsigned char *)page; + } + + return xmit->buf ? 0 : -ENOMEM; +} + +static void serial_omap_free_xmit(struct uart_port *port, struct circ_buf *xmit) +{ + struct uart_omap_port *up = (struct uart_omap_port *)port; + + if (up->use_dma) { + dma_free_coherent(NULL, UART_XMIT_SIZE, + xmit->buf, up->uart_dma.tx_buf_dma_phys); + } else { + free_page((unsigned long)xmit->buf); + } +} + static void serial_omap_uart_qos_work(struct work_struct *work) { struct uart_omap_port *up = container_of(work, struct uart_omap_port, @@ -1193,6 +1211,8 @@ static struct uart_ops serial_omap_pops = { .break_ctl = serial_omap_break_ctl, .startup = serial_omap_startup, .shutdown = serial_omap_shutdown, + .alloc_xmit = serial_omap_alloc_xmit, + .free_xmit = serial_omap_free_xmit, .set_termios = serial_omap_set_termios, .pm = serial_omap_pm, .type = serial_omap_type,