korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-13 05:54:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

serial: sh-sci: Redirect port interrupts to CPU _only_ when DMA stops

Browse Source 
Since the DMA engine is not stopped everytime rx_timer_fn is called, the
interrupts have to be redirected back to CPU only when incomplete DMA
transaction is handled

Signed-off-by: Muhammad Hamza Farooq <mfarooq@visteon.com>
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Muhammad Hamza Farooq 2015-09-18 13:08:29 +02:00 committed by Greg Kroah-Hartman
parent 9ab7655660
commit 371cfed311
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/tty/serial/sh-sci.c
View File

@ -1285,12 +1285,6 @@ static void rx_timer_fn(unsigned long arg)
spin_lock_irqsave(&port->lock, flags); spin_lock_irqsave(&port->lock, flags);
dev_dbg(port->dev, "DMA Rx timed out\n"); dev_dbg(port->dev, "DMA Rx timed out\n");
scr = serial_port_in(port, SCSCR);
if (port->type == PORT_SCIFA || port->type == PORT_SCIFB) {
scr &= ~SCSCR_RDRQE;
enable_irq(s->irqs[SCIx_RXI_IRQ]);
}
serial_port_out(port, SCSCR, scr | SCSCR_RIE);
active = sci_dma_rx_find_active(s); active = sci_dma_rx_find_active(s);
if (active < 0) { if (active < 0) {
@ -1315,10 +1309,18 @@ static void rx_timer_fn(unsigned long arg)
tty_flip_buffer_push(&port->state->port); tty_flip_buffer_push(&port->state->port);
} }
spin_unlock_irqrestore(&port->lock, flags);
if (port->type == PORT_SCIFA || port->type == PORT_SCIFB) if (port->type == PORT_SCIFA || port->type == PORT_SCIFB)
sci_submit_rx(s); sci_submit_rx(s);
/* Direct new serial port interrupts back to CPU */
scr = serial_port_in(port, SCSCR);
if (port->type == PORT_SCIFA || port->type == PORT_SCIFB) {
scr &= ~SCSCR_RDRQE;
enable_irq(s->irqs[SCIx_RXI_IRQ]);
}
serial_port_out(port, SCSCR, scr | SCSCR_RIE);
spin_unlock_irqrestore(&port->lock, flags);
} }
static void sci_request_dma(struct uart_port *port) static void sci_request_dma(struct uart_port *port)