lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

igb: Remove workaround for EEE configuration on i210/I211

Browse Source 
This patch removes a workaround that was needed on pre-release hardware.
Released hardware should not have this setting, but any devices that do
will get a warning message instead.

Signed-off-by: Carolyn Wyborny <carolyn.wyborny@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:
Carolyn Wyborny
2012-10-19 05:31:43 +00:00
committed by Jeff Kirsher
parent 3af3361e6c
commit 40b20122f9
1 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/net/ethernet/intel/igb/e1000_82575.c
View File

@@ -2233,19 +2233,16 @@ s32 igb_set_eee_i350(struct e1000_hw *hw)
/* enable or disable per user setting */ /* enable or disable per user setting */
if (!(hw->dev_spec._82575.eee_disable)) { if (!(hw->dev_spec._82575.eee_disable)) {
ipcnfg |= (E1000_IPCNFG_EEE_1G_AN | u32 eee_su = rd32(E1000_EEE_SU);
E1000_IPCNFG_EEE_100M_AN);
eeer |= (E1000_EEER_TX_LPI_EN | ipcnfg |= (E1000_IPCNFG_EEE_1G_AN | E1000_IPCNFG_EEE_100M_AN);
E1000_EEER_RX_LPI_EN | eeer |= (E1000_EEER_TX_LPI_EN | E1000_EEER_RX_LPI_EN |
E1000_EEER_LPI_FC); E1000_EEER_LPI_FC);
/* keep the LPI clock running before EEE is enabled */ /* This bit should not be set in normal operation. */
if (hw->mac.type == e1000_i210 || hw->mac.type == e1000_i211) { if (eee_su & E1000_EEE_SU_LPI_CLK_STP)
u32 eee_su; hw_dbg("LPI Clock Stop Bit should not be set!\n");
eee_su = rd32(E1000_EEE_SU);
eee_su &= ~E1000_EEE_SU_LPI_CLK_STP;
wr32(E1000_EEE_SU, eee_su);
}
} else { } else {
ipcnfg &= ~(E1000_IPCNFG_EEE_1G_AN | ipcnfg &= ~(E1000_IPCNFG_EEE_1G_AN |