declance back in working condition

2 files changed, 103 insertions, 108 deletions

diff --git a/drivers/net/Space.c b/drivers/net/Space.c
index 758914520..d497f72d5 100644
--- a/drivers/net/Space.c
+++ b/drivers/net/Space.c
@@ -101,7 +101,6 @@ extern int etherh_probe (struct net_device *dev);
 extern int am79c961_probe(struct net_device *dev);
 extern int hplance_probe(struct net_device *dev);
 extern int bagetlance_probe(struct net_device *);
-extern int dec_lance_probe(struct net_device *);
 extern int mvme147lance_probe(struct net_device *dev);
 extern int tc515_probe(struct net_device *dev);
 extern int lance_probe(struct net_device *dev);
@@ -389,9 +388,6 @@ struct devprobe mips_probes[] __initdata = {
 #ifdef CONFIG_SGI_IOC3_ETH
 	{ioc3_probe, 0},
 #endif
-#ifdef CONFIG_DECLANCE		/* DECstation on-board controller */
-	{dec_lance_probe, 0},   /* and maybe TURBOchannel option boards */
-#endif
 #ifdef CONFIG_BAGETLANCE        /* Lance-based Baget ethernet boards */
         {bagetlance_probe, 0},
 #endif
diff --git a/drivers/net/declance.c b/drivers/net/declance.c
index 4964a3fe0..d7aa8927d 100644
--- a/drivers/net/declance.c
+++ b/drivers/net/declance.c
@@ -256,6 +256,8 @@ struct lance_private {
 	volatile struct lance_init_block *init_block;
 	volatile unsigned long *dma_ptr_reg;
 
+	spinlock_t	lock;
+
 	int rx_new, tx_new;
 	int rx_old, tx_old;
 
@@ -265,6 +267,7 @@ struct lance_private {
 
 	struct net_device *dev;	/* Backpointer        */
 	struct lance_private *next_module;
+	struct timer_list       multicast_timer;
 
 	/* Pointers to the ring buffers as seen from the CPU */
 	char *rx_buf_ptr_cpu[RX_RING_SIZE];
@@ -443,7 +446,6 @@ void cp_from_buf(void *to, unsigned char *from, int len)
 }
 
 /* Setup the Lance Rx and Tx rings */
-/* Sets dev->tbusy */
 static void lance_init_ring(struct net_device *dev)
 {
 	struct lance_private *lp = (struct lance_private *) dev->priv;
@@ -454,12 +456,10 @@ static void lance_init_ring(struct net_device *dev)
 	ib = (struct lance_init_block *) (dev->mem_start);
 
 	/* Lock out other processes while setting up hardware */
-	dev->tbusy = 1;
+	netif_stop_queue(dev);
 	lp->rx_new = lp->tx_new = 0;
 	lp->rx_old = lp->tx_old = 0;
 
-	ib->mode = 0;
-
 	/* Copy the ethernet address to the lance init block.
 	 * XXX bit 0 of the physical address registers has to be zero
 	 */
@@ -485,11 +485,6 @@ static void lance_init_ring(struct net_device *dev)
 	if (ZERO)
 		printk("TX ptr: %8.8x(%8.8x)\n", leptr, libdesc_offset(btx_ring, 0));
 
-	/* Clear the multicast filter */
-	ib->filter[0] = 0;
-	ib->filter[2] = 0;
-	ib->filter[4] = 0;
-	ib->filter[6] = 0;
 	if (ZERO)
 		printk("TX rings:\n");
 
@@ -630,7 +625,7 @@ static int lance_rx(struct net_device *dev)
 	return 0;
 }
 
-static int lance_tx(struct net_device *dev)
+static void lance_tx(struct net_device *dev)
 {
 	struct lance_private *lp = (struct lance_private *) dev->priv;
 	volatile struct lance_init_block *ib;
@@ -641,6 +636,8 @@ static int lance_tx(struct net_device *dev)
 	ib = (struct lance_init_block *) (dev->mem_start);
 	j = lp->tx_old;
 
+	spin_lock(&lp->lock);
+
 	for (i = j; i != lp->tx_new; i = j) {
 		td = &ib->btx_ring[i];
 		/* If we hit a packet not owned by us, stop */
@@ -665,7 +662,7 @@ static int lance_tx(struct net_device *dev)
 				lance_init_ring(dev);
 				load_csrs(lp);
 				init_restart_lance(lp);
-				return 0;
+				goto out;
 			}
 			/* Buffer errors and underflows turn off the
 			 * transmitter, restart the adapter.
@@ -681,7 +678,7 @@ static int lance_tx(struct net_device *dev)
 				lance_init_ring(dev);
 				load_csrs(lp);
 				init_restart_lance(lp);
-				return 0;
+				goto out;
 			}
 		} else if ((td->tmd1_bits & LE_T1_POK) == LE_T1_POK) {
 			/*
@@ -702,7 +699,12 @@ static int lance_tx(struct net_device *dev)
 		j = (j + 1) & TX_RING_MOD_MASK;
 	}
 	lp->tx_old = j;
-	return 0;
+out:
+	if (netif_queue_stopped(dev) &&
+	    TX_BUFFS_AVAIL > 0)
+		netif_wake_queue(dev);
+
+	spin_unlock(&lp->lock);
 }
 
 static void lance_interrupt(const int irq, void *dev_id, struct pt_regs *regs)
@@ -712,11 +714,6 @@ static void lance_interrupt(const int irq, void *dev_id, struct pt_regs *regs)
 	volatile struct lance_regs *ll = lp->ll;
 	int csr0;
 
-	if (dev->interrupt)
-		printk("%s: again\n", dev->name);
-
-	dev->interrupt = 1;
-
 	writereg(&ll->rap, LE_CSR0);
 	csr0 = ll->rdp;
 
@@ -734,10 +731,6 @@ static void lance_interrupt(const int irq, void *dev_id, struct pt_regs *regs)
 	if (csr0 & LE_C0_TINT)
 		lance_tx(dev);
 
-	if ((TX_BUFFS_AVAIL >= 0) && dev->tbusy) {
-		dev->tbusy = 0;
-		mark_bh(NET_BH);
-	}
 	if (csr0 & LE_C0_BABL)
 		lp->stats.tx_errors++;
 
@@ -763,17 +756,17 @@ static void lance_interrupt(const int irq, void *dev_id, struct pt_regs *regs)
 		lance_init_ring(dev);
 		load_csrs(lp);
 		init_restart_lance(lp);
-		dev->tbusy = 0;
+		netif_wake_queue(dev);
 	}
 	writereg(&ll->rdp, LE_C0_INEA);
 	writereg(&ll->rdp, LE_C0_INEA);
-	dev->interrupt = 0;
 }
 
 struct net_device *last_dev = 0;
 
 static int lance_open(struct net_device *dev)
 {
+	volatile struct lance_init_block *ib = (struct lance_init_block *) (dev->mem_start);
 	struct lance_private *lp = (struct lance_private *) dev->priv;
 	volatile struct lance_regs *ll = lp->ll;
 	int status = 0;
@@ -789,12 +782,20 @@ static int lance_open(struct net_device *dev)
 	writereg(&ll->rap, LE_CSR0);
 	writereg(&ll->rdp, LE_C0_STOP);
 
+	/* Set mode and clear multicast filter only at device open,
+	 * so that lance_init_ring() called at any error will not
+	 * forget multicast filters.
+	 *
+	 * BTW it is common bug in all lance drivers! --ANK
+	 */
+	ib->mode = 0;
+	ib->filter [0] = 0;
+	ib->filter [2] = 0;
+
 	lance_init_ring(dev);
 	load_csrs(lp);
 
-	dev->tbusy = 0;
-	dev->interrupt = 0;
-	dev->start = 1;
+	netif_start_queue(dev);
 
 	status = init_restart_lance(lp);
 
@@ -811,8 +812,8 @@ static int lance_close(struct net_device *dev)
 	struct lance_private *lp = (struct lance_private *) dev->priv;
 	volatile struct lance_regs *ll = lp->ll;
 
-	dev->start = 0;
-	dev->tbusy = 1;
+	netif_stop_queue(dev);
+	del_timer_sync(&lp->multicast_timer);
 
 	/* Stop the card */
 	writereg(&ll->rap, LE_CSR0);
@@ -838,51 +839,30 @@ static inline int lance_reset(struct net_device *dev)
 	lance_init_ring(dev);
 	load_csrs(lp);
 	dev->trans_start = jiffies;
-	dev->interrupt = 0;
-	dev->start = 1;
-	dev->tbusy = 0;
 	status = init_restart_lance(lp);
-#ifdef DEBUG_DRIVER
-	printk("Lance restart=%d\n", status);
-#endif
 	return status;
 }
 
-static int lance_start_xmit(struct sk_buff *skb, struct net_device *dev)
+static void lance_tx_timeout(struct net_device *dev)
 {
 	struct lance_private *lp = (struct lance_private *) dev->priv;
 	volatile struct lance_regs *ll = lp->ll;
-	volatile struct lance_init_block *ib;
-	unsigned long flags;
-	int entry, skblen, len;
-	int status = 0;
-	static int outs;
-	ib = (struct lance_init_block *) (dev->mem_start);
-
-	/* Transmitter timeout, serious problems */
-	if (dev->tbusy) {
-		int tickssofar = jiffies - dev->trans_start;
 
-		if (tickssofar < 100) {
-			status = -1;
-		} else {
-			printk("%s: transmit timed out, status %04x, reset\n",
+	printk(KERN_ERR "%s: transmit timed out, status %04x, reset\n",
 			       dev->name, ll->rdp);
 			lance_reset(dev);
-		}
-		return status;
-	}
-	/* Block a timer-based transmit from overlapping. */
-	if (test_and_set_bit(0, (void *) &dev->tbusy) != 0) {
-		printk("Transmitter access conflict.\n");
-		return -1;
-	}
+	netif_wake_queue(dev);
+}
+
+static int lance_start_xmit(struct sk_buff *skb, struct net_device *dev)
+{
+	struct lance_private *lp = (struct lance_private *) dev->priv;
+	volatile struct lance_regs *ll = lp->ll;
+	volatile struct lance_init_block *ib = (struct lance_init_block *) (dev->mem_start);
+	int entry, skblen, len;
+
 	skblen = skb->len;
-	save_and_cli(flags);
-	if (!TX_BUFFS_AVAIL) {
-		restore_flags(flags);
-		return -1;
-	}
+
 	len = (skblen <= ETH_ZLEN) ? ETH_ZLEN : skblen;
 
 	lp->stats.tx_bytes += len;
@@ -904,17 +884,18 @@ static int lance_start_xmit(struct sk_buff *skb, struct net_device *dev)
 	ib->btx_ring[entry].tmd1_bits = (LE_T1_POK | LE_T1_OWN);
 	lp->tx_new = (lp->tx_new + 1) & TX_RING_MOD_MASK;
 
-	outs++;
+	if (TX_BUFFS_AVAIL <= 0)
+		netif_stop_queue(dev);
+
 	/* Kick the lance: transmit now */
 	writereg(&ll->rdp, LE_C0_INEA | LE_C0_TDMD);
+
+	spin_unlock_irq(&lp->lock);
+
 	dev->trans_start = jiffies;
 	dev_kfree_skb(skb);
 
-	if (TX_BUFFS_AVAIL)
-		dev->tbusy = 0;
-
-	restore_flags(flags);
-	return status;
+ 	return 0;
 }
 
 static struct net_device_stats *lance_get_stats(struct net_device *dev)
@@ -983,11 +964,16 @@ static void lance_set_multicast(struct net_device *dev)
 
 	ib = (struct lance_init_block *) (dev->mem_start);
 
-	while (dev->tbusy)
-		schedule();
-	set_bit(0, (void *) &dev->tbusy);
-	while (lp->tx_old != lp->tx_new)
-		schedule();
+	if (!netif_running(dev))
+		return;
+
+	if (lp->tx_old != lp->tx_new) {
+		mod_timer(&lp->multicast_timer, jiffies + 4);
+		netif_wake_queue(dev);
+		return;
+	}
+
+	netif_stop_queue(dev);
 
 	writereg(&ll->rap, LE_CSR0);
 	writereg(&ll->rdp, LE_C0_STOP);
@@ -1002,7 +988,14 @@ static void lance_set_multicast(struct net_device *dev)
 	}
 	load_csrs(lp);
 	init_restart_lance(lp);
-	dev->tbusy = 0;
+	netif_wake_queue(dev);
+}
+
+static void lance_set_multicast_retry(unsigned long _opaque)
+{
+	struct net_device *dev = (struct net_device *) _opaque;
+
+	lance_set_multicast(dev);
 }
 
 static int __init dec_lance_init(struct net_device *dev, const int type)
@@ -1167,14 +1160,14 @@ static int __init dec_lance_init(struct net_device *dev, const int type)
 
 	printk(" irq = %d\n", dev->irq);
 
-	/* Fill the dev fields */
-
-	dev->open = lance_open;
-	dev->stop = lance_close;
-	dev->hard_start_xmit = lance_start_xmit;
-	dev->get_stats = lance_get_stats;
-	dev->set_multicast_list = lance_set_multicast;
-	dev->dma = 0;
+	lp->dev = dev;
+	dev->open = &lance_open;
+	dev->stop = &lance_close;
+	dev->hard_start_xmit = &lance_start_xmit;
+	dev->tx_timeout = &lance_tx_timeout;
+	dev->watchdog_timeo = 5*HZ;
+	dev->get_stats = &lance_get_stats;
+	dev->set_multicast_list = &lance_set_multicast;
 
 	/* lp->ll is the location of the registers for lance card */
 	lp->ll = ll;
@@ -1185,25 +1178,39 @@ static int __init dec_lance_init(struct net_device *dev, const int type)
 	 * specification.
 	 */
 	lp->busmaster_regval = 0;
-	lp->dev = dev;
+
+	dev->dma = 0;
 
 	ether_setup(dev);
-/*
-   #ifdef MODULE
+
+	/* We cannot sleep if the chip is busy during a
+	 * multicast list update event, because such events
+	 * can occur from interrupts (ex. IPv6).  So we
+	 * use a timer to try again later when necessary. -DaveM
+	 */
+	init_timer(&lp->multicast_timer);
+	lp->multicast_timer.data = (unsigned long) dev;
+	lp->multicast_timer.function = &lance_set_multicast_retry;
+
+#ifdef MODULE
    dev->ifindex = dev_new_index();
    lp->next_module = root_lance_dev;
    root_lance_dev = lp;
-   #endif
- */
+#endif
 	return 0;
 }
 
 
 /* Find all the lance cards on the system and initialize them */
-int __init dec_lance_probe(struct net_device *dev)
+static int __init dec_lance_probe(void)
 {
+	struct net_device *dev = NULL;
 	static int called = 0;
 
+#ifdef MODULE
+	root_lance_dev = NULL;
+#endif
+
 #ifdef CONFIG_TC
 	int slot = -1;
 
@@ -1238,19 +1245,9 @@ int __init dec_lance_probe(struct net_device *dev)
 	return dec_lance_init(dev, type);
 }
 
-/*
-   #ifdef MODULE
-
-   int
-   init_module(void)
-   {
-   root_lance_dev = NULL;
-   return dec_lance_probe(NULL);
-   }
-
-   void
-   cleanup_module(void)
-   {
+static void __exit dec_lance_cleanup(void)
+{
+#ifdef MODULE
    struct lance_private *lp;
 
    while (root_lance_dev) {
@@ -1260,6 +1257,8 @@ int __init dec_lance_probe(struct net_device *dev)
    kfree(root_lance_dev->dev);
    root_lance_dev = lp;
    }
-   }
+#endif /* MODULE */
+}
 
-   #endif -* MODULE */
+module_init(dec_lance_probe);
+module_exit(dec_lance_cleanup);