net: calxedaxgmac: fix rx DMA mapping API size mismatches

Fix the mismatch in the DMA mapping and unmapping sizes for receive. The
unmap size must be equal to the map size and should not be the actual
received frame length. The map size should also be adjusted by the
NET_IP_ALIGN size since the h/w buffer size (dma_buf_sz) includes this
offset.

Also, add a missing dma_mapping_error check in xgmac_rx_refill.

Reported-by: Lennert Buytenhek <buytenh@wantstofly.org>
Signed-off-by: Rob Herring <rob.herring@calxeda.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/calxeda/xgmac.c b/drivers/net/ethernet/calxeda/xgmac.c
index 04c585ce9bfbfbe2cf9e35aec7f5204c8df8cd99..cd5010b4a89c7bcf14551549f3384e987b7dac24 100644 (file)
--- a/drivers/net/ethernet/calxeda/xgmac.c
+++ b/drivers/net/ethernet/calxeda/xgmac.c
@@ -695,9 +695,14 @@ static void xgmac_rx_refill(struct xgmac_priv *priv)
                        if (unlikely(skb == NULL))
                                break;
 
-                       priv->rx_skbuff[entry] = skb;
                        paddr = dma_map_single(priv->device, skb->data,
-                                              bufsz, DMA_FROM_DEVICE);
+                                              priv->dma_buf_sz - NET_IP_ALIGN,
+                                              DMA_FROM_DEVICE);
+                       if (dma_mapping_error(priv->device, paddr)) {
+                               dev_kfree_skb_any(skb);
+                               break;
+                       }
+                       priv->rx_skbuff[entry] = skb;
                        desc_set_buf_addr(p, paddr, priv->dma_buf_sz);
                }
 
@@ -794,13 +799,14 @@ static void xgmac_free_rx_skbufs(struct xgmac_priv *priv)
                return;
 
        for (i = 0; i < DMA_RX_RING_SZ; i++) {
-               if (priv->rx_skbuff[i] == NULL)
+               struct sk_buff *skb = priv->rx_skbuff[i];
+               if (skb == NULL)
                        continue;
 
                p = priv->dma_rx + i;
                dma_unmap_single(priv->device, desc_get_buf_addr(p),
-                                priv->dma_buf_sz, DMA_FROM_DEVICE);
-               dev_kfree_skb_any(priv->rx_skbuff[i]);
+                                priv->dma_buf_sz - NET_IP_ALIGN, DMA_FROM_DEVICE);
+               dev_kfree_skb_any(skb);
                priv->rx_skbuff[i] = NULL;
        }
 }
@@ -1187,7 +1193,7 @@ static int xgmac_rx(struct xgmac_priv *priv, int limit)
 
                skb_put(skb, frame_len);
                dma_unmap_single(priv->device, desc_get_buf_addr(p),
-                                frame_len, DMA_FROM_DEVICE);
+                                priv->dma_buf_sz - NET_IP_ALIGN, DMA_FROM_DEVICE);
 
                skb->protocol = eth_type_trans(skb, priv->dev);
                skb->ip_summed = ip_checksum;