3c501 leads the way... 8)
Signed-off-by: Alan Cox <alan@xxxxxxxxxx>
diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.24-rc2-mm1/drivers/net/3c501.c linux-2.6.24-rc2-mm1/drivers/net/3c501.c
--- linux.vanilla-2.6.24-rc2-mm1/drivers/net/3c501.c 2007-11-16 17:54:40.000000000 +0000
+++ linux-2.6.24-rc2-mm1/drivers/net/3c501.c 2007-11-16 18:28:02.000000000 +0000
@@ -17,7 +17,7 @@
Annapolis MD 21403
Fixed (again!) the missing interrupt locking on TX/RX shifting.
- Alan Cox <Alan.Cox@xxxxxxxxx>
+ Alan Cox <Alan.Cox@xxxxxxxxx>
Removed calls to init_etherdev since they are no longer needed, and
cleaned up modularization just a bit. The driver still allows only
@@ -29,16 +29,16 @@
the board. Now getting 150K/second FTP with a 3c501 card. Still playing
with a TX-TX optimisation to see if we can touch 180-200K/second as seems
theoretically maximum.
- 19950402 Alan Cox <Alan.Cox@xxxxxxxxx>
+ 19950402 Alan Cox <Alan.Cox@xxxxxxxxx>
Cleaned up for 2.3.x because we broke SMP now.
- 20000208 Alan Cox <alan@xxxxxxxxxx>
+ 20000208 Alan Cox <alan@xxxxxxxxxx>
Check up pass for 2.5. Nothing significant changed
- 20021009 Alan Cox <alan@xxxxxxxxxx>
+ 20021009 Alan Cox <alan@xxxxxxxxxx>
Fixed zero fill corner case
- 20030104 Alan Cox <alan@xxxxxxxxxx>
+ 20030104 Alan Cox <alan@xxxxxxxxxx>
For the avoidance of doubt the "preferred form" of this code is one which
@@ -139,8 +139,8 @@
* The boilerplate probe code.
*/
-static int io=0x280;
-static int irq=5;
+static int io = 0x280;
+static int irq = 5;
static int mem_start;
/**
@@ -229,8 +229,7 @@
* Read the station address PROM data from the special port.
*/
- for (i = 0; i < 6; i++)
- {
+ for (i = 0; i < 6; i++) {
outw(i, ioaddr + EL1_DATAPTR);
station_addr[i] = inb(ioaddr + EL1_SAPROM);
}
@@ -240,28 +239,24 @@
*/
if (station_addr[0] == 0x02 && station_addr[1] == 0x60
- && station_addr[2] == 0x8c)
- {
+ && station_addr[2] == 0x8c)
mname = "3c501";
- } else if (station_addr[0] == 0x00 && station_addr[1] == 0x80
- && station_addr[2] == 0xC8)
- {
+ else if (station_addr[0] == 0x00 && station_addr[1] == 0x80
+ && station_addr[2] == 0xC8)
mname = "NP943";
- }
- else {
+ else {
release_region(ioaddr, EL1_IO_EXTENT);
return -ENODEV;
}
/*
- * We auto-IRQ by shutting off the interrupt line and letting it float
- * high.
+ * We auto-IRQ by shutting off the interrupt line and letting it
+ * float high.
*/
dev->irq = irq;
- if (dev->irq < 2)
- {
+ if (dev->irq < 2) {
unsigned long irq_mask;
irq_mask = probe_irq_on();
@@ -274,8 +269,7 @@
mdelay(20);
autoirq = probe_irq_off(irq_mask);
- if (autoirq == 0)
- {
+ if (autoirq == 0) {
printk(KERN_WARNING "%s probe at %#x failed to detect IRQ line.\n",
mname, ioaddr);
release_region(ioaddr, EL1_IO_EXTENT);
@@ -292,7 +286,8 @@
if (autoirq)
dev->irq = autoirq;
- printk(KERN_INFO "%s: %s EtherLink at %#lx, using %sIRQ %d.\n", dev->name, mname, dev->base_addr,
+ printk(KERN_INFO "%s: %s EtherLink at %#lx, using %sIRQ %d.\n",
+ dev->name, mname, dev->base_addr,
autoirq ? "auto":"assigned ", dev->irq);
#ifdef CONFIG_IP_MULTICAST
@@ -343,7 +338,8 @@
if (el_debug > 2)
printk(KERN_DEBUG "%s: Doing el_open()...", dev->name);
- if ((retval = request_irq(dev->irq, &el_interrupt, 0, dev->name, dev)))
+ retval = request_irq(dev->irq, &el_interrupt, 0, dev->name, dev);
+ if (retval)
return retval;
spin_lock_irqsave(&lp->lock, flags);
@@ -371,8 +367,9 @@
int ioaddr = dev->base_addr;
if (el_debug)
- printk (KERN_DEBUG "%s: transmit timed out, txsr %#2x axsr=%02x rxsr=%02x.\n",
- dev->name, inb(TX_STATUS), inb(AX_STATUS), inb(RX_STATUS));
+ printk(KERN_DEBUG "%s: transmit timed out, txsr %#2x axsr=%02x rxsr=%02x.\n",
+ dev->name, inb(TX_STATUS),
+ inb(AX_STATUS), inb(RX_STATUS));
dev->stats.tx_errors++;
outb(TX_NORM, TX_CMD);
outb(RX_NORM, RX_CMD);
@@ -425,8 +422,7 @@
netif_stop_queue(dev);
- do
- {
+ do {
int len = skb->len;
int pad = 0;
int gp_start;
@@ -435,10 +431,10 @@
if (len < ETH_ZLEN)
pad = ETH_ZLEN - len;
- gp_start = 0x800 - ( len + pad );
+ gp_start = 0x800 - (len + pad);
lp->tx_pkt_start = gp_start;
- lp->collisions = 0;
+ lp->collisions = 0;
dev->stats.tx_bytes += skb->len;
@@ -455,37 +451,42 @@
lp->txing = 1;
/*
- * Turn interrupts back on while we spend a pleasant afternoon
- * loading bytes into the board
+ * Turn interrupts back on while we spend a pleasant
+ * afternoon loading bytes into the board
*/
spin_unlock_irqrestore(&lp->lock, flags);
- outw(0x00, RX_BUF_CLR); /* Set rx packet area to 0. */
- outw(gp_start, GP_LOW); /* aim - packet will be loaded into buffer start */
- outsb(DATAPORT,buf,len); /* load buffer (usual thing each byte increments the pointer) */
+ /* Set rx packet area to 0. */
+ outw(0x00, RX_BUF_CLR);
+ /* aim - packet will be loaded into buffer start */
+ outw(gp_start, GP_LOW);
+ /* load buffer (usual thing each byte increments the pointer) */
+ outsb(DATAPORT, buf, len);
if (pad) {
- while(pad--) /* Zero fill buffer tail */
+ while (pad--) /* Zero fill buffer tail */
outb(0, DATAPORT);
}
- outw(gp_start, GP_LOW); /* the board reuses the same register */
+ /* the board reuses the same register */
+ outw(gp_start, GP_LOW);
- if(lp->loading != 2)
- {
- outb(AX_XMIT, AX_CMD); /* fire ... Trigger xmit. */
- lp->loading=0;
+ if (lp->loading != 2) {
+ /* fire ... Trigger xmit. */
+ outb(AX_XMIT, AX_CMD);
+ lp->loading = 0;
dev->trans_start = jiffies;
if (el_debug > 2)
printk(KERN_DEBUG " queued xmit.\n");
- dev_kfree_skb (skb);
+ dev_kfree_skb(skb);
return 0;
}
/* A receive upset our load, despite our best efforts */
- if(el_debug>2)
- printk(KERN_DEBUG "%s: burped during tx load.\n", dev->name);
+ if (el_debug > 2)
+ printk(KERN_DEBUG "%s: burped during tx load.\n",
+ dev->name);
spin_lock_irqsave(&lp->lock, flags);
}
- while(1);
+ while (1);
}
@@ -534,64 +535,59 @@
*/
if (el_debug > 3)
- printk(KERN_DEBUG "%s: el_interrupt() aux=%#02x", dev->name, axsr);
-
- if(lp->loading==1 && !lp->txing)
- printk(KERN_WARNING "%s: Inconsistent state loading while not in tx\n",
- dev->name);
-
- if (lp->txing)
- {
+ printk(KERN_DEBUG "%s: el_interrupt() aux=%#02x",
+ dev->name, axsr);
- /*
- * Board in transmit mode. May be loading. If we are
- * loading we shouldn't have got this.
- */
+ if (lp->loading == 1 && !lp->txing)
+ printk(KERN_WARNING "%s: Inconsistent state loading while not in tx\n",
+ dev->name);
+ if (lp->txing) {
+ /*
+ * Board in transmit mode. May be loading. If we are
+ * loading we shouldn't have got this.
+ */
int txsr = inb(TX_STATUS);
- if(lp->loading==1)
- {
- if(el_debug > 2)
- {
- printk(KERN_DEBUG "%s: Interrupt while loading [", dev->name);
- printk(KERN_DEBUG " txsr=%02x gp=%04x rp=%04x]\n", txsr, inw(GP_LOW),inw(RX_LOW));
+ if (lp->loading == 1) {
+ if (el_debug > 2) {
+ printk(KERN_DEBUG "%s: Interrupt while loading [",
+ dev->name);
+ printk(" txsr=%02x gp=%04x rp=%04x]\n",
+ txsr, inw(GP_LOW), inw(RX_LOW));
}
- lp->loading=2; /* Force a reload */
+ /* Force a reload */
+ lp->loading = 2;
spin_unlock(&lp->lock);
goto out;
}
-
if (el_debug > 6)
- printk(KERN_DEBUG " txsr=%02x gp=%04x rp=%04x", txsr, inw(GP_LOW),inw(RX_LOW));
+ printk(KERN_DEBUG " txsr=%02x gp=%04x rp=%04x",
+ txsr, inw(GP_LOW), inw(RX_LOW));
- if ((axsr & 0x80) && (txsr & TX_READY) == 0)
- {
+ if ((axsr & 0x80) && (txsr & TX_READY) == 0) {
/*
- * FIXME: is there a logic to whether to keep on trying or
- * reset immediately ?
+ * FIXME: is there a logic to whether to keep
+ * on trying or reset immediately ?
*/
- if(el_debug>1)
- printk(KERN_DEBUG "%s: Unusual interrupt during Tx, txsr=%02x axsr=%02x"
- " gp=%03x rp=%03x.\n", dev->name, txsr, axsr,
- inw(ioaddr + EL1_DATAPTR), inw(ioaddr + EL1_RXPTR));
+ if (el_debug > 1)
+ printk(KERN_DEBUG "%s: Unusual interrupt during Tx, txsr=%02x axsr=%02x gp=%03x rp=%03x.\n",
+ dev->name, txsr, axsr,
+ inw(ioaddr + EL1_DATAPTR),
+ inw(ioaddr + EL1_RXPTR));
lp->txing = 0;
netif_wake_queue(dev);
- }
- else if (txsr & TX_16COLLISIONS)
- {
+ } else if (txsr & TX_16COLLISIONS) {
/*
* Timed out
*/
if (el_debug)
- printk (KERN_DEBUG "%s: Transmit failed 16 times, Ethernet jammed?\n",dev->name);
+ printk(KERN_DEBUG "%s: Transmit failed 16 times, Ethernet jammed?\n", dev->name);
outb(AX_SYS, AX_CMD);
lp->txing = 0;
dev->stats.tx_aborted_errors++;
netif_wake_queue(dev);
- }
- else if (txsr & TX_COLLISION)
- {
+ } else if (txsr & TX_COLLISION) {
/*
* Retrigger xmit.
*/
@@ -599,7 +595,8 @@
if (el_debug > 6)
printk(KERN_DEBUG " retransmitting after a collision.\n");
/*
- * Poor little chip can't reset its own start pointer
+ * Poor little chip can't reset its own start
+ * pointer
*/
outb(AX_SYS, AX_CMD);
@@ -608,53 +605,45 @@
dev->stats.collisions++;
spin_unlock(&lp->lock);
goto out;
- }
- else
- {
+ } else {
/*
* It worked.. we will now fall through and receive
*/
dev->stats.tx_packets++;
if (el_debug > 6)
printk(KERN_DEBUG " Tx succeeded %s\n",
- (txsr & TX_RDY) ? "." : "but tx is busy!");
+ (txsr & TX_RDY) ? "." : "but tx is busy!");
/*
* This is safe the interrupt is atomic WRT itself.
*/
-
lp->txing = 0;
- netif_wake_queue(dev); /* In case more to transmit */
+ /* In case more to transmit */
+ netif_wake_queue(dev);
}
- }
- else
- {
- /*
- * In receive mode.
- */
+ } else {
+ /*
+ * In receive mode.
+ */
int rxsr = inb(RX_STATUS);
if (el_debug > 5)
- printk(KERN_DEBUG " rxsr=%02x txsr=%02x rp=%04x", rxsr, inb(TX_STATUS),inw(RX_LOW));
+ printk(KERN_DEBUG " rxsr=%02x txsr=%02x rp=%04x", rxsr, inb(TX_STATUS), inw(RX_LOW));
/*
* Just reading rx_status fixes most errors.
*/
if (rxsr & RX_MISSED)
dev->stats.rx_missed_errors++;
- else if (rxsr & RX_RUNT)
- { /* Handled to avoid board lock-up. */
+ else if (rxsr & RX_RUNT) {
+ /* Handled to avoid board lock-up. */
dev->stats.rx_length_errors++;
if (el_debug > 5)
printk(KERN_DEBUG " runt.\n");
- }
- else if (rxsr & RX_GOOD)
- {
+ } else if (rxsr & RX_GOOD) {
/*
* Receive worked.
*/
el_receive(dev);
- }
- else
- {
+ } else {
/*
* Nothing? Something is broken!
*/
@@ -702,8 +691,7 @@
if (el_debug > 4)
printk(KERN_DEBUG " el_receive %d.\n", pkt_len);
- if ((pkt_len < 60) || (pkt_len > 1536))
- {
+ if (pkt_len < 60 || pkt_len > 1536) {
if (el_debug)
printk(KERN_DEBUG "%s: bogus packet, length=%d\n", dev->name, pkt_len);
dev->stats.rx_over_errors++;
@@ -722,26 +710,23 @@
*/
outw(0x00, GP_LOW);
- if (skb == NULL)
- {
+ if (skb == NULL) {
printk(KERN_INFO "%s: Memory squeeze, dropping packet.\n", dev->name);
dev->stats.rx_dropped++;
return;
- }
- else
- {
- skb_reserve(skb,2); /* Force 16 byte alignment */
+ } else {
+ skb_reserve(skb, 2); /* Force 16 byte alignment */
/*
* The read increments through the bytes. The interrupt
* handler will fix the pointer when it returns to
* receive mode.
*/
- insb(DATAPORT, skb_put(skb,pkt_len), pkt_len);
- skb->protocol=eth_type_trans(skb,dev);
+ insb(DATAPORT, skb_put(skb, pkt_len), pkt_len);
+ skb->protocol = eth_type_trans(skb, dev);
netif_rx(skb);
dev->last_rx = jiffies;
dev->stats.rx_packets++;
- dev->stats.rx_bytes+=pkt_len;
+ dev->stats.rx_bytes += pkt_len;
}
return;
}
@@ -760,7 +745,7 @@
struct net_local *lp = netdev_priv(dev);
int ioaddr = dev->base_addr;
- if (el_debug> 2)
+ if (el_debug > 2)
printk(KERN_INFO "3c501 reset...");
outb(AX_RESET, AX_CMD); /* Reset the chip */
outb(AX_LOOP, AX_CMD); /* Aux control, irq and loopback enabled */
@@ -794,7 +779,8 @@
int ioaddr = dev->base_addr;
if (el_debug > 2)
- printk(KERN_INFO "%s: Shutting down Ethernet card at %#x.\n", dev->name, ioaddr);
+ printk(KERN_INFO "%s: Shutting down Ethernet card at %#x.\n",
+ dev->name, ioaddr);
netif_stop_queue(dev);
@@ -822,18 +808,14 @@
{
int ioaddr = dev->base_addr;
- if(dev->flags&IFF_PROMISC)
- {
+ if (dev->flags & IFF_PROMISC) {
outb(RX_PROM, RX_CMD);
inb(RX_STATUS);
- }
- else if (dev->mc_list || dev->flags&IFF_ALLMULTI)
- {
- outb(RX_MULT, RX_CMD); /* Multicast or all multicast is the same */
+ } else if (dev->mc_list || dev->flags & IFF_ALLMULTI) {
+ /* Multicast or all multicast is the same */
+ outb(RX_MULT, RX_CMD);
inb(RX_STATUS); /* Clear status. */
- }
- else
- {
+ } else {
outb(RX_NORM, RX_CMD);
inb(RX_STATUS);
}
-
To unsubscribe from this list: send the line "unsubscribe linux-net" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
