ag71xx driver: add OOM handler

SVN-Revision: 13545

diff --git a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx.h b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx.h
index 80c8e18ab1079d4d3d39d33ebe33e431d863003d..36b6073aa3816a32b3583d59931fe3f5fbea051b 100644 (file)
--- a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx.h
+++ b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx.h
@@ -38,9 +38,10 @@
 #define ETH_FCS_LEN    4
 
 #define AG71XX_DRV_NAME                "ag71xx"
-#define AG71XX_DRV_VERSION     "0.5.12"
+#define AG71XX_DRV_VERSION     "0.5.13"
 
 #define AG71XX_NAPI_WEIGHT     64
+#define AG71XX_OOM_REFILL      (1 + HZ/10)
 
 #define AG71XX_INT_ERR (AG71XX_INT_RX_BE | AG71XX_INT_TX_BE)
 #define AG71XX_INT_TX  (AG71XX_INT_TX_PS)
@@ -127,6 +128,7 @@ struct ag71xx {
        int                     duplex;
 
        struct work_struct      restart_work;
+       struct timer_list       oom_timer;
 };
 
 extern struct ethtool_ops ag71xx_ethtool_ops;

diff --git a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c
index 16cb4ddd3910587084ac3949691be9cb261df873..01f9c03feed1e4c34f24757d2f73958c2f5be6e7 100644 (file)
--- a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c
+++ b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c
@@ -231,11 +231,8 @@ static int ag71xx_ring_rx_refill(struct ag71xx *ag)
                        struct sk_buff *skb;
 
                        skb = dev_alloc_skb(AG71XX_RX_PKT_SIZE);
-                       if (skb == NULL) {
-                               printk(KERN_ERR "%s: no memory for skb\n",
-                                       ag->dev->name);
+                       if (skb == NULL)
                                break;
-                       }
 
                        dma_map_single(NULL, skb->data, AG71XX_RX_PKT_SIZE,
                                        DMA_FROM_DEVICE);
@@ -443,6 +440,7 @@ static int ag71xx_stop(struct net_device *dev)
        ag71xx_phy_stop(ag);
 
        napi_disable(&ag->napi);
+       del_timer_sync(&ag->oom_timer);
 
        spin_unlock_irqrestore(&ag->lock, flags);
 
@@ -551,6 +549,14 @@ static int ag71xx_do_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
        return -EOPNOTSUPP;
 }
 
+static void ag71xx_oom_timer_handler(unsigned long data)
+{
+       struct net_device *dev = (struct net_device *) data;
+       struct ag71xx *ag = netdev_priv(dev);
+
+       netif_rx_schedule(dev, &ag->napi);
+}
+
 static void ag71xx_tx_timeout(struct net_device *dev)
 {
        struct ag71xx *ag = netdev_priv(dev);
@@ -664,6 +670,7 @@ static int ag71xx_poll(struct napi_struct *napi, int limit)
        struct ag71xx *ag = container_of(napi, struct ag71xx, napi);
        struct ag71xx_platform_data *pdata = ag71xx_get_pdata(ag);
        struct net_device *dev = ag->dev;
+       struct ag71xx_ring *rx_ring;
        unsigned long flags;
        u32 status;
        int done;
@@ -674,7 +681,9 @@ static int ag71xx_poll(struct napi_struct *napi, int limit)
        DBG("%s: processing RX ring\n", dev->name);
        done = ag71xx_rx_packets(ag, limit);
 
-       /* TODO: add OOM handler */
+       rx_ring = &ag->rx_ring;
+       if (rx_ring->buf[rx_ring->dirty % AG71XX_RX_RING_SIZE].skb == NULL)
+               goto oom;
 
        status = ag71xx_rr(ag, AG71XX_REG_RX_STATUS);
        if (unlikely(status & RX_STATUS_OF)) {
@@ -702,13 +711,21 @@ static int ag71xx_poll(struct napi_struct *napi, int limit)
                spin_lock_irqsave(&ag->lock, flags);
                ag71xx_int_enable(ag, AG71XX_INT_POLL);
                spin_unlock_irqrestore(&ag->lock, flags);
-               return done;
+               return 0;
        }
 
  more:
        DBG("%s: stay in polling mode, done=%d, limit=%d\n",
                        dev->name, done, limit);
-       return done;
+       return 1;
+
+ oom:
+       if (netif_msg_rx_err(ag))
+               printk(KERN_DEBUG "%s: out of memory\n", dev->name);
+
+       mod_timer(&ag->oom_timer, jiffies + AG71XX_OOM_REFILL);
+       netif_rx_complete(dev, napi);
+       return 0;
 }
 
 static irqreturn_t ag71xx_interrupt(int irq, void *dev_id)
@@ -842,6 +859,10 @@ static int __init ag71xx_probe(struct platform_device *pdev)
        dev->tx_timeout = ag71xx_tx_timeout;
        INIT_WORK(&ag->restart_work, ag71xx_restart_work_func);
 
+       init_timer(&ag->oom_timer);
+       ag->oom_timer.data = (unsigned long) dev;
+       ag->oom_timer.function = ag71xx_oom_timer_handler;
+
        netif_napi_add(dev, &ag->napi, ag71xx_poll, AG71XX_NAPI_WEIGHT);
 
        if (is_valid_ether_addr(pdata->mac_addr))