renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-18 10:13:57 +08:00
Code

DM9000: fix interface hang under load

Browse Source 
When transferring data at full speed, the DM9000 network interface
sometimes stops sending/receiving data. Worse, ksoftirqd consumes
100% cpu and the net tx watchdog never triggers.
Fix by spin_lock_irqsave() in dm9000_start_xmit() to prevent the
interrupt handler from interfering.

Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
This commit is contained in:
Florian Westphal 2007-08-21 01:33:42 +02:00 committed by Jeff Garzik
parent bc1e0a095e
commit c46ac9463f
1 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
drivers/net/dm9000.c
View File

@ -700,6 +700,7 @@ dm9000_init_dm9000(struct net_device *dev)
static int static int
dm9000_start_xmit(struct sk_buff *skb, struct net_device *dev) dm9000_start_xmit(struct sk_buff *skb, struct net_device *dev)
{ {
unsigned long flags;
board_info_t *db = (board_info_t *) dev->priv; board_info_t *db = (board_info_t *) dev->priv;
PRINTK3("dm9000_start_xmit\n"); PRINTK3("dm9000_start_xmit\n");
@ -707,10 +708,7 @@ dm9000_start_xmit(struct sk_buff *skb, struct net_device *dev)
if (db->tx_pkt_cnt > 1) if (db->tx_pkt_cnt > 1)
return 1; return 1;
netif_stop_queue(dev); spin_lock_irqsave(&db->lock, flags);
/* Disable all interrupts */
iow(db, DM9000_IMR, IMR_PAR);
/* Move data to DM9000 TX RAM */ /* Move data to DM9000 TX RAM */
writeb(DM9000_MWCMD, db->io_addr); writeb(DM9000_MWCMD, db->io_addr);
@ -718,12 +716,9 @@ dm9000_start_xmit(struct sk_buff *skb, struct net_device *dev)
(db->outblk)(db->io_data, skb->data, skb->len); (db->outblk)(db->io_data, skb->data, skb->len);
db->stats.tx_bytes += skb->len; db->stats.tx_bytes += skb->len;
db->tx_pkt_cnt++;
/* TX control: First packet immediately send, second packet queue */ /* TX control: First packet immediately send, second packet queue */
if (db->tx_pkt_cnt == 0) { if (db->tx_pkt_cnt == 1) {
/* First Packet */
db->tx_pkt_cnt++;
/* Set TX length to DM9000 */ /* Set TX length to DM9000 */
iow(db, DM9000_TXPLL, skb->len & 0xff); iow(db, DM9000_TXPLL, skb->len & 0xff);
iow(db, DM9000_TXPLH, (skb->len >> 8) & 0xff); iow(db, DM9000_TXPLH, (skb->len >> 8) & 0xff);
@ -732,23 +727,17 @@ dm9000_start_xmit(struct sk_buff *skb, struct net_device *dev)
iow(db, DM9000_TCR, TCR_TXREQ); /* Cleared after TX complete */ iow(db, DM9000_TCR, TCR_TXREQ); /* Cleared after TX complete */
dev->trans_start = jiffies; /* save the time stamp */ dev->trans_start = jiffies; /* save the time stamp */
} else { } else {
/* Second packet */ /* Second packet */
db->tx_pkt_cnt++;
db->queue_pkt_len = skb->len; db->queue_pkt_len = skb->len;
netif_stop_queue(dev);
} }
spin_unlock_irqrestore(&db->lock, flags);
/* free this SKB */ /* free this SKB */
dev_kfree_skb(skb); dev_kfree_skb(skb);
/* Re-enable resource check */
if (db->tx_pkt_cnt == 1)
netif_wake_queue(dev);
/* Re-enable interrupt */
iow(db, DM9000_IMR, IMR_PAR | IMR_PTM | IMR_PRM);
return 0; return 0;
} }