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

Commit beee8072 authored by Yanir Lubetkin's avatar Yanir Lubetkin Committed by Jeff Kirsher
Browse files

e1000e: synchronization of MAC-PHY interface only on non- ME systems 



On power up, the MAC - PHY interface needs to be set to PCIe, even if
cable is disconnected.  In ME systems, the ME handles this on exit from
Sx state. In non-ME, the driver handles it. Added a check for non-ME
system to the driver code that handles that.

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 beb0a152

drivers/net/ethernet/intel/e1000e/ich8lan.c

+12 −10
Original line number Diff line number Diff line
@@ -237,8 +237,9 @@ static bool e1000_phy_is_accessible_pchlan(struct e1000_hw *hw) 
	if (ret_val)

		return false;

out:

	if ((hw->mac.type == e1000_pch_lpt) ||

	    (hw->mac.type == e1000_pch_spt)) {

	if ((hw->mac.type == e1000_pch_lpt) || (hw->mac.type == e1000_pch_spt)) {

		/* Only unforce SMBus if ME is not active */

		if (!(er32(FWSM) & E1000_ICH_FWSM_FW_VALID)) {

			/* Unforce SMBus mode in PHY */

			e1e_rphy_locked(hw, CV_SMB_CTRL, &phy_reg);

			phy_reg &= ~CV_SMB_CTRL_FORCE_SMBUS;
@@ -249,6 +250,7 @@ static bool e1000_phy_is_accessible_pchlan(struct e1000_hw *hw) 
			mac_reg &= ~E1000_CTRL_EXT_FORCE_SMBUS;

			ew32(CTRL_EXT, mac_reg);

		}

	}



	return true;

}