1 files changed, 46 insertions, 129 deletions

diff --git a/drivers/net/sundance.c b/drivers/net/sundance.c
index f13b2a195c7..6b8f4baf87f 100644
--- a/drivers/net/sundance.c
+++ b/drivers/net/sundance.c
@@ -16,91 +16,15 @@
 
         Support and updates available at
         http://www.scyld.com/network/sundance.html
+        [link no longer provides useful info -jgarzik]
+        Archives of the mailing list are still available at
+        http://www.beowulf.org/pipermail/netdrivers/
 
-
-        Version LK1.01a (jgarzik):
-        - Replace some MII-related magic numbers with constants
-
-        Version LK1.02 (D-Link):
-        - Add new board to PCI ID list
-        - Fix multicast bug
-
-        Version LK1.03 (D-Link):
-        - New Rx scheme, reduce Rx congestion
-        - Option to disable flow control
-
-        Version LK1.04 (D-Link):
-        - Tx timeout recovery
-        - More support for ethtool.
-
-        Version LK1.04a:
-        - Remove unused/constant members from struct pci_id_info
-        (which then allows removal of 'drv_flags' from private struct)
-        (jgarzik)
-        - If no phy is found, fail to load that board (jgarzik)
-        - Always start phy id scan at id 1 to avoid problems (Donald Becker)
-        - Autodetect where mii_preable_required is needed,
-        default to not needed.  (Donald Becker)
-
-        Version LK1.04b:
-        - Remove mii_preamble_required module parameter (Donald Becker)
-        - Add per-interface mii_preamble_required (setting is autodetected)
-          (Donald Becker)
-        - Remove unnecessary cast from void pointer (jgarzik)
-        - Re-align comments in private struct (jgarzik)
-
-        Version LK1.04c (jgarzik):
-        - Support bitmapped message levels (NETIF_MSG_xxx), and the
-          two ethtool ioctls that get/set them
-        - Don't hand-code MII ethtool support, use standard API/lib
-
-        Version LK1.04d:
-        - Merge from Donald Becker's sundance.c: (Jason Lunz)
-                * proper support for variably-sized MTUs
-                * default to PIO, to fix chip bugs
-        - Add missing unregister_netdev (Jason Lunz)
-        - Add CONFIG_SUNDANCE_MMIO config option (jgarzik)
-        - Better rx buf size calculation (Donald Becker)
-
-        Version LK1.05 (D-Link):
-        - Fix DFE-580TX packet drop issue (for DL10050C)
-        - Fix reset_tx logic
-
-        Version LK1.06 (D-Link):
-        - Fix crash while unloading driver
-
-        Versin LK1.06b (D-Link):
-        - New tx scheme, adaptive tx_coalesce
-        
-        Version LK1.07 (D-Link):
-        - Fix tx bugs in big-endian machines
-        - Remove unused max_interrupt_work module parameter, the new 
-          NAPI-like rx scheme doesn't need it.
-        - Remove redundancy get_stats() in intr_handler(), those 
-          I/O access could affect performance in ARM-based system
-        - Add Linux software VLAN support
-        
-        Version LK1.08 (Philippe De Muyter phdm@macqel.be):
-        - Fix bug of custom mac address 
-        (StationAddr register only accept word write) 
-
-        Version LK1.09 (D-Link):
-        - Fix the flowctrl bug. 
-        - Set Pause bit in MII ANAR if flow control enabled.    
-
-        Version LK1.09a (ICPlus):
-        - Add the delay time in reading the contents of EEPROM
-
-        Version LK1.10 (Philippe De Muyter phdm@macqel.be):
-        - Make 'unblock interface after Tx underrun' work
-
-        Version LK1.11 (Pedro Alejandro Lopez-Valencia palopezv at gmail.com):
-        - Add support for IC Plus Corporation IP100A chipset
 */
 
 #define DRV_NAME        "sundance"
-#define DRV_VERSION     "1.01+LK1.11"
-#define DRV_RELDATE     "14-Jun-2006"
+#define DRV_VERSION     "1.2"
+#define DRV_RELDATE     "11-Sep-2006"
 
 
 /* The user-configurable values.
@@ -185,7 +109,7 @@ static char *media[MAX_UNITS];
 #endif
 
 /* These identify the driver base version and may not be removed. */
-static char version[] __devinitdata =
+static char version[] =
 KERN_INFO DRV_NAME ".c:v" DRV_VERSION " " DRV_RELDATE "  Written by Donald Becker\n"
 KERN_INFO "  http://www.scyld.com/network/sundance.html\n";
 
@@ -282,15 +206,15 @@ IVc. Errata
 #define USE_IO_OPS 1
 #endif
 
-static struct pci_device_id sundance_pci_tbl[] = {
-        {0x1186, 0x1002, 0x1186, 0x1002, 0, 0, 0},
-        {0x1186, 0x1002, 0x1186, 0x1003, 0, 0, 1},
-        {0x1186, 0x1002, 0x1186, 0x1012, 0, 0, 2},
-        {0x1186, 0x1002, 0x1186, 0x1040, 0, 0, 3},
-        {0x1186, 0x1002, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 4},
-        {0x13F0, 0x0201, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 5},
-        {0x13F0, 0x0200, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 6},
-        {0,}
+static const struct pci_device_id sundance_pci_tbl[] = {
+        { 0x1186, 0x1002, 0x1186, 0x1002, 0, 0, 0 },
+        { 0x1186, 0x1002, 0x1186, 0x1003, 0, 0, 1 },
+        { 0x1186, 0x1002, 0x1186, 0x1012, 0, 0, 2 },
+        { 0x1186, 0x1002, 0x1186, 0x1040, 0, 0, 3 },
+        { 0x1186, 0x1002, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 4 },
+        { 0x13F0, 0x0201, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 5 },
+        { 0x13F0, 0x0200, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 6 },
+        { }
 };
 MODULE_DEVICE_TABLE(pci, sundance_pci_tbl);
 
@@ -301,7 +225,7 @@ enum {
 struct pci_id_info {
         const char *name;
 };
-static const struct pci_id_info pci_id_tbl[] = {
+static const struct pci_id_info pci_id_tbl[] __devinitdata = {
         {"D-Link DFE-550TX FAST Ethernet Adapter"},
         {"D-Link DFE-550FX 100Mbps Fiber-optics Adapter"},
         {"D-Link DFE-580TX 4 port Server Adapter"},
@@ -309,7 +233,7 @@ static const struct pci_id_info pci_id_tbl[] = {
         {"D-Link DL10050-based FAST Ethernet Adapter"},
         {"Sundance Technology Alta"},
         {"IC Plus Corporation IP100A FAST Ethernet Adapter"},
-        {NULL,},                        /* 0 terminated list. */
+        { }     /* terminate list. */
 };
 
 /* This driver was written to use PCI memory space, however x86-oriented
@@ -507,7 +431,7 @@ static int __set_mac_addr(struct net_device *dev);
 static struct net_device_stats *get_stats(struct net_device *dev);
 static int netdev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd);
 static int  netdev_close(struct net_device *dev);
-static struct ethtool_ops ethtool_ops;
+static const struct ethtool_ops ethtool_ops;
 
 static void sundance_reset(struct net_device *dev, unsigned long reset_cmd)
 {
@@ -724,7 +648,7 @@ static int __devinit sundance_probe1 (struct pci_dev *pdev,
         /* Reset the chip to erase previous misconfiguration. */
         if (netif_msg_hw(np))
                 printk("ASIC Control is %x.\n", ioread32(ioaddr + ASICCtrl));
-        iowrite16(0x00ff, ioaddr + ASICCtrl + 2);
+        sundance_reset(dev, 0x00ff << 16);
         if (netif_msg_hw(np))
                 printk("ASIC Control is now %x.\n", ioread32(ioaddr + ASICCtrl));
 
@@ -870,7 +794,7 @@ static int netdev_open(struct net_device *dev)
 
         /* Do we need to reset the chip??? */
 
-        i = request_irq(dev->irq, &intr_handler, SA_SHIRQ, dev->name, dev);
+        i = request_irq(dev->irq, &intr_handler, IRQF_SHARED, dev->name, dev);
         if (i)
                 return i;
 
@@ -983,7 +907,7 @@ static void tx_timeout(struct net_device *dev)
         struct netdev_private *np = netdev_priv(dev);
         void __iomem *ioaddr = np->base;
         unsigned long flag;
-        
+
         netif_stop_queue(dev);
         tasklet_disable(&np->tx_tasklet);
         iowrite16(0, ioaddr + IntrEnable);
@@ -1000,13 +924,13 @@ static void tx_timeout(struct net_device *dev)
                                 le32_to_cpu(np->tx_ring[i].next_desc),
                                 le32_to_cpu(np->tx_ring[i].status),
                                 (le32_to_cpu(np->tx_ring[i].status) >> 2) & 0xff,
-                                le32_to_cpu(np->tx_ring[i].frag[0].addr), 
+                                le32_to_cpu(np->tx_ring[i].frag[0].addr),
                                 le32_to_cpu(np->tx_ring[i].frag[0].length));
                 }
-                printk(KERN_DEBUG "TxListPtr=%08x netif_queue_stopped=%d\n", 
-                        ioread32(np->base + TxListPtr), 
+                printk(KERN_DEBUG "TxListPtr=%08x netif_queue_stopped=%d\n",
+                        ioread32(np->base + TxListPtr),
                         netif_queue_stopped(dev));
-                printk(KERN_DEBUG "cur_tx=%d(%02x) dirty_tx=%d(%02x)\n", 
+                printk(KERN_DEBUG "cur_tx=%d(%02x) dirty_tx=%d(%02x)\n",
                         np->cur_tx, np->cur_tx % TX_RING_SIZE,
                         np->dirty_tx, np->dirty_tx % TX_RING_SIZE);
                 printk(KERN_DEBUG "cur_rx=%d dirty_rx=%d\n", np->cur_rx, np->dirty_rx);
@@ -1078,9 +1002,9 @@ static void tx_poll (unsigned long data)
         struct net_device *dev = (struct net_device *)data;
         struct netdev_private *np = netdev_priv(dev);
         unsigned head = np->cur_task % TX_RING_SIZE;
-        struct netdev_desc *txdesc = 
+        struct netdev_desc *txdesc =
                 &np->tx_ring[(np->cur_tx - 1) % TX_RING_SIZE];
-        
+
         /* Chain the next pointer */
         for (; np->cur_tx - np->cur_task > 0; np->cur_task++) {
                 int entry = np->cur_task % TX_RING_SIZE;
@@ -1150,21 +1074,16 @@ reset_tx (struct net_device *dev)
         struct sk_buff *skb;
         int i;
         int irq = in_interrupt();
-        
+
         /* Reset tx logic, TxListPtr will be cleaned */
         iowrite16 (TxDisable, ioaddr + MACCtrl1);
-        iowrite16 (TxReset | DMAReset | FIFOReset | NetworkReset,
-                        ioaddr + ASICCtrl + 2);
-        for (i=50; i > 0; i--) {
-                if ((ioread16(ioaddr + ASICCtrl + 2) & ResetBusy) == 0)
-                        break;
-                mdelay(1);
-        }
+        sundance_reset(dev, (NetworkReset|FIFOReset|DMAReset|TxReset) << 16);
+
         /* free all tx skbuff */
         for (i = 0; i < TX_RING_SIZE; i++) {
                 skb = np->tx_skbuff[i];
                 if (skb) {
-                        pci_unmap_single(np->pci_dev, 
+                        pci_unmap_single(np->pci_dev,
                                 np->tx_ring[i].frag[0].addr, skb->len,
                                 PCI_DMA_TODEVICE);
                         if (irq)
@@ -1181,7 +1100,7 @@ reset_tx (struct net_device *dev)
         return 0;
 }
 
-/* The interrupt handler cleans up after the Tx thread, 
+/* The interrupt handler cleans up after the Tx thread,
    and schedule a Rx thread work */
 static irqreturn_t intr_handler(int irq, void *dev_instance, struct pt_regs *rgs)
 {
@@ -1262,8 +1181,8 @@ static irqreturn_t intr_handler(int irq, void *dev_instance, struct pt_regs *rgs
                 } else  {
                         hw_frame_id = ioread8(ioaddr + TxFrameId);
                 }
-                        
-                if (np->pci_rev_id >= 0x14) {   
+
+                if (np->pci_rev_id >= 0x14) {
                         spin_lock(&np->lock);
                         for (; np->cur_tx - np->dirty_tx > 0; np->dirty_tx++) {
                                 int entry = np->dirty_tx % TX_RING_SIZE;
@@ -1275,7 +1194,7 @@ static irqreturn_t intr_handler(int irq, void *dev_instance, struct pt_regs *rgs
                                         !(le32_to_cpu(np->tx_ring[entry].status)
                                         & 0x00010000))
                                                 break;
-                                if (sw_frame_id == (hw_frame_id + 1) % 
+                                if (sw_frame_id == (hw_frame_id + 1) %
                                         TX_RING_SIZE)
                                                 break;
                                 skb = np->tx_skbuff[entry];
@@ -1294,7 +1213,7 @@ static irqreturn_t intr_handler(int irq, void *dev_instance, struct pt_regs *rgs
                         for (; np->cur_tx - np->dirty_tx > 0; np->dirty_tx++) {
                                 int entry = np->dirty_tx % TX_RING_SIZE;
                                 struct sk_buff *skb;
-                                if (!(le32_to_cpu(np->tx_ring[entry].status) 
+                                if (!(le32_to_cpu(np->tx_ring[entry].status)
                                                         & 0x00010000))
                                         break;
                                 skb = np->tx_skbuff[entry];
@@ -1309,7 +1228,7 @@ static irqreturn_t intr_handler(int irq, void *dev_instance, struct pt_regs *rgs
                         }
                         spin_unlock(&np->lock);
                 }
-                
+
                 if (netif_queue_stopped(dev) &&
                         np->cur_tx - np->dirty_tx < TX_QUEUE_LEN - 4) {
                         /* The ring is no longer full, clear busy flag. */
@@ -1545,8 +1464,6 @@ static void set_rx_mode(struct net_device *dev)
         int i;
 
         if (dev->flags & IFF_PROMISC) {                 /* Set promiscuous. */
-                /* Unconditionally log net taps. */
-                printk(KERN_NOTICE "%s: Promiscuous mode enabled.\n", dev->name);
                 memset(mc_filter, 0xff, sizeof(mc_filter));
                 rx_mode = AcceptBroadcast | AcceptMulticast | AcceptAll | AcceptMyPhys;
         } else if ((dev->mc_count > multicast_filter_limit)
@@ -1652,7 +1569,7 @@ static void set_msglevel(struct net_device *dev, u32 val)
         np->msg_enable = val;
 }
 
-static struct ethtool_ops ethtool_ops = {
+static const struct ethtool_ops ethtool_ops = {
         .begin = check_if_running,
         .get_drvinfo = get_drvinfo,
         .get_settings = get_settings,
@@ -1681,18 +1598,18 @@ static int netdev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
                 case SIOCDEVPRIVATE:
                 for (i=0; i<TX_RING_SIZE; i++) {
                         printk(KERN_DEBUG "%02x %08llx %08x %08x(%02x) %08x %08x\n", i,
-                                (unsigned long long)(np->tx_ring_dma + i*sizeof(*np->tx_ring)), 
+                                (unsigned long long)(np->tx_ring_dma + i*sizeof(*np->tx_ring)),
                                 le32_to_cpu(np->tx_ring[i].next_desc),
                                 le32_to_cpu(np->tx_ring[i].status),
-                                (le32_to_cpu(np->tx_ring[i].status) >> 2) 
+                                (le32_to_cpu(np->tx_ring[i].status) >> 2)
                                         & 0xff,
-                                le32_to_cpu(np->tx_ring[i].frag[0].addr), 
+                                le32_to_cpu(np->tx_ring[i].frag[0].addr),
                                 le32_to_cpu(np->tx_ring[i].frag[0].length));
                 }
-                printk(KERN_DEBUG "TxListPtr=%08x netif_queue_stopped=%d\n", 
-                        ioread32(np->base + TxListPtr), 
+                printk(KERN_DEBUG "TxListPtr=%08x netif_queue_stopped=%d\n",
+                        ioread32(np->base + TxListPtr),
                         netif_queue_stopped(dev));
-                printk(KERN_DEBUG "cur_tx=%d(%02x) dirty_tx=%d(%02x)\n", 
+                printk(KERN_DEBUG "cur_tx=%d(%02x) dirty_tx=%d(%02x)\n",
                         np->cur_tx, np->cur_tx % TX_RING_SIZE,
                         np->dirty_tx, np->dirty_tx % TX_RING_SIZE);
                 printk(KERN_DEBUG "cur_rx=%d dirty_rx=%d\n", np->cur_rx, np->dirty_rx);
@@ -1700,7 +1617,7 @@ static int netdev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
                 printk(KERN_DEBUG "TxStatus=%04x\n", ioread16(ioaddr + TxStatus));
                         return 0;
         }
-                                
+
 
         return rc;
 }
@@ -1814,7 +1731,7 @@ static int __init sundance_init(void)
 #ifdef MODULE
         printk(version);
 #endif
-        return pci_module_init(&sundance_driver);
+        return pci_register_driver(&sundance_driver);
 }
 
 static void __exit sundance_exit(void)