Skip to content

Commit 605fa1a

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 raspberrypi#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 db467fe commit 605fa1a

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
@@ -900,14 +900,13 @@ static int s3c24xx_serial_request_dma(struct s3c24xx_uart_port *p)
900900
return -ENOMEM;
901901
}
902902

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

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

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

913912
spin_unlock_irqrestore(&p->port.lock, flags);
@@ -921,7 +920,7 @@ static void s3c24xx_serial_release_dma(struct s3c24xx_uart_port *p)
921920

922921
if (dma->rx_chan) {
923922
dmaengine_terminate_all(dma->rx_chan);
924-
dma_unmap_single(dma->rx_chan->device->dev, dma->rx_addr,
923+
dma_unmap_single(p->port.dev, dma->rx_addr,
925924
dma->rx_size, DMA_FROM_DEVICE);
926925
kfree(dma->rx_buf);
927926
dma_release_channel(dma->rx_chan);
@@ -930,7 +929,7 @@ static void s3c24xx_serial_release_dma(struct s3c24xx_uart_port *p)
930929

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

0 commit comments

Comments
 (0)