Commit f1a297bb authored by Sebastian Andrzej Siewior's avatar Sebastian Andrzej Siewior Committed by Greg Kroah-Hartman

tty: serial: 8250: allow to use custom DMA implementation

The OMAP has a few corner cases where it needs a share of kindness of
affection to do the right thing. Heikki Krogerus suggested that instead
adding the quirks into the default DMA implementation, OMAP could get
its own copy of the function. And Alan suggested the same thing so here
we go.

This patch provides callbacks for custom TX/RX DMA implementation. If
there are not setup / used, then the default (current) implementation is
used.
Signed-off-by: default avatarSebastian Andrzej Siewior <bigeasy@linutronix.de>
Reviewed-by: default avatarPeter Hurley <peter@hurleysoftware.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0fcb7901
...@@ -16,6 +16,9 @@ ...@@ -16,6 +16,9 @@
#include <linux/dmaengine.h> #include <linux/dmaengine.h>
struct uart_8250_dma { struct uart_8250_dma {
int (*tx_dma)(struct uart_8250_port *p);
int (*rx_dma)(struct uart_8250_port *p, unsigned int iir);
/* Filter function */ /* Filter function */
dma_filter_fn fn; dma_filter_fn fn;
......
...@@ -1353,7 +1353,7 @@ static void serial8250_start_tx(struct uart_port *port) ...@@ -1353,7 +1353,7 @@ static void serial8250_start_tx(struct uart_port *port)
struct uart_8250_port *up = up_to_u8250p(port); struct uart_8250_port *up = up_to_u8250p(port);
serial8250_rpm_get_tx(up); serial8250_rpm_get_tx(up);
if (up->dma && !serial8250_tx_dma(up)) { if (up->dma && !up->dma->tx_dma(up)) {
return; return;
} else if (!(up->ier & UART_IER_THRI)) { } else if (!(up->ier & UART_IER_THRI)) {
up->ier |= UART_IER_THRI; up->ier |= UART_IER_THRI;
...@@ -1591,7 +1591,7 @@ int serial8250_handle_irq(struct uart_port *port, unsigned int iir) ...@@ -1591,7 +1591,7 @@ int serial8250_handle_irq(struct uart_port *port, unsigned int iir)
if (status & (UART_LSR_DR | UART_LSR_BI)) { if (status & (UART_LSR_DR | UART_LSR_BI)) {
if (up->dma) if (up->dma)
dma_err = serial8250_rx_dma(up, iir); dma_err = up->dma->rx_dma(up, iir);
if (!up->dma || dma_err) if (!up->dma || dma_err)
status = serial8250_rx_chars(up, status); status = serial8250_rx_chars(up, status);
...@@ -3627,8 +3627,13 @@ int serial8250_register_8250_port(struct uart_8250_port *up) ...@@ -3627,8 +3627,13 @@ int serial8250_register_8250_port(struct uart_8250_port *up)
uart->dl_read = up->dl_read; uart->dl_read = up->dl_read;
if (up->dl_write) if (up->dl_write)
uart->dl_write = up->dl_write; uart->dl_write = up->dl_write;
if (up->dma) if (up->dma) {
uart->dma = up->dma; uart->dma = up->dma;
if (!uart->dma->tx_dma)
uart->dma->tx_dma = serial8250_tx_dma;
if (!uart->dma->rx_dma)
uart->dma->rx_dma = serial8250_rx_dma;
}
if (serial8250_isa_config != NULL) if (serial8250_isa_config != NULL)
serial8250_isa_config(0, &uart->port, serial8250_isa_config(0, &uart->port,
......
...@@ -118,7 +118,6 @@ int serial8250_tx_dma(struct uart_8250_port *p) ...@@ -118,7 +118,6 @@ int serial8250_tx_dma(struct uart_8250_port *p)
dma->tx_err = 1; dma->tx_err = 1;
return ret; return ret;
} }
EXPORT_SYMBOL_GPL(serial8250_tx_dma);
int serial8250_rx_dma(struct uart_8250_port *p, unsigned int iir) int serial8250_rx_dma(struct uart_8250_port *p, unsigned int iir)
{ {
...@@ -165,7 +164,6 @@ int serial8250_rx_dma(struct uart_8250_port *p, unsigned int iir) ...@@ -165,7 +164,6 @@ int serial8250_rx_dma(struct uart_8250_port *p, unsigned int iir)
return 0; return 0;
} }
EXPORT_SYMBOL_GPL(serial8250_rx_dma);
int serial8250_request_dma(struct uart_8250_port *p) int serial8250_request_dma(struct uart_8250_port *p)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment