1 files changed, 138 insertions, 93 deletions

diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c
index 22aec6ed80f5..525624fc03b4 100644
--- a/drivers/net/forcedeth.c
+++ b/drivers/net/forcedeth.c
@@ -80,7 +80,7 @@
  *                         into nv_close, otherwise reenabling for wol can
  *                         cause DMA to kfree'd memory.
  *      0.31: 14 Nov 2004: ethtool support for getting/setting link
- *                         capabilities.
+ *                         capabilities.
  *      0.32: 16 Apr 2005: RX_ERROR4 handling added.
  *      0.33: 16 May 2005: Support for MCP51 added.
  *      0.34: 18 Jun 2005: Add DEV_NEED_LINKTIMER to all nForce nics.
@@ -89,14 +89,17 @@
  *      0.37: 10 Jul 2005: Additional ethtool support, cleanup of pci id list
  *      0.38: 16 Jul 2005: tx irq rewrite: Use global flags instead of
  *                         per-packet flags.
- *      0.39: 18 Jul 2005: Add 64bit descriptor support.
- *      0.40: 19 Jul 2005: Add support for mac address change.
- *      0.41: 30 Jul 2005: Write back original MAC in nv_close instead
+ *      0.39: 18 Jul 2005: Add 64bit descriptor support.
+ *      0.40: 19 Jul 2005: Add support for mac address change.
+ *      0.41: 30 Jul 2005: Write back original MAC in nv_close instead
  *                         of nv_remove
- *      0.42: 06 Aug 2005: Fix lack of link speed initialization
+ *      0.42: 06 Aug 2005: Fix lack of link speed initialization
  *                         in the second (and later) nv_open call
- *      0.43: 10 Aug 2005: Add support for tx checksum.
- *      0.44: 20 Aug 2005: Add support for scatter gather and segmentation.
+ *      0.43: 10 Aug 2005: Add support for tx checksum.
+ *      0.44: 20 Aug 2005: Add support for scatter gather and segmentation.
+ *      0.45: 18 Sep 2005: Remove nv_stop/start_rx from every link check
+ *      0.46: 20 Oct 2005: Add irq optimization modes.
+ *      0.47: 26 Oct 2005: Add phyaddr 0 in phy scan.
  *
  * Known bugs:
  * We suspect that on some hardware no TX done interrupts are generated.
@@ -108,7 +111,7 @@
  * DEV_NEED_TIMERIRQ will not harm you on sane hardware, only generating a few
  * superfluous timer interrupts from the nic.
  */
-#define FORCEDETH_VERSION               "0.44"
+#define FORCEDETH_VERSION               "0.47"
 #define DRV_NAME                        "forcedeth"
 
 #include <linux/module.h>
@@ -163,7 +166,8 @@ enum {
 #define NVREG_IRQ_LINK                  0x0040
 #define NVREG_IRQ_TX_ERROR              0x0080
 #define NVREG_IRQ_TX1                   0x0100
-#define NVREG_IRQMASK_WANTED            0x00df
+#define NVREG_IRQMASK_THROUGHPUT        0x00df
+#define NVREG_IRQMASK_CPU               0x0040
 
 #define NVREG_IRQ_UNKNOWN       (~(NVREG_IRQ_RX_ERROR|NVREG_IRQ_RX|NVREG_IRQ_RX_NOBUF|NVREG_IRQ_TX_ERR| \
                                         NVREG_IRQ_TX_OK|NVREG_IRQ_TIMER|NVREG_IRQ_LINK|NVREG_IRQ_TX_ERROR| \
@@ -177,7 +181,8 @@ enum {
  * NVREG_POLL_DEFAULT=97 would result in an interval length of 1 ms
  */
         NvRegPollingInterval = 0x00c,
-#define NVREG_POLL_DEFAULT      970
+#define NVREG_POLL_DEFAULT_THROUGHPUT   970
+#define NVREG_POLL_DEFAULT_CPU  13
         NvRegMisc1 = 0x080,
 #define NVREG_MISC1_HD          0x02
 #define NVREG_MISC1_FORCE       0x3b0f3c
@@ -538,6 +543,25 @@ struct fe_priv {
  */
 static int max_interrupt_work = 5;
 
+/*
+ * Optimization can be either throuput mode or cpu mode
+ * 
+ * Throughput Mode: Every tx and rx packet will generate an interrupt.
+ * CPU Mode: Interrupts are controlled by a timer.
+ */
+#define NV_OPTIMIZATION_MODE_THROUGHPUT 0
+#define NV_OPTIMIZATION_MODE_CPU        1
+static int optimization_mode = NV_OPTIMIZATION_MODE_THROUGHPUT;
+
+/*
+ * Poll interval for timer irq
+ *
+ * This interval determines how frequent an interrupt is generated.
+ * The is value is determined by [(time_in_micro_secs * 100) / (2^10)]
+ * Min = 0, and Max = 65535
+ */
+static int poll_interval = -1;
+
 static inline struct fe_priv *get_nvpriv(struct net_device *dev)
 {
         return netdev_priv(dev);
@@ -1328,67 +1352,71 @@ static void nv_rx_process(struct net_device *dev)
                         if (!(Flags & NV_RX_DESCRIPTORVALID))
                                 goto next_pkt;
 
-                        if (Flags & NV_RX_MISSEDFRAME) {
-                                np->stats.rx_missed_errors++;
-                                np->stats.rx_errors++;
-                                goto next_pkt;
-                        }
-                        if (Flags & (NV_RX_ERROR1|NV_RX_ERROR2|NV_RX_ERROR3)) {
-                                np->stats.rx_errors++;
-                                goto next_pkt;
-                        }
-                        if (Flags & NV_RX_CRCERR) {
-                                np->stats.rx_crc_errors++;
-                                np->stats.rx_errors++;
-                                goto next_pkt;
-                        }
-                        if (Flags & NV_RX_OVERFLOW) {
-                                np->stats.rx_over_errors++;
-                                np->stats.rx_errors++;
-                                goto next_pkt;
-                        }
-                        if (Flags & NV_RX_ERROR4) {
-                                len = nv_getlen(dev, np->rx_skbuff[i]->data, len);
-                                if (len < 0) {
+                        if (Flags & NV_RX_ERROR) {
+                                if (Flags & NV_RX_MISSEDFRAME) {
+                                        np->stats.rx_missed_errors++;
                                         np->stats.rx_errors++;
                                         goto next_pkt;
                                 }
-                        }
-                        /* framing errors are soft errors. */
-                        if (Flags & NV_RX_FRAMINGERR) {
-                                if (Flags & NV_RX_SUBSTRACT1) {
-                                        len--;
+                                if (Flags & (NV_RX_ERROR1|NV_RX_ERROR2|NV_RX_ERROR3)) {
+                                        np->stats.rx_errors++;
+                                        goto next_pkt;
+                                }
+                                if (Flags & NV_RX_CRCERR) {
+                                        np->stats.rx_crc_errors++;
+                                        np->stats.rx_errors++;
+                                        goto next_pkt;
+                                }
+                                if (Flags & NV_RX_OVERFLOW) {
+                                        np->stats.rx_over_errors++;
+                                        np->stats.rx_errors++;
+                                        goto next_pkt;
+                                }
+                                if (Flags & NV_RX_ERROR4) {
+                                        len = nv_getlen(dev, np->rx_skbuff[i]->data, len);
+                                        if (len < 0) {
+                                                np->stats.rx_errors++;
+                                                goto next_pkt;
+                                        }
+                                }
+                                /* framing errors are soft errors. */
+                                if (Flags & NV_RX_FRAMINGERR) {
+                                        if (Flags & NV_RX_SUBSTRACT1) {
+                                                len--;
+                                        }
                                 }
                         }
                 } else {
                         if (!(Flags & NV_RX2_DESCRIPTORVALID))
                                 goto next_pkt;
 
-                        if (Flags & (NV_RX2_ERROR1|NV_RX2_ERROR2|NV_RX2_ERROR3)) {
-                                np->stats.rx_errors++;
-                                goto next_pkt;
-                        }
-                        if (Flags & NV_RX2_CRCERR) {
-                                np->stats.rx_crc_errors++;
-                                np->stats.rx_errors++;
-                                goto next_pkt;
-                        }
-                        if (Flags & NV_RX2_OVERFLOW) {
-                                np->stats.rx_over_errors++;
-                                np->stats.rx_errors++;
-                                goto next_pkt;
-                        }
-                        if (Flags & NV_RX2_ERROR4) {
-                                len = nv_getlen(dev, np->rx_skbuff[i]->data, len);
-                                if (len < 0) {
+                        if (Flags & NV_RX2_ERROR) {
+                                if (Flags & (NV_RX2_ERROR1|NV_RX2_ERROR2|NV_RX2_ERROR3)) {
                                         np->stats.rx_errors++;
                                         goto next_pkt;
                                 }
-                        }
-                        /* framing errors are soft errors */
-                        if (Flags & NV_RX2_FRAMINGERR) {
-                                if (Flags & NV_RX2_SUBSTRACT1) {
-                                        len--;
+                                if (Flags & NV_RX2_CRCERR) {
+                                        np->stats.rx_crc_errors++;
+                                        np->stats.rx_errors++;
+                                        goto next_pkt;
+                                }
+                                if (Flags & NV_RX2_OVERFLOW) {
+                                        np->stats.rx_over_errors++;
+                                        np->stats.rx_errors++;
+                                        goto next_pkt;
+                                }
+                                if (Flags & NV_RX2_ERROR4) {
+                                        len = nv_getlen(dev, np->rx_skbuff[i]->data, len);
+                                        if (len < 0) {
+                                                np->stats.rx_errors++;
+                                                goto next_pkt;
+                                        }
+                                }
+                                /* framing errors are soft errors */
+                                if (Flags & NV_RX2_FRAMINGERR) {
+                                        if (Flags & NV_RX2_SUBSTRACT1) {
+                                                len--;
+                                        }
                                 }
                         }
                         Flags &= NV_RX2_CHECKSUMMASK;
@@ -1612,6 +1640,17 @@ static void nv_set_multicast(struct net_device *dev)
         spin_unlock_irq(&np->lock);
 }
 
+/**
+ * nv_update_linkspeed: Setup the MAC according to the link partner
+ * @dev: Network device to be configured
+ *
+ * The function queries the PHY and checks if there is a link partner.
+ * If yes, then it sets up the MAC accordingly. Otherwise, the MAC is
+ * set to 10 MBit HD.
+ *
+ * The function returns 0 if there is no link partner and 1 if there is
+ * a good link partner.
+ */
 static int nv_update_linkspeed(struct net_device *dev)
 {
         struct fe_priv *np = netdev_priv(dev);
@@ -1751,13 +1790,11 @@ set_speed:
 static void nv_linkchange(struct net_device *dev)
 {
         if (nv_update_linkspeed(dev)) {
-                if (netif_carrier_ok(dev)) {
-                        nv_stop_rx(dev);
-                } else {
+                if (!netif_carrier_ok(dev)) {
                         netif_carrier_on(dev);
                         printk(KERN_INFO "%s: link up.\n", dev->name);
+                        nv_start_rx(dev);
                 }
-                nv_start_rx(dev);
         } else {
                 if (netif_carrier_ok(dev)) {
                         netif_carrier_off(dev);
@@ -1799,22 +1836,18 @@ static irqreturn_t nv_nic_irq(int foo, void *data, struct pt_regs *regs)
                 if (!(events & np->irqmask))
                         break;
 
-                if (events & (NVREG_IRQ_TX1|NVREG_IRQ_TX_OK|NVREG_IRQ_TX_ERROR|NVREG_IRQ_TX_ERR)) {
+                spin_lock(&np->lock);
+                nv_tx_done(dev);
+                spin_unlock(&np->lock);
+                
+                nv_rx_process(dev);
+                if (nv_alloc_rx(dev)) {
                         spin_lock(&np->lock);
-                        nv_tx_done(dev);
+                        if (!np->in_shutdown)
+                                mod_timer(&np->oom_kick, jiffies + OOM_REFILL);
                         spin_unlock(&np->lock);
                 }
-
-                if (events & (NVREG_IRQ_RX_ERROR|NVREG_IRQ_RX|NVREG_IRQ_RX_NOBUF)) {
-                        nv_rx_process(dev);
-                        if (nv_alloc_rx(dev)) {
-                                spin_lock(&np->lock);
-                                if (!np->in_shutdown)
-                                        mod_timer(&np->oom_kick, jiffies + OOM_REFILL);
-                                spin_unlock(&np->lock);
-                        }
-                }
-
+                
                 if (events & NVREG_IRQ_LINK) {
                         spin_lock(&np->lock);
                         nv_link_irq(dev);
@@ -2216,7 +2249,14 @@ static int nv_open(struct net_device *dev)
         writel(NVREG_RNDSEED_FORCE | (i&NVREG_RNDSEED_MASK), base + NvRegRandomSeed);
         writel(NVREG_UNKSETUP1_VAL, base + NvRegUnknownSetupReg1);
         writel(NVREG_UNKSETUP2_VAL, base + NvRegUnknownSetupReg2);
-        writel(NVREG_POLL_DEFAULT, base + NvRegPollingInterval);
+        if (poll_interval == -1) {
+                if (optimization_mode == NV_OPTIMIZATION_MODE_THROUGHPUT)
+                        writel(NVREG_POLL_DEFAULT_THROUGHPUT, base + NvRegPollingInterval);
+                else
+                        writel(NVREG_POLL_DEFAULT_CPU, base + NvRegPollingInterval);
+        }
+        else
+                writel(poll_interval & 0xFFFF, base + NvRegPollingInterval);
         writel(NVREG_UNKSETUP6_VAL, base + NvRegUnknownSetupReg6);
         writel((np->phyaddr << NVREG_ADAPTCTL_PHYSHIFT)|NVREG_ADAPTCTL_PHYVALID|NVREG_ADAPTCTL_RUNNING,
                         base + NvRegAdapterControl);
@@ -2501,7 +2541,11 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i
         } else {
                 np->tx_flags = NV_TX2_VALID;
         }
-        np->irqmask = NVREG_IRQMASK_WANTED;
+        if (optimization_mode == NV_OPTIMIZATION_MODE_THROUGHPUT)
+                np->irqmask = NVREG_IRQMASK_THROUGHPUT;
+        else
+                np->irqmask = NVREG_IRQMASK_CPU;
+
         if (id->driver_data & DEV_NEED_TIMERIRQ)
                 np->irqmask |= NVREG_IRQ_TIMER;
         if (id->driver_data & DEV_NEED_LINKTIMER) {
@@ -2514,16 +2558,17 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i
         }
 
         /* find a suitable phy */
-        for (i = 1; i < 32; i++) {
+        for (i = 1; i <= 32; i++) {
                 int id1, id2;
+                int phyaddr = i & 0x1F;
 
                 spin_lock_irq(&np->lock);
-                id1 = mii_rw(dev, i, MII_PHYSID1, MII_READ);
+                id1 = mii_rw(dev, phyaddr, MII_PHYSID1, MII_READ);
                 spin_unlock_irq(&np->lock);
                 if (id1 < 0 || id1 == 0xffff)
                         continue;
                 spin_lock_irq(&np->lock);
-                id2 = mii_rw(dev, i, MII_PHYSID2, MII_READ);
+                id2 = mii_rw(dev, phyaddr, MII_PHYSID2, MII_READ);
                 spin_unlock_irq(&np->lock);
                 if (id2 < 0 || id2 == 0xffff)
                         continue;
@@ -2531,23 +2576,19 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i
                 id1 = (id1 & PHYID1_OUI_MASK) << PHYID1_OUI_SHFT;
                 id2 = (id2 & PHYID2_OUI_MASK) >> PHYID2_OUI_SHFT;
                 dprintk(KERN_DEBUG "%s: open: Found PHY %04x:%04x at address %d.\n",
-                                pci_name(pci_dev), id1, id2, i);
-                np->phyaddr = i;
+                        pci_name(pci_dev), id1, id2, phyaddr);
+                np->phyaddr = phyaddr;
                 np->phy_oui = id1 | id2;
                 break;
         }
-        if (i == 32) {
-                /* PHY in isolate mode? No phy attached and user wants to
-                 * test loopback? Very odd, but can be correct.
-                 */
+        if (i == 33) {
                 printk(KERN_INFO "%s: open: Could not find a valid PHY.\n",
-                                pci_name(pci_dev));
-        }
-
-        if (i != 32) {
-                /* reset it */
-                phy_init(dev);
+                       pci_name(pci_dev));
+                goto out_freering;
         }
+        
+        /* reset it */
+        phy_init(dev);
 
         /* set default link speed settings */
         np->linkspeed = NVREG_LINKSPEED_FORCE|NVREG_LINKSPEED_10;
@@ -2689,6 +2730,10 @@ static void __exit exit_nic(void)
 
 module_param(max_interrupt_work, int, 0);
 MODULE_PARM_DESC(max_interrupt_work, "forcedeth maximum events handled per interrupt");
+module_param(optimization_mode, int, 0);
+MODULE_PARM_DESC(optimization_mode, "In throughput mode (0), every tx & rx packet will generate an interrupt. In CPU mode (1), interrupts are controlled by a timer.");
+module_param(poll_interval, int, 0);
+MODULE_PARM_DESC(poll_interval, "Interval determines how frequent timer interrupt is generated by [(time_in_micro_secs * 100) / (2^10)]. Min is 0 and Max is 65535.");
 
 MODULE_AUTHOR("Manfred Spraul <manfred@colorfullife.com>");
 MODULE_DESCRIPTION("Reverse Engineered nForce ethernet driver");