diff options
| author | Yanir Lubetkin <yanirx.lubetkin@intel.com> | 2015-04-22 19:25:17 +0300 |
|---|---|---|
| committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2015-06-03 03:29:52 -0700 |
| commit | 95f0d950467f1228d4e326c11150e1750a6dd1ef (patch) | |
| tree | 5349f55d20124867304a2200a48b4c83444f068e | |
| parent | bfc9473bf90457bf31d3f675d82234897c6480cd (diff) | |
| download | op-kernel-dev-95f0d950467f1228d4e326c11150e1750a6dd1ef.zip op-kernel-dev-95f0d950467f1228d4e326c11150e1750a6dd1ef.tar.gz | |
e1000e: fix logical error in flush_desc_rings
The condition under which the flush should occur was reversed. The fix
should be applied before any HW reset (unless followed by bus reset)
and before any power state transition from D0.
If E1000_FEXTNVM7_NEED_DESCRING_FLUSH bit is set in FEXTNVM7 and TDLEN > 0
the Tx ring should be flushed. (fixes ~95% of the hang states).
If the E1000_FEXTNVM7_NEED_DESCRING_FLUSH did not clear, we should also
flush the RX ring. Bug was caught by Alexander Duyck during a code review
when examining this fix.
Signed-off-by: Yanir Lubetkin <yanirx.lubetkin@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
| -rw-r--r-- | drivers/net/ethernet/intel/e1000e/netdev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c index 14ee6a6..b2d77a5 100644 --- a/drivers/net/ethernet/intel/e1000e/netdev.c +++ b/drivers/net/ethernet/intel/e1000e/netdev.c @@ -3878,7 +3878,7 @@ static void e1000_flush_desc_rings(struct e1000_adapter *adapter) /* do nothing if we're not in faulty state, or if the queue is empty */ tdlen = er32(TDLEN(0)); hang_state = er32(FEXTNVM7); - if ((hang_state & E1000_FEXTNVM7_NEED_DESCRING_FLUSH) || tdlen) + if (!(hang_state & E1000_FEXTNVM7_NEED_DESCRING_FLUSH) || !tdlen) return; e1000_flush_tx_ring(adapter); /* recheck, maybe the fault is caused by the rx ring */ |
