git.ipfire.org Git - thirdparty/kernel/stable-queue.git/blob

   1 From foo@baz Sat 28 Dec 2019 05:57:33 AM EST
   2 From: Grygorii Strashko <grygorii.strashko@ti.com>
   3 Date: Mon, 9 Dec 2019 13:19:24 +0200
   4 Subject: net: ethernet: ti: davinci_cpdma: fix warning "device driver frees DMA memory with different size"
   5
   6 From: Grygorii Strashko <grygorii.strashko@ti.com>
   7
   8 [ Upstream commit 8a2b22203f8596729c54eba221b4044351bfe167 ]
   9
  10 The TI CPSW(s) driver produces warning with DMA API debug options enabled:
  11
  12 WARNING: CPU: 0 PID: 1033 at kernel/dma/debug.c:1025 check_unmap+0x4a8/0x968
  13 DMA-API: cpsw 48484000.ethernet: device driver frees DMA memory with different size
  14  [device address=0x00000000abc6aa02] [map size=64 bytes] [unmap size=42 bytes]
  15 CPU: 0 PID: 1033 Comm: ping Not tainted 5.3.0-dirty #41
  16 Hardware name: Generic DRA72X (Flattened Device Tree)
  17 [<c0112c60>] (unwind_backtrace) from [<c010d270>] (show_stack+0x10/0x14)
  18 [<c010d270>] (show_stack) from [<c09bc564>] (dump_stack+0xd8/0x110)
  19 [<c09bc564>] (dump_stack) from [<c013b93c>] (__warn+0xe0/0x10c)
  20 [<c013b93c>] (__warn) from [<c013b9ac>] (warn_slowpath_fmt+0x44/0x6c)
  21 [<c013b9ac>] (warn_slowpath_fmt) from [<c01e0368>] (check_unmap+0x4a8/0x968)
  22 [<c01e0368>] (check_unmap) from [<c01e08a8>] (debug_dma_unmap_page+0x80/0x90)
  23 [<c01e08a8>] (debug_dma_unmap_page) from [<c0752414>] (__cpdma_chan_free+0x114/0x16c)
  24 [<c0752414>] (__cpdma_chan_free) from [<c07525c4>] (__cpdma_chan_process+0x158/0x17c)
  25 [<c07525c4>] (__cpdma_chan_process) from [<c0753690>] (cpdma_chan_process+0x3c/0x5c)
  26 [<c0753690>] (cpdma_chan_process) from [<c0758660>] (cpsw_tx_mq_poll+0x48/0x94)
  27 [<c0758660>] (cpsw_tx_mq_poll) from [<c0803018>] (net_rx_action+0x108/0x4e4)
  28 [<c0803018>] (net_rx_action) from [<c010230c>] (__do_softirq+0xec/0x598)
  29 [<c010230c>] (__do_softirq) from [<c0143914>] (do_softirq.part.4+0x68/0x74)
  30 [<c0143914>] (do_softirq.part.4) from [<c0143a44>] (__local_bh_enable_ip+0x124/0x17c)
  31 [<c0143a44>] (__local_bh_enable_ip) from [<c0871590>] (ip_finish_output2+0x294/0xb7c)
  32 [<c0871590>] (ip_finish_output2) from [<c0875440>] (ip_output+0x210/0x364)
  33 [<c0875440>] (ip_output) from [<c0875e2c>] (ip_send_skb+0x1c/0xf8)
  34 [<c0875e2c>] (ip_send_skb) from [<c08a7fd4>] (raw_sendmsg+0x9a8/0xc74)
  35 [<c08a7fd4>] (raw_sendmsg) from [<c07d6b90>] (sock_sendmsg+0x14/0x24)
  36 [<c07d6b90>] (sock_sendmsg) from [<c07d8260>] (__sys_sendto+0xbc/0x100)
  37 [<c07d8260>] (__sys_sendto) from [<c01011ac>] (__sys_trace_return+0x0/0x14)
  38 Exception stack(0xea9a7fa8 to 0xea9a7ff0)
  39 ...
  40
  41 The reason is that cpdma_chan_submit_si() now stores original buffer length
  42 (sw_len) in CPDMA descriptor instead of adjusted buffer length (hw_len)
  43 used to map the buffer.
  44
  45 Hence, fix an issue by passing correct buffer length in CPDMA descriptor.
  46
  47 Cc: Ivan Khoronzhuk <ivan.khoronzhuk@linaro.org>
  48 Fixes: 6670acacd59e ("net: ethernet: ti: davinci_cpdma: add dma mapped submit")
  49 Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>
  50 Reviewed-by: Ivan Khoronzhuk <ivan.khoronzhuk@linaro.org>
  51 Signed-off-by: David S. Miller <davem@davemloft.net>
  52 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  53 ---
  54  drivers/net/ethernet/ti/davinci_cpdma.c |    5 ++---
  55  1 file changed, 2 insertions(+), 3 deletions(-)
  56
  57 --- a/drivers/net/ethernet/ti/davinci_cpdma.c
  58 +++ b/drivers/net/ethernet/ti/davinci_cpdma.c
  59 @@ -1018,7 +1018,6 @@ static int cpdma_chan_submit_si(struct s
  60         struct cpdma_chan               *chan = si->chan;
  61         struct cpdma_ctlr               *ctlr = chan->ctlr;
  62         int                             len = si->len;
  63 -       int                             swlen = len;
  64         struct cpdma_desc __iomem       *desc;
  65         dma_addr_t                      buffer;
  66         u32                             mode;
  67 @@ -1046,7 +1045,6 @@ static int cpdma_chan_submit_si(struct s
  68         if (si->data_dma) {
  69                 buffer = si->data_dma;
  70                 dma_sync_single_for_device(ctlr->dev, buffer, len, chan->dir);
  71 -               swlen |= CPDMA_DMA_EXT_MAP;
  72         } else {
  73                 buffer = dma_map_single(ctlr->dev, si->data_virt, len, chan->dir);
  74                 ret = dma_mapping_error(ctlr->dev, buffer);
  75 @@ -1065,7 +1063,8 @@ static int cpdma_chan_submit_si(struct s
  76         writel_relaxed(mode | len, &desc->hw_mode);
  77         writel_relaxed((uintptr_t)si->token, &desc->sw_token);
  78         writel_relaxed(buffer, &desc->sw_buffer);
  79 -       writel_relaxed(swlen, &desc->sw_len);
  80 +       writel_relaxed(si->data_dma ? len | CPDMA_DMA_EXT_MAP : len,
  81 +                      &desc->sw_len);
  82         desc_read(desc, sw_len);
  83
  84         __cpdma_chan_submit(chan, desc);