Skip to content

Commit b847372

Browse files
vlifshtsanguy11
authored andcommitted
e1000e: Remove Meteor Lake SMBUS workarounds
This is a partial revert to commit 76a0a3f ("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 0a6ad4d ("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: 76a0a3f ("e1000e: fix force smbus during suspend flow") Signed-off-by: Vitaly Lifshits <[email protected]> Tested-by: Avigail Dahan <[email protected]> Signed-off-by: Tony Nguyen <[email protected]>
1 parent f30490e commit b847372

File tree

1 file changed

+4
-13
lines changed

1 file changed

+4
-13
lines changed

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

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1205,12 +1205,10 @@ s32 e1000_enable_ulp_lpt_lp(struct e1000_hw *hw, bool to_sx)
12051205
if (ret_val)
12061206
goto out;
12071207

1208-
if (hw->mac.type != e1000_pch_mtp) {
1209-
ret_val = e1000e_force_smbus(hw);
1210-
if (ret_val) {
1211-
e_dbg("Failed to force SMBUS: %d\n", ret_val);
1212-
goto release;
1213-
}
1208+
ret_val = e1000e_force_smbus(hw);
1209+
if (ret_val) {
1210+
e_dbg("Failed to force SMBUS: %d\n", ret_val);
1211+
goto release;
12141212
}
12151213

12161214
/* 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)
12731271
}
12741272

12751273
release:
1276-
if (hw->mac.type == e1000_pch_mtp) {
1277-
ret_val = e1000e_force_smbus(hw);
1278-
if (ret_val)
1279-
e_dbg("Failed to force SMBUS over MTL system: %d\n",
1280-
ret_val);
1281-
}
1282-
12831274
hw->phy.ops.release(hw);
12841275
out:
12851276
if (ret_val)

0 commit comments

Comments
 (0)