qiurui
/
Centos-kernel-stream-9
mirror of https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

e1000e: Remove Meteor Lake SMBUS workarounds 

JIRA: https://issues.redhat.com/browse/RHEL-49812

commit b8473723272e346e22aa487b9046fd324b73a0a5
Author: Vitaly Lifshits <vitaly.lifshits@intel.com>
Date:   Tue Oct 1 20:08:48 2024 +0300

    e1000e: Remove Meteor Lake SMBUS workarounds

    This is a partial revert to commit 76a0a3f9cc2f ("e1000e: fix force smbus
    during suspend flow"). That commit fixed a sporadic PHY access issue but
    introduced a regression in runtime suspend flows.
    The original issue on Meteor Lake systems was rare in terms of the
    reproduction rate and the number of the systems affected.

    After the integration of commit 0a6ad4d9e169 ("e1000e: avoid failing the
    system during pm_suspend"), PHY access loss can no longer cause a
    system-level suspend failure. As it only occurs when the LAN cable is
    disconnected, and is recovered during system resume flow. Therefore, its
    functional impact is low, and the priority is given to stabilizing
    runtime suspend.

    Fixes: 76a0a3f9cc2f ("e1000e: fix force smbus during suspend flow")
    Signed-off-by: Vitaly Lifshits <vitaly.lifshits@intel.com>
    Tested-by: Avigail Dahan <avigailx.dahan@intel.com>
    Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>

Signed-off-by: Ivan Vecera <ivecera@redhat.com>
This commit is contained in:
Ivan Vecera 2024-11-20 17:13:52 +01:00
parent f1e0b72b94
commit 32d089547c
1 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/net/ethernet/intel/e1000e/ich8lan.c
View File

@ -1205,12 +1205,10 @@ s32 e1000_enable_ulp_lpt_lp(struct e1000_hw *hw, bool to_sx)
if (ret_val)
goto out;
if (hw->mac.type != e1000_pch_mtp) {
ret_val = e1000e_force_smbus(hw);
if (ret_val) {
e_dbg("Failed to force SMBUS: %d\n", ret_val);
goto release;
}
ret_val = e1000e_force_smbus(hw);
if (ret_val) {
e_dbg("Failed to force SMBUS: %d\n", ret_val);
goto release;
}
/* Si workaround for ULP entry flow on i127/rev6 h/w. Enable
@ -1273,13 +1271,6 @@ s32 e1000_enable_ulp_lpt_lp(struct e1000_hw *hw, bool to_sx)
}
release:
if (hw->mac.type == e1000_pch_mtp) {
ret_val = e1000e_force_smbus(hw);
if (ret_val)
e_dbg("Failed to force SMBUS over MTL system: %d\n",
ret_val);
}
hw->phy.ops.release(hw);
out:
if (ret_val)