Commit ff917429 authored by Yanir Lubetkin's avatar Yanir Lubetkin Committed by Jeff Kirsher

e1000e: fix flush_desc_ring implementation

The indication that a descriptor ring flush is required was read from
FEXTNVM7 by mistake. It should be read from the PCI config space.
Signed-off-by: default avatarYanir Lubetkin <yanirx.lubetkin@intel.com>
Tested-by: default avatarAaron Brown <aaron.f.brown@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 95f0d950
...@@ -98,6 +98,8 @@ struct e1000_info; ...@@ -98,6 +98,8 @@ struct e1000_info;
#define DEFAULT_RADV 8 #define DEFAULT_RADV 8
#define BURST_RDTR 0x20 #define BURST_RDTR 0x20
#define BURST_RADV 0x20 #define BURST_RADV 0x20
#define PCICFG_DESC_RING_STATUS 0xe4
#define FLUSH_DESC_REQUIRED 0x100
/* in the case of WTHRESH, it appears at least the 82571/2 hardware /* in the case of WTHRESH, it appears at least the 82571/2 hardware
* writes back 4 descriptors when WTHRESH=5, and 3 descriptors when * writes back 4 descriptors when WTHRESH=5, and 3 descriptors when
......
...@@ -100,7 +100,6 @@ ...@@ -100,7 +100,6 @@
#define E1000_FEXTNVM7_DISABLE_PB_READ 0x00040000 #define E1000_FEXTNVM7_DISABLE_PB_READ 0x00040000
#define E1000_FEXTNVM7_DISABLE_SMB_PERST 0x00000020 #define E1000_FEXTNVM7_DISABLE_SMB_PERST 0x00000020
#define E1000_FEXTNVM7_NEED_DESCRING_FLUSH 0x00000100
#define E1000_FEXTNVM11_DISABLE_MULR_FIX 0x00002000 #define E1000_FEXTNVM11_DISABLE_MULR_FIX 0x00002000
/* bit24: RXDCTL thresholds granularity: 0 - cache lines, 1 - descriptors */ /* bit24: RXDCTL thresholds granularity: 0 - cache lines, 1 - descriptors */
......
...@@ -3867,7 +3867,7 @@ static void e1000_flush_rx_ring(struct e1000_adapter *adapter) ...@@ -3867,7 +3867,7 @@ static void e1000_flush_rx_ring(struct e1000_adapter *adapter)
static void e1000_flush_desc_rings(struct e1000_adapter *adapter) static void e1000_flush_desc_rings(struct e1000_adapter *adapter)
{ {
u32 hang_state; u16 hang_state;
u32 fext_nvm11, tdlen; u32 fext_nvm11, tdlen;
struct e1000_hw *hw = &adapter->hw; struct e1000_hw *hw = &adapter->hw;
...@@ -3877,13 +3877,15 @@ static void e1000_flush_desc_rings(struct e1000_adapter *adapter) ...@@ -3877,13 +3877,15 @@ static void e1000_flush_desc_rings(struct e1000_adapter *adapter)
ew32(FEXTNVM11, fext_nvm11); ew32(FEXTNVM11, fext_nvm11);
/* do nothing if we're not in faulty state, or if the queue is empty */ /* do nothing if we're not in faulty state, or if the queue is empty */
tdlen = er32(TDLEN(0)); tdlen = er32(TDLEN(0));
hang_state = er32(FEXTNVM7); pci_read_config_word(adapter->pdev, PCICFG_DESC_RING_STATUS,
if (!(hang_state & E1000_FEXTNVM7_NEED_DESCRING_FLUSH) || !tdlen) &hang_state);
if (!(hang_state & FLUSH_DESC_REQUIRED) || !tdlen)
return; return;
e1000_flush_tx_ring(adapter); e1000_flush_tx_ring(adapter);
/* recheck, maybe the fault is caused by the rx ring */ /* recheck, maybe the fault is caused by the rx ring */
hang_state = er32(FEXTNVM7); pci_read_config_word(adapter->pdev, PCICFG_DESC_RING_STATUS,
if (hang_state & E1000_FEXTNVM7_NEED_DESCRING_FLUSH) &hang_state);
if (hang_state & FLUSH_DESC_REQUIRED)
e1000_flush_rx_ring(adapter); e1000_flush_rx_ring(adapter);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment