Commit 3508ea333ed5414561af4c818b3b80c0acca1845
Committed by
David S. Miller
David S. Miller
1 parent
446266b0c7
Exists in
smarc-imx_3.14.28_1.0.0_ga
and in
1 other branch
sis900: Fix the tx queue timeout issue
[ 198.720048] ------------[ cut here ]------------ [ 198.720108] WARNING: CPU: 0 PID: 0 at net/sched/sch_generic.c:255 dev_watchdog+0x229/0x240() [ 198.720118] NETDEV WATCHDOG: eth0 (sis900): transmit queue 0 timed out [ 198.720125] Modules linked in: bridge stp llc dmfe sundance 3c59x sis900 mii [ 198.720159] CPU: 0 PID: 0 Comm: swapper Not tainted 3.11.0-rc3+ #12 [ 198.720167] Hardware name: System Manufacturer System Name/TUSI-M, BIOS ASUS TUSI-M ACPI BIOS Revision 1013 Beta 001 12/14/2001 [ 198.720175] 000000ff c13fa6b9 c169ddcc c12208d6 c169ddf8 c1031e4d c1664a84 c169de24 [ 198.720197] 00000000 c165f5ea 000000ff c13fa6b9 00000001 000000ff c1664a84 c169de10 [ 198.720217] c1031f13 00000009 c169de08 c1664a84 c169de24 c169de50 c13fa6b9 c165f5ea [ 198.720240] Call Trace: [ 198.720257] [<c13fa6b9>] ? dev_watchdog+0x229/0x240 [ 198.720274] [<c12208d6>] dump_stack+0x16/0x20 [ 198.720306] [<c1031e4d>] warn_slowpath_common+0x7d/0xa0 [ 198.720318] [<c13fa6b9>] ? dev_watchdog+0x229/0x240 [ 198.720330] [<c1031f13>] warn_slowpath_fmt+0x33/0x40 [ 198.720342] [<c13fa6b9>] dev_watchdog+0x229/0x240 [ 198.720357] [<c103f158>] call_timer_fn+0x78/0x150 [ 198.720369] [<c103f0e0>] ? internal_add_timer+0x40/0x40 [ 198.720381] [<c13fa490>] ? dev_init_scheduler+0xa0/0xa0 [ 198.720392] [<c103f33f>] run_timer_softirq+0x10f/0x200 [ 198.720412] [<c103954f>] ? __do_softirq+0x6f/0x210 [ 198.720424] [<c13fa490>] ? dev_init_scheduler+0xa0/0xa0 [ 198.720435] [<c1039598>] __do_softirq+0xb8/0x210 [ 198.720467] [<c14b54d2>] ? _raw_spin_unlock+0x22/0x30 [ 198.720484] [<c1003245>] ? handle_irq+0x25/0xd0 [ 198.720496] [<c1039c0c>] irq_exit+0x9c/0xb0 [ 198.720508] [<c14bc9d7>] do_IRQ+0x47/0x94 [ 198.720534] [<c1056078>] ? hrtimer_start+0x28/0x30 [ 198.720564] [<c14bc8b1>] common_interrupt+0x31/0x38 [ 198.720589] [<c1008692>] ? default_idle+0x22/0xa0 [ 198.720600] [<c10083c7>] arch_cpu_idle+0x17/0x30 [ 198.720631] [<c106d23d>] cpu_startup_entry+0xcd/0x180 [ 198.720643] [<c14ae30a>] rest_init+0xaa/0xb0 [ 198.720654] [<c14ae260>] ? reciprocal_value+0x50/0x50 [ 198.720668] [<c17044e0>] ? repair_env_string+0x60/0x60 [ 198.720679] [<c1704bda>] start_kernel+0x29a/0x350 [ 198.720690] [<c17044e0>] ? repair_env_string+0x60/0x60 [ 198.720721] [<c1704269>] i386_start_kernel+0x39/0xa0 [ 198.720729] ---[ end trace 81e0a6266f5c73a8 ]--- [ 198.720740] eth0: Transmit timeout, status 00000204 00000000 timer routine checks the link status and if it's up calls netif_carrier_on() allowing upper layer to start the tx queue even if the auto-negotiation process is not finished. Also remove ugly auto-negotiation check from the sis900_start_xmit() CC: Duan Fugang <B38611@freescale.com> CC: Ben Hutchings <bhutchings@solarflare.com> Signed-off-by: Denis Kirjanov <kda@linux-powerpc.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Showing 1 changed file with 2 additions and 10 deletions Side-by-side Diff
drivers/net/ethernet/sis/sis900.c
| ... | ... | @@ -1318,7 +1318,7 @@ |
| 1318 | 1318 | if (duplex){ |
| 1319 | 1319 | sis900_set_mode(sis_priv, speed, duplex); |
| 1320 | 1320 | sis630_set_eq(net_dev, sis_priv->chipset_rev); |
| 1321 | - netif_start_queue(net_dev); | |
| 1321 | + netif_carrier_on(net_dev); | |
| 1322 | 1322 | } |
| 1323 | 1323 | |
| 1324 | 1324 | sis_priv->timer.expires = jiffies + HZ; |
| 1325 | 1325 | |
| ... | ... | @@ -1336,10 +1336,8 @@ |
| 1336 | 1336 | status = sis900_default_phy(net_dev); |
| 1337 | 1337 | mii_phy = sis_priv->mii; |
| 1338 | 1338 | |
| 1339 | - if (status & MII_STAT_LINK){ | |
| 1339 | + if (status & MII_STAT_LINK) | |
| 1340 | 1340 | sis900_check_mode(net_dev, mii_phy); |
| 1341 | - netif_carrier_on(net_dev); | |
| 1342 | - } | |
| 1343 | 1341 | } else { |
| 1344 | 1342 | /* Link ON -> OFF */ |
| 1345 | 1343 | if (!(status & MII_STAT_LINK)){ |
| ... | ... | @@ -1611,12 +1609,6 @@ |
| 1611 | 1609 | unsigned long flags; |
| 1612 | 1610 | unsigned int index_cur_tx, index_dirty_tx; |
| 1613 | 1611 | unsigned int count_dirty_tx; |
| 1614 | - | |
| 1615 | - /* Don't transmit data before the complete of auto-negotiation */ | |
| 1616 | - if(!sis_priv->autong_complete){ | |
| 1617 | - netif_stop_queue(net_dev); | |
| 1618 | - return NETDEV_TX_BUSY; | |
| 1619 | - } | |
| 1620 | 1612 | |
| 1621 | 1613 | spin_lock_irqsave(&sis_priv->lock, flags); |
| 1622 | 1614 |