Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 40b20122 authored by Carolyn Wyborny's avatar Carolyn Wyborny Committed by Jeff Kirsher
Browse files

igb: Remove workaround for EEE configuration on i210/I211 



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: default avatarCarolyn Wyborny <carolyn.wyborny@intel.com>
Tested-by: default avatarAaron Brown <aaron.f.brown@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 3af3361e

drivers/net/ethernet/intel/igb/e1000_82575.c

+8 −11
Original line number Diff line number Diff line
@@ -2233,19 +2233,16 @@ s32 igb_set_eee_i350(struct e1000_hw *hw) 


	/* enable or disable per user setting */

	if (!(hw->dev_spec._82575.eee_disable)) {

		ipcnfg |= (E1000_IPCNFG_EEE_1G_AN |

			E1000_IPCNFG_EEE_100M_AN);

		eeer |= (E1000_EEER_TX_LPI_EN |

			E1000_EEER_RX_LPI_EN |

		u32 eee_su = rd32(E1000_EEE_SU);



		ipcnfg |= (E1000_IPCNFG_EEE_1G_AN | E1000_IPCNFG_EEE_100M_AN);

		eeer |= (E1000_EEER_TX_LPI_EN | E1000_EEER_RX_LPI_EN |

			E1000_EEER_LPI_FC);



		/* keep the LPI clock running before EEE is enabled */

		if (hw->mac.type == e1000_i210 || hw->mac.type == e1000_i211) {

			u32 eee_su;

			eee_su = rd32(E1000_EEE_SU);

			eee_su &= ~E1000_EEE_SU_LPI_CLK_STP;

			wr32(E1000_EEE_SU, eee_su);

		}

		/* This bit should not be set in normal operation. */

		if (eee_su & E1000_EEE_SU_LPI_CLK_STP)

			hw_dbg("LPI Clock Stop Bit should not be set!\n");





	} else {

		ipcnfg &= ~(E1000_IPCNFG_EEE_1G_AN |