tty: serial: sh-sci: Remove setting {src,dst}_{addr,addr_width} based on DMA direction
authorBiju Das <biju.das.jz@bp.renesas.com>
Wed, 22 Mar 2023 07:47:17 +0000 (07:47 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 29 Mar 2023 08:54:15 +0000 (10:54 +0200)
The direction field in the DMA config is deprecated. The sh-sci driver
sets {src,dst}_{addr,addr_width} based on the DMA direction and
it results in dmaengine_slave_config() failure as RZ DMAC driver
validates {src,dst}_addr_width values independent of DMA direction.

Fix this issue by passing both {src,dst}_{addr,addr_width}
values independent of DMA direction.

Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
Link: https://lore.kernel.org/r/20230322074717.6057-1-biju.das.jz@bp.renesas.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/tty/serial/sh-sci.c

index af4a7a8..027dfe5 100644 (file)
@@ -1530,15 +1530,12 @@ static struct dma_chan *sci_request_dma_chan(struct uart_port *port,
 
        memset(&cfg, 0, sizeof(cfg));
        cfg.direction = dir;
-       if (dir == DMA_MEM_TO_DEV) {
-               cfg.dst_addr = port->mapbase +
-                       (sci_getreg(port, SCxTDR)->offset << port->regshift);
-               cfg.dst_addr_width = DMA_SLAVE_BUSWIDTH_1_BYTE;
-       } else {
-               cfg.src_addr = port->mapbase +
-                       (sci_getreg(port, SCxRDR)->offset << port->regshift);
-               cfg.src_addr_width = DMA_SLAVE_BUSWIDTH_1_BYTE;
-       }
+       cfg.dst_addr = port->mapbase +
+               (sci_getreg(port, SCxTDR)->offset << port->regshift);
+       cfg.dst_addr_width = DMA_SLAVE_BUSWIDTH_1_BYTE;
+       cfg.src_addr = port->mapbase +
+               (sci_getreg(port, SCxRDR)->offset << port->regshift);
+       cfg.src_addr_width = DMA_SLAVE_BUSWIDTH_1_BYTE;
 
        ret = dmaengine_slave_config(chan, &cfg);
        if (ret) {