Re: [PATCH] skge: resolve tx multiqueue bug

[Markus Trippelsdorf]

On Wed, Jul 23, 2008 at 12:18:27PM +0200, Markus Trippelsdorf wrote:
> On Wed, Jul 23, 2008 at 04:50:13PM +0800, Wang Chen wrote:
> > Markus Trippelsdorf said the following on 2008-7-23 13:40:
> > > On Tue, Jul 22, 2008 at 11:54:26AM +0200, Alessandro Guido wrote:
> > >> Got a WARNING this morning (2.6.26-05752-g93ded9b) and I think it's related.
> > > 
> > > Same thing here (latest git):
> > > 
> > > skge eth1: enabling interface
> > > skge eth1: disabling interface
> > > ------------[ cut here ]------------
> > > WARNING: at net/core/dev.c:1344 __netif_schedule+0x24/0x6d()
> > > Pid: 1904, comm: ip Not tainted 2.6.26-06077-gc010b2f #33
> > >  [<ffffffff8020b3eb>] system_call_after_swapgs+0x7b/0x80
> ...
> > > ---[ end trace 92936ef183e09876 ]---
> > > skge eth1: enabling interface
> > > skge eth1: Link is up at 100 Mbps, full duplex, flow control both
> > > 
> > 
> > Markus, please try this.
> > 
> > - Add netif_start_queue() in ->open()
> > - netif_carrier_*() is enough, remove netif_*_queue()
> 
> Unfortunately, your patch does not fix this. I still get the same warning.
> 

This patch works for me:

diff --git a/drivers/net/skge.c b/drivers/net/skge.c
index 2e26dce..d761296 100644
--- a/drivers/net/skge.c
+++ b/drivers/net/skge.c
@@ -1069,7 +1069,6 @@ static void skge_link_up(struct skge_port *skge)
                    LED_BLK_OFF|LED_SYNC_OFF|LED_ON);

        netif_carrier_on(skge->netdev);
-       netif_wake_queue(skge->netdev);

        if (netif_msg_link(skge)) {
                printk(KERN_INFO PFX
@@ -1084,7 +1083,6 @@ static void skge_link_down(struct skge_port *skge)
 {
        skge_write8(skge->hw, SK_REG(skge->port, LNK_LED_REG), LED_OFF);
        netif_carrier_off(skge->netdev);
-       netif_stop_queue(skge->netdev);

        if (netif_msg_link(skge))
                printk(KERN_INFO PFX "%s: Link is down.\n", skge->netdev->name);
@@ -2450,7 +2448,6 @@ static void skge_phy_reset(struct skge_port *skge)
        int port = skge->port;
        struct net_device *dev = hw->dev[port];

-       netif_stop_queue(skge->netdev);
        netif_carrier_off(skge->netdev);

        spin_lock_bh(&hw->phy_lock);
@@ -2640,6 +2637,7 @@ static int skge_up(struct net_device *dev)
        spin_unlock_irq(&hw->hw_lock);

        napi_enable(&skge->napi);
+       netif_start_queue(dev);
        return 0;

  free_rx_ring:
@@ -2673,8 +2671,6 @@ static int skge_down(struct net_device *dev)
        if (netif_msg_ifdown(skge))
                printk(KERN_INFO PFX "%s: disabling interface\n", dev->name);

-       netif_stop_queue(dev);
-
        if (hw->chip_id == CHIP_ID_GENESIS && hw->phy_type == SK_PHY_XMAC)
                del_timer_sync(&skge->link_timer);

@@ -3863,7 +3859,6 @@ static struct net_device *skge_devinit(struct skge_hw *hw, int port,

        /* device is off until link detection */
        netif_carrier_off(dev);
-       netif_stop_queue(dev);

        return dev;
 }


-- 
Markus
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/