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: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Reviewed-by: Peter Hurley <peter@hurleysoftware.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/tty/serial/8250/8250.h b/drivers/tty/serial/8250/8250.h
index 712d1600c20609332338d98b221e747281f4c25e..0dc1cb6b2706744c6a8c6a45c34e872e86c31872 100644 (file)
--- a/drivers/tty/serial/8250/8250.h
+++ b/drivers/tty/serial/8250/8250.h
@@ -16,6 +16,9 @@
 #include <linux/dmaengine.h>
 
 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 */
        dma_filter_fn           fn;
 

diff --git a/drivers/tty/serial/8250/8250_core.c b/drivers/tty/serial/8250/8250_core.c
index f0f31d28b2f53fcce501889d356c4f55747719c3..39450ba03a2f922782bb0088688907080e9c078c 100644 (file)
--- a/drivers/tty/serial/8250/8250_core.c
+++ b/drivers/tty/serial/8250/8250_core.c
@@ -1353,7 +1353,7 @@ static void serial8250_start_tx(struct uart_port *port)
        struct uart_8250_port *up = up_to_u8250p(port);
 
        serial8250_rpm_get_tx(up);
-       if (up->dma && !serial8250_tx_dma(up)) {
+       if (up->dma && !up->dma->tx_dma(up)) {
                return;
        } else if (!(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)
 
        if (status & (UART_LSR_DR | UART_LSR_BI)) {
                if (up->dma)
-                       dma_err = serial8250_rx_dma(up, iir);
+                       dma_err = up->dma->rx_dma(up, iir);
 
                if (!up->dma || dma_err)
                        status = serial8250_rx_chars(up, status);
@@ -3627,8 +3627,13 @@ int serial8250_register_8250_port(struct uart_8250_port *up)
                        uart->dl_read = up->dl_read;
                if (up->dl_write)
                        uart->dl_write = up->dl_write;
-               if (up->dma)
+               if (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)
                        serial8250_isa_config(0, &uart->port,

diff --git a/drivers/tty/serial/8250/8250_dma.c b/drivers/tty/serial/8250/8250_dma.c
index db9eda3c12d67d9541449557eab9993ce437f226..258430b72039eec482f64a394f6dfb2dd92ca34f 100644 (file)
--- a/drivers/tty/serial/8250/8250_dma.c
+++ b/drivers/tty/serial/8250/8250_dma.c
@@ -118,7 +118,6 @@ err:
        dma->tx_err = 1;
        return ret;
 }
-EXPORT_SYMBOL_GPL(serial8250_tx_dma);
 
 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;
 }
-EXPORT_SYMBOL_GPL(serial8250_rx_dma);
 
 int serial8250_request_dma(struct uart_8250_port *p)
 {