3.16.40-rc1 review patch. If anyone has any objections, please let me know.
------------------ From: Florian Fainelli <[email protected]> commit 8c4799ac799665065f9bf1364fd71bf4f7dc6a4a upstream. __bcmgenet_tx_reclaim() and bcmgenet_free_rx_buffers() are not using the same struct device during unmap that was used for the map operation, which makes DMA-API debugging warn about it. Fix this by always using &priv->pdev->dev throughout the driver, using an identical device reference for all map/unmap calls. Fixes: 1c1008c793fa ("net: bcmgenet: add main driver file") Signed-off-by: Florian Fainelli <[email protected]> Signed-off-by: David S. Miller <[email protected]> [bwh: Backported to 3.16: - Adjust context - Also fix call from bcmgenet_desc_rx(), fixed upstream in commit d6707bec5986 "net: bcmgenet: rewrite bcmgenet_rx_refill()"] Signed-off-by: Ben Hutchings <[email protected]> --- drivers/net/ethernet/broadcom/genet/bcmgenet.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) --- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c +++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c @@ -878,6 +878,7 @@ static void __bcmgenet_tx_reclaim(struct struct bcmgenet_tx_ring *ring) { struct bcmgenet_priv *priv = netdev_priv(dev); + struct device *kdev = &priv->pdev->dev; int last_tx_cn, last_c_index, num_tx_bds; struct enet_cb *tx_cb_ptr; struct netdev_queue *txq; @@ -907,7 +908,7 @@ static void __bcmgenet_tx_reclaim(struct tx_cb_ptr = ring->cbs + last_c_index; if (tx_cb_ptr->skb) { dev->stats.tx_bytes += tx_cb_ptr->skb->len; - dma_unmap_single(&dev->dev, + dma_unmap_single(kdev, dma_unmap_addr(tx_cb_ptr, dma_addr), dma_unmap_len(tx_cb_ptr, dma_len), DMA_TO_DEVICE); @@ -915,7 +916,7 @@ static void __bcmgenet_tx_reclaim(struct } else if (dma_unmap_addr(tx_cb_ptr, dma_addr)) { dev->stats.tx_bytes += dma_unmap_len(tx_cb_ptr, dma_len); - dma_unmap_page(&dev->dev, + dma_unmap_page(kdev, dma_unmap_addr(tx_cb_ptr, dma_addr), dma_unmap_len(tx_cb_ptr, dma_len), DMA_TO_DEVICE); @@ -1257,6 +1258,7 @@ static unsigned int bcmgenet_desc_rx(str unsigned int budget) { struct net_device *dev = priv->dev; + struct device *kdev = &priv->pdev->dev; struct enet_cb *cb; struct sk_buff *skb; u32 dma_length_status; @@ -1288,7 +1290,7 @@ static unsigned int bcmgenet_desc_rx(str */ cb = &priv->rx_cbs[priv->rx_read_ptr]; skb = cb->skb; - dma_unmap_single(&dev->dev, dma_unmap_addr(cb, dma_addr), + dma_unmap_single(kdev, dma_unmap_addr(cb, dma_addr), priv->rx_buf_len, DMA_FROM_DEVICE); if (!priv->desc_64b_en) { @@ -1428,6 +1430,7 @@ static int bcmgenet_alloc_rx_buffers(str static void bcmgenet_free_rx_buffers(struct bcmgenet_priv *priv) { + struct device *kdev = &priv->pdev->dev; struct enet_cb *cb; int i; @@ -1435,7 +1438,7 @@ static void bcmgenet_free_rx_buffers(str cb = &priv->rx_cbs[i]; if (dma_unmap_addr(cb, dma_addr)) { - dma_unmap_single(&priv->dev->dev, + dma_unmap_single(kdev, dma_unmap_addr(cb, dma_addr), priv->rx_buf_len, DMA_FROM_DEVICE); dma_unmap_addr_set(cb, dma_addr, 0);
