Attachment 145058 Details for Bug 217932 – Second try for 8139cp netpoll patch

[patch] Second try for 8139cp netpoll patch

linux-2.6.9-8139cp-netpoll-2.patch (text/plain), 2.05 KB, created by Chris Lalancette on 2007-01-08 14:52:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Lalancette

Created: 2007-01-08 14:52:06 UTC

Size: 2.05 KB

patch

obsolete

>--- linux-2.6.9/drivers/net/8139cp.c.orig	2007-01-06 16:49:29.000000000 -0500
>+++ linux-2.6.9/drivers/net/8139cp.c	2007-01-06 16:52:42.000000000 -0500
>@@ -615,13 +615,14 @@ rx_next:
> 	 * this round of polling
> 	 */
> 	if (rx_work) {
>+		unsigned long flags;
> 		if (cpr16(IntrStatus) & cp_rx_intr_mask)
> 			goto rx_status_loop;
> 
>-		local_irq_disable();
>+		local_irq_save(flags);
> 		cpw16_f(IntrMask, cp_intr_mask);
> 		__netif_rx_complete(dev);
>-		local_irq_enable();
>+		local_irq_restore(flags);
> 
> 		return 0;	/* done */
> 	}
>@@ -686,6 +687,15 @@ cp_interrupt (int irq, void *dev_instanc
> 	return IRQ_HANDLED;
> }
> 
>+#ifdef CONFIG_NET_POLL_CONTROLLER
>+static void cp_poll_controller(struct net_device *dev)
>+{
>+	disable_irq(dev->irq);
>+	cp_interrupt(dev->irq, dev, NULL);
>+	enable_irq(dev->irq); 
>+}
>+#endif
>+
> static void cp_tx (struct cp_private *cp)
> {
> 	unsigned tx_head = cp->tx_head;
>@@ -747,17 +757,18 @@ static int cp_start_xmit (struct sk_buff
> {
> 	struct cp_private *cp = netdev_priv(dev);
> 	unsigned entry;
>+	unsigned long flags;
> 	u32 eor;
> #if CP_VLAN_TAG_USED
> 	u32 vlan_tag = 0;
> #endif
> 
>-	spin_lock_irq(&cp->lock);
>+	spin_lock_irqsave(&cp->lock, flags);
> 
> 	/* This is a hard error, log it. */
> 	if (TX_BUFFS_AVAIL(cp) <= (skb_shinfo(skb)->nr_frags + 1)) {
> 		netif_stop_queue(dev);
>-		spin_unlock_irq(&cp->lock);
>+		spin_unlock_irqrestore(&cp->lock, flags);
> 		printk(KERN_ERR PFX "%s: BUG! Tx Ring full when queue awake!\n",
> 		       dev->name);
> 		return 1;
>@@ -890,7 +901,7 @@ static int cp_start_xmit (struct sk_buff
> 	if (TX_BUFFS_AVAIL(cp) <= (MAX_SKB_FRAGS + 1))
> 		netif_stop_queue(dev);
> 
>-	spin_unlock_irq(&cp->lock);
>+	spin_unlock_irqrestore(&cp->lock, flags);
> 
> 	cpw8(TxPoll, NormalTxPoll);
> 	dev->trans_start = jiffies;
>@@ -1747,6 +1758,9 @@ static int cp_init_one (struct pci_dev *
> 	dev->get_stats = cp_get_stats;
> 	dev->do_ioctl = cp_ioctl;
> 	dev->poll = cp_rx_poll;
>+#ifdef CONFIG_NET_POLL_CONTROLLER
>+	dev->poll_controller = cp_poll_controller;
>+#endif
> 	dev->weight = 16;	/* arbitrary? from NAPI_HOWTO.txt. */
> #ifdef BROKEN
> 	dev->change_mtu = cp_change_mtu;

Actions: View | Diff

Attachments on bug 217932: 144841 | 145057 | 145058