> On January 7, 2019 at 5:23 PM Geert Uytterhoeven <geert+renesas@xxxxxxxxx> wrote:
>
>
> Extract the functionality to direct new serial port interrupts back to
> the CPU into its own helper, to prepare for using it from a second
> callsite.
>
> Signed-off-by: Geert Uytterhoeven <geert+renesas@xxxxxxxxx>
> ---
> v5:
> - New.
> ---
> drivers/tty/serial/sh-sci.c | 23 +++++++++++++++--------
> 1 file changed, 15 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c
> index 4c75468680cb547d..4d814c30c4189b56 100644
> --- a/drivers/tty/serial/sh-sci.c
> +++ b/drivers/tty/serial/sh-sci.c
> @@ -1274,6 +1274,20 @@ static void start_hrtimer_us(struct hrtimer *hrt, unsigned long usec)
> hrtimer_start(hrt, t, HRTIMER_MODE_REL);
> }
>
> +static void sci_dma_rx_reenable_irq(struct sci_port *s)
> +{
> + struct uart_port *port = &s->port;
> + u16 scr;
> +
> + /* 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);
> +}
> +
> static void sci_dma_rx_complete(void *arg)
> {
> struct sci_port *s = arg;
> @@ -1453,7 +1467,6 @@ static enum hrtimer_restart rx_timer_fn(struct hrtimer *t)
> unsigned long flags;
> unsigned int read;
> int active, count;
> - u16 scr;
>
> dev_dbg(port->dev, "DMA Rx timed out\n");
>
> @@ -1503,13 +1516,7 @@ static enum hrtimer_restart rx_timer_fn(struct hrtimer *t)
> if (port->type == PORT_SCIFA || port->type == PORT_SCIFB)
> sci_submit_rx(s, true);
>
> - /* 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);
> + sci_dma_rx_reenable_irq(s);
>
> spin_unlock_irqrestore(&port->lock, flags);
>
> --
> 2.17.1
>
Reviewed-by: Ulrich Hecht <uli+renesas@xxxxxxxx>
CU
Uli
