1 files changed, 36 insertions, 43 deletions

diff --git a/drivers/net/tc35815.c b/drivers/net/tc35815.c
index d737f6b8f876..d1298e5b72c5 100644
--- a/drivers/net/tc35815.c
+++ b/drivers/net/tc35815.c
@@ -23,9 +23,9 @@
  */
 
 #ifdef TC35815_NAPI
-#define DRV_VERSION     "1.37-NAPI"
+#define DRV_VERSION     "1.38-NAPI"
 #else
-#define DRV_VERSION     "1.37"
+#define DRV_VERSION     "1.38"
 #endif
 static const char *version = "tc35815.c:v" DRV_VERSION "\n";
 #define MODNAME                 "tc35815"
@@ -341,8 +341,9 @@ struct BDesc {
         Tx_EnExColl | Tx_EnLCarr | Tx_EnExDefer | Tx_EnUnder | \
         Tx_En)  /* maybe  0x7b01 */
 #endif
+/* Do not use Rx_StripCRC -- it causes trouble on BLEx/FDAEx condition */
 #define RX_CTL_CMD      (Rx_EnGood | Rx_EnRxPar | Rx_EnLongErr | Rx_EnOver \
-        | Rx_EnCRCErr | Rx_EnAlign | Rx_StripCRC | Rx_RxEn) /* maybe 0x6f11 */
+        | Rx_EnCRCErr | Rx_EnAlign | Rx_RxEn) /* maybe 0x6f01 */
 #define INT_EN_CMD  (Int_NRAbtEn | \
         Int_DmParErrEn | Int_DParDEn | Int_DParErrEn | \
         Int_SSysErrEn  | Int_RMasAbtEn | Int_RTargAbtEn | \
@@ -593,9 +594,10 @@ static int tc_mdio_read(struct mii_bus *bus, int mii_id, int regnum)
         struct net_device *dev = bus->priv;
         struct tc35815_regs __iomem *tr =
                 (struct tc35815_regs __iomem *)dev->base_addr;
-        unsigned long timeout = jiffies + 10;
+        unsigned long timeout = jiffies + HZ;
 
         tc_writel(MD_CA_Busy | (mii_id << 5) | (regnum & 0x1f), &tr->MD_CA);
+        udelay(12); /* it takes 32 x 400ns at least */
         while (tc_readl(&tr->MD_CA) & MD_CA_Busy) {
                 if (time_after(jiffies, timeout))
                         return -EIO;
@@ -609,11 +611,12 @@ static int tc_mdio_write(struct mii_bus *bus, int mii_id, int regnum, u16 val)
         struct net_device *dev = bus->priv;
         struct tc35815_regs __iomem *tr =
                 (struct tc35815_regs __iomem *)dev->base_addr;
-        unsigned long timeout = jiffies + 10;
+        unsigned long timeout = jiffies + HZ;
 
         tc_writel(val, &tr->MD_Data);
         tc_writel(MD_CA_Busy | MD_CA_Wr | (mii_id << 5) | (regnum & 0x1f),
                   &tr->MD_CA);
+        udelay(12); /* it takes 32 x 400ns at least */
         while (tc_readl(&tr->MD_CA) & MD_CA_Busy) {
                 if (time_after(jiffies, timeout))
                         return -EIO;
@@ -1509,7 +1512,7 @@ static int tc35815_send_packet(struct sk_buff *skb, struct net_device *dev)
          */
 
         spin_unlock_irqrestore(&lp->lock, flags);
-        return 0;
+        return NETDEV_TX_OK;
 }
 
 #define FATAL_ERROR_INT \
@@ -1540,8 +1543,6 @@ static int tc35815_do_interrupt(struct net_device *dev, u32 status)
 #endif
 {
         struct tc35815_local *lp = netdev_priv(dev);
-        struct tc35815_regs __iomem *tr =
-                (struct tc35815_regs __iomem *)dev->base_addr;
         int ret = -1;
 
         /* Fatal errors... */
@@ -1551,27 +1552,26 @@ static int tc35815_do_interrupt(struct net_device *dev, u32 status)
         }
         /* recoverable errors */
         if (status & Int_IntFDAEx) {
-                /* disable FDAEx int. (until we make rooms...) */
-                tc_writel(tc_readl(&tr->Int_En) & ~Int_FDAExEn, &tr->Int_En);
-                printk(KERN_WARNING
-                       "%s: Free Descriptor Area Exhausted (%#x).\n",
-                       dev->name, status);
+                if (netif_msg_rx_err(lp))
+                        dev_warn(&dev->dev,
+                                 "Free Descriptor Area Exhausted (%#x).\n",
+                                 status);
                 dev->stats.rx_dropped++;
                 ret = 0;
         }
         if (status & Int_IntBLEx) {
-                /* disable BLEx int. (until we make rooms...) */
-                tc_writel(tc_readl(&tr->Int_En) & ~Int_BLExEn, &tr->Int_En);
-                printk(KERN_WARNING
-                       "%s: Buffer List Exhausted (%#x).\n",
-                       dev->name, status);
+                if (netif_msg_rx_err(lp))
+                        dev_warn(&dev->dev,
+                                 "Buffer List Exhausted (%#x).\n",
+                                 status);
                 dev->stats.rx_dropped++;
                 ret = 0;
         }
         if (status & Int_IntExBD) {
-                printk(KERN_WARNING
-                       "%s: Excessive Buffer Descriptiors (%#x).\n",
-                       dev->name, status);
+                if (netif_msg_rx_err(lp))
+                        dev_warn(&dev->dev,
+                                 "Excessive Buffer Descriptiors (%#x).\n",
+                                 status);
                 dev->stats.rx_length_errors++;
                 ret = 0;
         }
@@ -1630,8 +1630,12 @@ static irqreturn_t tc35815_interrupt(int irq, void *dev_id)
 
         spin_lock(&lp->lock);
         status = tc_readl(&tr->Int_Src);
-        tc_writel(status, &tr->Int_Src);        /* write to clear */
+        /* BLEx, FDAEx will be cleared later */
+        tc_writel(status & ~(Int_BLEx | Int_FDAEx),
+                  &tr->Int_Src);        /* write to clear */
         handled = tc35815_do_interrupt(dev, status);
+        if (status & (Int_BLEx | Int_FDAEx))
+                tc_writel(status & (Int_BLEx | Int_FDAEx), &tr->Int_Src);
         (void)tc_readl(&tr->Int_Src);   /* flush */
         spin_unlock(&lp->lock);
         return IRQ_RETVAL(handled >= 0);
@@ -1659,8 +1663,6 @@ tc35815_rx(struct net_device *dev)
         struct tc35815_local *lp = netdev_priv(dev);
         unsigned int fdctl;
         int i;
-        int buf_free_count = 0;
-        int fd_free_count = 0;
 #ifdef TC35815_NAPI
         int received = 0;
 #endif
@@ -1769,8 +1771,9 @@ tc35815_rx(struct net_device *dev)
                         dev->stats.rx_bytes += pkt_len;
                 } else {
                         dev->stats.rx_errors++;
-                        printk(KERN_DEBUG "%s: Rx error (status %x)\n",
-                               dev->name, status & Rx_Stat_Mask);
+                        if (netif_msg_rx_err(lp))
+                                dev_info(&dev->dev, "Rx error (status %x)\n",
+                                         status & Rx_Stat_Mask);
                         /* WORKAROUND: LongErr and CRCErr means Overflow. */
                         if ((status & Rx_LongErr) && (status & Rx_CRCErr)) {
                                 status &= ~(Rx_LongErr|Rx_CRCErr);
@@ -1848,7 +1851,6 @@ tc35815_rx(struct net_device *dev)
 #else
                                 lp->fbl_count++;
 #endif
-                                buf_free_count++;
                         }
                 }
 
@@ -1870,7 +1872,6 @@ tc35815_rx(struct net_device *dev)
 #endif
                         lp->rfd_cur->fd.FDCtl = cpu_to_le32(FD_CownsFD);
                         lp->rfd_cur++;
-                        fd_free_count++;
                 }
                 if (lp->rfd_cur > lp->rfd_limit)
                         lp->rfd_cur = lp->rfd_base;
@@ -1881,17 +1882,6 @@ tc35815_rx(struct net_device *dev)
 #endif
         }
 
-        /* re-enable BL/FDA Exhaust interrupts. */
-        if (fd_free_count) {
-                struct tc35815_regs __iomem *tr =
-                        (struct tc35815_regs __iomem *)dev->base_addr;
-                u32 en, en_old = tc_readl(&tr->Int_En);
-                en = en_old | Int_FDAExEn;
-                if (buf_free_count)
-                        en |= Int_BLExEn;
-                if (en != en_old)
-                        tc_writel(en, &tr->Int_En);
-        }
 #ifdef TC35815_NAPI
         return received;
 #endif
@@ -1910,9 +1900,14 @@ static int tc35815_poll(struct napi_struct *napi, int budget)
         spin_lock(&lp->lock);
         status = tc_readl(&tr->Int_Src);
         do {
-                tc_writel(status, &tr->Int_Src);        /* write to clear */
+                /* BLEx, FDAEx will be cleared later */
+                tc_writel(status & ~(Int_BLEx | Int_FDAEx),
+                          &tr->Int_Src);        /* write to clear */
 
                 handled = tc35815_do_interrupt(dev, status, budget - received);
+                if (status & (Int_BLEx | Int_FDAEx))
+                        tc_writel(status & (Int_BLEx | Int_FDAEx),
+                                  &tr->Int_Src);
                 if (handled >= 0) {
                         received += handled;
                         if (received >= budget)
@@ -2144,7 +2139,7 @@ static struct net_device_stats *tc35815_get_stats(struct net_device *dev)
                 (struct tc35815_regs __iomem *)dev->base_addr;
         if (netif_running(dev))
                 /* Update the statistics from the device registers. */
-                dev->stats.rx_missed_errors = tc_readl(&tr->Miss_Cnt);
+                dev->stats.rx_missed_errors += tc_readl(&tr->Miss_Cnt);
 
         return &dev->stats;
 }
@@ -2399,8 +2394,6 @@ static void tc35815_chip_init(struct net_device *dev)
                 tc_writel(DMA_BURST_SIZE, &tr->DMA_Ctl);
 #ifdef TC35815_USE_PACKEDBUFFER
         tc_writel(RxFrag_EnPack | ETH_ZLEN, &tr->RxFragSize);   /* Packing */
-#else
-        tc_writel(ETH_ZLEN, &tr->RxFragSize);
 #endif
         tc_writel(0, &tr->TxPollCtr);   /* Batch mode */
         tc_writel(TX_THRESHOLD, &tr->TxThrsh);