Skip to content

Commit 43a1c1f

Browse files
mszyprowgregkh
authored andcommitted
serial: samsung: Use right device for DMA-mapping calls
commit 768d64f upstream. Driver should provide its own struct device for all DMA-mapping calls instead of extracting device pointer from DMA engine channel. Although this is harmless from the driver operation perspective on ARM architecture, it is always good to use the DMA mapping API in a proper way. This patch fixes following DMA API debug warning: WARNING: CPU: 0 PID: 0 at lib/dma-debug.c:1241 check_sync+0x520/0x9f4 samsung-uart 12c20000.serial: DMA-API: device driver tries to sync DMA memory it has not allocated [device address=0x000000006df0f580] [size=64 bytes] Modules linked in: CPU: 0 PID: 0 Comm: swapper/0 Not tainted 4.11.0-rc1-00137-g07ca963 #51 Hardware name: SAMSUNG EXYNOS (Flattened Device Tree) [<c011aaa4>] (unwind_backtrace) from [<c01127c0>] (show_stack+0x20/0x24) [<c01127c0>] (show_stack) from [<c06ba5d8>] (dump_stack+0x84/0xa0) [<c06ba5d8>] (dump_stack) from [<c0139528>] (__warn+0x14c/0x180) [<c0139528>] (__warn) from [<c01395a4>] (warn_slowpath_fmt+0x48/0x50) [<c01395a4>] (warn_slowpath_fmt) from [<c0729058>] (check_sync+0x520/0x9f4) [<c0729058>] (check_sync) from [<c072967c>] (debug_dma_sync_single_for_device+0x88/0xc8) [<c072967c>] (debug_dma_sync_single_for_device) from [<c0803c10>] (s3c24xx_serial_start_tx_dma+0x100/0x2f8) [<c0803c10>] (s3c24xx_serial_start_tx_dma) from [<c0804338>] (s3c24xx_serial_tx_chars+0x198/0x33c) Reported-by: Seung-Woo Kim <[email protected]> Fixes: 62c37ee ("serial: samsung: add dma reqest/release functions") Signed-off-by: Marek Szyprowski <[email protected]> Reviewed-by: Bartlomiej Zolnierkiewicz <[email protected]> Reviewed-by: Krzysztof Kozlowski <[email protected]> Reviewed-by: Shuah Khan <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent ab62f41 commit 43a1c1f

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

drivers/tty/serial/samsung.c

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -901,14 +901,13 @@ static int s3c24xx_serial_request_dma(struct s3c24xx_uart_port *p)
901901
return -ENOMEM;
902902
}
903903

904-
dma->rx_addr = dma_map_single(dma->rx_chan->device->dev, dma->rx_buf,
904+
dma->rx_addr = dma_map_single(p->port.dev, dma->rx_buf,
905905
dma->rx_size, DMA_FROM_DEVICE);
906906

907907
spin_lock_irqsave(&p->port.lock, flags);
908908

909909
/* TX buffer */
910-
dma->tx_addr = dma_map_single(dma->tx_chan->device->dev,
911-
p->port.state->xmit.buf,
910+
dma->tx_addr = dma_map_single(p->port.dev, p->port.state->xmit.buf,
912911
UART_XMIT_SIZE, DMA_TO_DEVICE);
913912

914913
spin_unlock_irqrestore(&p->port.lock, flags);
@@ -922,7 +921,7 @@ static void s3c24xx_serial_release_dma(struct s3c24xx_uart_port *p)
922921

923922
if (dma->rx_chan) {
924923
dmaengine_terminate_all(dma->rx_chan);
925-
dma_unmap_single(dma->rx_chan->device->dev, dma->rx_addr,
924+
dma_unmap_single(p->port.dev, dma->rx_addr,
926925
dma->rx_size, DMA_FROM_DEVICE);
927926
kfree(dma->rx_buf);
928927
dma_release_channel(dma->rx_chan);
@@ -931,7 +930,7 @@ static void s3c24xx_serial_release_dma(struct s3c24xx_uart_port *p)
931930

932931
if (dma->tx_chan) {
933932
dmaengine_terminate_all(dma->tx_chan);
934-
dma_unmap_single(dma->tx_chan->device->dev, dma->tx_addr,
933+
dma_unmap_single(p->port.dev, dma->tx_addr,
935934
UART_XMIT_SIZE, DMA_TO_DEVICE);
936935
dma_release_channel(dma->tx_chan);
937936
dma->tx_chan = NULL;

0 commit comments

Comments
 (0)