gianfar: Fix dma check map error when DMA_API_DEBUG is enabled

We need to use dma_mapping_error() to check the dma address returned
by dma_map_single/page(). Otherwise we would get warning like this:
  WARNING: at lib/dma-debug.c:1140
  Modules linked in:
  CPU: 0 PID: 0 Comm: swapper/0 Not tainted 3.18.0-rc2-next-20141029 #196
  task: c0834300 ti: effe6000 task.ti: c0874000
  NIP: c02b2c98 LR: c02b2c98 CTR: c030abc4
  REGS: effe7d70 TRAP: 0700   Not tainted  (3.18.0-rc2-next-20141029)
  MSR: 00021000 <CE,ME>  CR: 22044022  XER: 20000000

  GPR00: c02b2c98 effe7e20 c0834300 00000098 00021000 00000000 c030b898 00000003
  GPR08: 00000001 00000000 00000001 749eec9d 22044022 1001abe0 00000020 ef278678
  GPR16: ef278670 ef278668 ef278660 070a8040 c087f99c c08cdc60 00029000 c0840d44
  GPR24: c08be6e8 c0840000 effe7e78 ef041340 00000600 ef114e10 00000000 c08be6e0
  NIP [c02b2c98] check_unmap+0x51c/0x9e4
  LR [c02b2c98] check_unmap+0x51c/0x9e4
  Call Trace:
  [effe7e20] [c02b2c98] check_unmap+0x51c/0x9e4 (unreliable)
  [effe7e70] [c02b31d8] debug_dma_unmap_page+0x78/0x8c
  [effe7ed0] [c03d1640] gfar_clean_rx_ring+0x208/0x488
  [effe7f40] [c03d1a9c] gfar_poll_rx_sq+0x3c/0xa8
  [effe7f60] [c04f8714] net_rx_action+0xc0/0x178
  [effe7f90] [c00435a0] __do_softirq+0x100/0x1fc
  [effe7fe0] [c0043958] irq_exit+0xa4/0xc8
  [effe7ff0] [c000d14c] call_do_irq+0x24/0x3c
  [c0875e90] [c00048a0] do_IRQ+0x8c/0xf8
  [c0875eb0] [c000ed10] ret_from_except+0x0/0x18

For TX, we need to unmap the pages which has already been mapped and
free the skb before return.

For RX, move the dma mapping and error check to gfar_new_skb(). We
would reuse the original skb in the rx ring when either allocating
skb failure or dma mapping error.

Signed-off-by: Kevin Hao <haokexin@gmail.com>
Signed-off-by: Claudiu Manoil <claudiu.manoil@freescale.com>
Reviewed-by: Claudiu Manoil <claudiu.manoil@freescale.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 56 insertions, 28 deletions

diff --git a/drivers/net/ethernet/freescale/gianfar.c b/drivers/net/ethernet/freescale/gianfar.c
index 86dccb26fecc..7402ab12e46b 100644
--- a/drivers/net/ethernet/freescale/gianfar.c
+++ b/drivers/net/ethernet/freescale/gianfar.c
@@ -116,9 +116,7 @@ static int gfar_start_xmit(struct sk_buff *skb, struct net_device *dev);
 static void gfar_reset_task(struct work_struct *work);
 static void gfar_timeout(struct net_device *dev);
 static int gfar_close(struct net_device *dev);
-struct sk_buff *gfar_new_skb(struct net_device *dev);
-static void gfar_new_rxbdp(struct gfar_priv_rx_q *rx_queue, struct rxbd8 *bdp,
-                           struct sk_buff *skb);
+struct sk_buff *gfar_new_skb(struct net_device *dev, dma_addr_t *bufaddr);
 static int gfar_set_mac_address(struct net_device *dev);
 static int gfar_change_mtu(struct net_device *dev, int new_mtu);
 static irqreturn_t gfar_error(int irq, void *dev_id);
@@ -180,6 +178,7 @@ static int gfar_init_bds(struct net_device *ndev)
         struct rxbd8 *rxbdp;
         u32 *rfbptr;
         int i, j;
+        dma_addr_t bufaddr;
 
         for (i = 0; i < priv->num_tx_queues; i++) {
                 tx_queue = priv->tx_queue[i];
@@ -214,19 +213,17 @@ static int gfar_init_bds(struct net_device *ndev)
                         struct sk_buff *skb = rx_queue->rx_skbuff[j];
 
                         if (skb) {
-                                gfar_init_rxbdp(rx_queue, rxbdp,
-                                                rxbdp->bufPtr);
+                                bufaddr = rxbdp->bufPtr;
                         } else {
-                                skb = gfar_new_skb(ndev);
+                                skb = gfar_new_skb(ndev, &bufaddr);
                                 if (!skb) {
                                         netdev_err(ndev, "Can't allocate RX buffers\n");
                                         return -ENOMEM;
                                 }
                                 rx_queue->rx_skbuff[j] = skb;
-
-                                gfar_new_rxbdp(rx_queue, rxbdp, skb);
                         }
 
+                        gfar_init_rxbdp(rx_queue, rxbdp, bufaddr);
                         rxbdp++;
                 }
 
@@ -2319,6 +2316,8 @@ static int gfar_start_xmit(struct sk_buff *skb, struct net_device *dev)
                                                    0,
                                                    frag_len,
                                                    DMA_TO_DEVICE);
+                        if (unlikely(dma_mapping_error(priv->dev, bufaddr)))
+                                goto dma_map_err;
 
                         /* set the TxBD length and buffer pointer */
                         txbdp->bufPtr = bufaddr;
@@ -2368,8 +2367,12 @@ static int gfar_start_xmit(struct sk_buff *skb, struct net_device *dev)
                 fcb->ptp = 1;
         }
 
-        txbdp_start->bufPtr = dma_map_single(priv->dev, skb->data,
-                                             skb_headlen(skb), DMA_TO_DEVICE);
+        bufaddr = dma_map_single(priv->dev, skb->data, skb_headlen(skb),
+                                 DMA_TO_DEVICE);
+        if (unlikely(dma_mapping_error(priv->dev, bufaddr)))
+                goto dma_map_err;
+
+        txbdp_start->bufPtr = bufaddr;
 
         /* If time stamping is requested one additional TxBD must be set up. The
          * first TxBD points to the FCB and must have a data length of
@@ -2435,6 +2438,25 @@ static int gfar_start_xmit(struct sk_buff *skb, struct net_device *dev)
         spin_unlock_irqrestore(&tx_queue->txlock, flags);
 
         return NETDEV_TX_OK;
+
+dma_map_err:
+        txbdp = next_txbd(txbdp_start, base, tx_queue->tx_ring_size);
+        if (do_tstamp)
+                txbdp = next_txbd(txbdp, base, tx_queue->tx_ring_size);
+        for (i = 0; i < nr_frags; i++) {
+                lstatus = txbdp->lstatus;
+                if (!(lstatus & BD_LFLAG(TXBD_READY)))
+                        break;
+
+                txbdp->lstatus = lstatus & ~BD_LFLAG(TXBD_READY);
+                bufaddr = txbdp->bufPtr;
+                dma_unmap_page(priv->dev, bufaddr, txbdp->length,
+                               DMA_TO_DEVICE);
+                txbdp = next_txbd(txbdp, base, tx_queue->tx_ring_size);
+        }
+        gfar_wmb();
+        dev_kfree_skb_any(skb);
+        return NETDEV_TX_OK;
 }
 
 /* Stops the kernel queue, and halts the controller */
@@ -2635,18 +2657,6 @@ static void gfar_clean_tx_ring(struct gfar_priv_tx_q *tx_queue)
         netdev_tx_completed_queue(txq, howmany, bytes_sent);
 }
 
-static void gfar_new_rxbdp(struct gfar_priv_rx_q *rx_queue, struct rxbd8 *bdp,
-                           struct sk_buff *skb)
-{
-        struct net_device *dev = rx_queue->dev;
-        struct gfar_private *priv = netdev_priv(dev);
-        dma_addr_t buf;
-
-        buf = dma_map_single(priv->dev, skb->data,
-                             priv->rx_buffer_size, DMA_FROM_DEVICE);
-        gfar_init_rxbdp(rx_queue, bdp, buf);
-}
-
 static struct sk_buff *gfar_alloc_skb(struct net_device *dev)
 {
         struct gfar_private *priv = netdev_priv(dev);
@@ -2661,9 +2671,25 @@ static struct sk_buff *gfar_alloc_skb(struct net_device *dev)
         return skb;
 }
 
-struct sk_buff *gfar_new_skb(struct net_device *dev)
+struct sk_buff *gfar_new_skb(struct net_device *dev, dma_addr_t *bufaddr)
 {
-        return gfar_alloc_skb(dev);
+        struct gfar_private *priv = netdev_priv(dev);
+        struct sk_buff *skb;
+        dma_addr_t addr;
+
+        skb = gfar_alloc_skb(dev);
+        if (!skb)
+                return NULL;
+
+        addr = dma_map_single(priv->dev, skb->data,
+                              priv->rx_buffer_size, DMA_FROM_DEVICE);
+        if (unlikely(dma_mapping_error(priv->dev, addr))) {
+                dev_kfree_skb_any(skb);
+                return NULL;
+        }
+
+        *bufaddr = addr;
+        return skb;
 }
 
 static inline void count_errors(unsigned short status, struct net_device *dev)
@@ -2834,11 +2860,12 @@ int gfar_clean_rx_ring(struct gfar_priv_rx_q *rx_queue, int rx_work_limit)
 
         while (!((bdp->status & RXBD_EMPTY) || (--rx_work_limit < 0))) {
                 struct sk_buff *newskb;
+                dma_addr_t bufaddr;
 
                 rmb();
 
                 /* Add another skb for the future */
-                newskb = gfar_new_skb(dev);
+                newskb = gfar_new_skb(dev, &bufaddr);
 
                 skb = rx_queue->rx_skbuff[rx_queue->skb_currx];
 
@@ -2854,9 +2881,10 @@ int gfar_clean_rx_ring(struct gfar_priv_rx_q *rx_queue, int rx_work_limit)
                              bdp->status & RXBD_ERR)) {
                         count_errors(bdp->status, dev);
 
-                        if (unlikely(!newskb))
+                        if (unlikely(!newskb)) {
                                 newskb = skb;
-                        else if (skb)
+                                bufaddr = bdp->bufPtr;
+                        } else if (skb)
                                 dev_kfree_skb(skb);
                 } else {
                         /* Increment the number of packets */
@@ -2883,7 +2911,7 @@ int gfar_clean_rx_ring(struct gfar_priv_rx_q *rx_queue, int rx_work_limit)
                 rx_queue->rx_skbuff[rx_queue->skb_currx] = newskb;
 
                 /* Setup the new bdp */
-                gfar_new_rxbdp(rx_queue, bdp, newskb);
+                gfar_init_rxbdp(rx_queue, bdp, bufaddr);
 
                 /* Update Last Free RxBD pointer for LFC */
                 if (unlikely(rx_queue->rfbptr && priv->tx_actual_en))