Changeset 14614

Timestamp:

06/16/10 23:51:04 (3 years ago)

Author:

BrainSlayer

Message:

fix reset problems which could cause wds bridge problems

Location:

src/linux/pb42/linux-2.6.23/drivers/net

Files:

• ag7100/ag7100.c (modified) (6 diffs)
• ag7240/ag7240.c (modified) (10 diffs)
• ag7240/ag7240.h (modified) (2 diffs)

src/linux/pb42/linux-2.6.23/drivers/net/ag7100/ag7100.c

@@ -1560 +1560 @@
         if (ag7100_rx_owned_by_dma(ds))
         {
+            break;
+#if 0
             if(quota == iquota)
             {
@@ -1566 +1568 @@
             }
             break;
+#endif
         }
         ag7100_intr_ack_rx(mac);
@@ -1672 +1675 @@
         quota--;
 
+#if defined(CONFIG_PHY_LAYER)
         if (mac->rx)
             mac->rx(skb);
         else
+#endif
             {
             skb->protocol       = eth_type_trans(skb, dev);
@@ -1684 +1689 @@
     }
 
+#if 0
     if(quota == iquota)
     {
@@ -1689 +1695 @@
         return AG7100_RX_DMA_HANG;
     }
-
+#endif
     r->ring_head   =  head;
-
+#if 0
     rep = ag7100_rx_replenish(mac);
     if(rep < 0)
@@ -1698 +1704 @@
         return AG7100_RX_DMA_HANG;
     }
+#endif
     /*
     * let's see what changed while we were slogging.

src/linux/pb42/linux-2.6.23/drivers/net/ag7240/ag7240.c

@@ -1412 +1412 @@
 }
 
+void ag7240_dma_reset(ag7240_mac_t *mac)
+{
+    uint32_t mask;
+
+    if(mac->mac_unit)
+        mask = AR7240_RESET_GE1_MAC;
+    else
+        mask = AR7240_RESET_GE0_MAC;
+
+    ar7240_reg_rmw_set(AR7240_RESET, mask);
+    mdelay(100);
+    ar7240_reg_rmw_clear(AR7240_RESET, mask);
+    mdelay(100);
+
+    ag7240_intr_disable_recv(mac);
+    schedule_work(&mac->mac_tx_timeout);
+}
+
+
 static int
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24)
@@ -1444 +1463 @@
     dev->quota  -= work_done;
     *budget     -= work_done;
-    netif_rx_complete(dev);
     if (likely(ret == AG7240_RX_STATUS_DONE))
     {
-        ag7240_intr_enable_recv(mac);
-    }
-#endif
+        netif_rx_complete(dev);
+    }
+#endif
+    if(ret == AG7240_RX_DMA_HANG)
+    {
+        status = 0;
+        ag7240_dma_reset(mac);
+    }
     if (likely(ret == AG7240_RX_STATUS_NOT_DONE))
     {
@@ -1492 +1515 @@
     ag7240_trc(status,"status");
 
-    /* Dont assert these bits if the DMA check has passed. The DMA
-     * check will clear these bits if a hang condition is detected
-     * on resetting the MAC.
-     */ 
-#ifdef CHECK_DMA_STATUS
-    if(mac->dma_check == 0) {
-        assert((status & AG7240_RX_STATUS_PKT_RCVD));
-        assert((status >> 16));
-    }
-    else
-        mac->dma_check = 0;
-#endif
     /*
     * Flush the DDR FIFOs for our gmac
@@ -1520 +1531 @@
         if (ag7240_rx_owned_by_dma(ds))
         {
-            assert(quota != iquota); /* WCL */
-            break;
+            break;
+/*            if(quota == iquota)
+            {
+                *work_done = quota = 0;
+                return AG7240_RX_DMA_HANG;
+            }
+            break;*/
         }
         ag7240_intr_ack_rx(mac);
@@ -1600 +1616 @@
     }
 
-    assert(iquota != quota);
+/*    if(quota == iquota)
+    {
+        *work_done = quota = 0;
+        return AG7240_RX_DMA_HANG;
+    }*/
     r->ring_head   =  head;
 
     rep = ag7240_rx_replenish(mac);
+/*    if(rep < 0)
+    {
+        *work_done =0 ;
+        return AG7240_RX_DMA_HANG;
+    }*/
 
     /*
@@ -1687 +1712 @@
         ag7240_trc(ds,"ds");
 
-        assert(!ag7240_rx_owned_by_dma(ds));
-
+        if(ag7240_rx_owned_by_dma(ds))
+        {
+            return -1;
+        }
         assert(!bf->buf_pkt);
 
@@ -1988 +2015 @@
 }
 
-#ifdef CHECK_DMA_STATUS
 static void
 ag7240_tx_timeout(struct net_device *dev)
@@ -2006 +2032 @@
     ag7240_mac_t *mac = container_of(work, ag7240_mac_t, mac_tx_timeout);
     ag7240_trc(mac,"mac");
-    check_for_dma_status(mac);
-}
-#endif
+    ag7240_stop(mac->mac_dev);
+    ag7240_open(mac->mac_dev);
+}
 
 static void
@@ -2194 +2220 @@
         */
 
-#ifdef CHECK_DMA_STATUS
         INIT_WORK(&mac->mac_tx_timeout, ag7240_tx_timeout_task);
-#endif
 
         dev = alloc_etherdev(0);
@@ -2219 +2243 @@
         dev->weight          =  AG7240_NAPI_WEIGHT;
 #endif
-#ifdef CHECK_DMA_STATUS
         dev->tx_timeout      =  ag7240_tx_timeout;
-#endif
         dev->priv            =  mac;
 

src/linux/pb42/linux-2.6.23/drivers/net/ag7240/ag7240.h

@@ -146 +146 @@
     spinlock_t              mac_lock;
     struct timer_list       mac_oom_timer;
-#ifdef CHECK_DMA_STATUS
     struct work_struct      mac_tx_timeout;
-#endif
     struct net_device_stats mac_net_stats;
     ag7240_phy_speed_t      mac_speed;
@@ -178 +176 @@
     AG7240_RX_STATUS_NOT_DONE,
     AG7240_RX_STATUS_OOM,
-#ifdef CONFIG_AR9100
     AG7240_RX_DMA_HANG
-#endif
 }ag7240_rx_status_t;