openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: 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>
This commit is contained in:
Yanir Lubetkin 2015-06-02 17:05:38 +03:00 committed by Jeff Kirsher
parent 95f0d95046
commit ff9174291e
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/ethernet/intel/e1000e/e1000.h
View File

@ -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

1
drivers/net/ethernet/intel/e1000e/ich8lan.h
View File

@ -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 */

12
drivers/net/ethernet/intel/e1000e/netdev.c
View File

@ -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)
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);
} }