On Wed, May 08, 2024 at 08:06:04PM +0800, Hui Wang wrote:
> The commit 861e8086029e ("e1000e: move force SMBUS from enable ulp
> function to avoid PHY loss issue") introduces a regression on
> CH_MTP_I219_LM18 (PCIID: 0x8086550A). Without the referred commit, the
> ethernet works well after suspend and resume, but after applying the
> commit, the ethernet couldn't work anymore after the resume and the
> dmesg shows that the NIC Link changes to 10Mbps (1000Mbps originally):
> [ 43.305084] e1000e 0000:00:1f.6 enp0s31f6: NIC Link is Up 10 Mbps Full
> Duplex, Flow Control: Rx/Tx
>
> Without the commit, the force SMBUS code will not be executed if
> "return 0" or "goto out" is executed in the enable_ulp(), and in my
> case, the "goto out" is executed since FWSM_FW_VALID is set. But after
> applying the commit, the force SMBUS code will be ran unconditionally.
>
> Here move the force SMBUS code back to enable_ulp() and put it
> immediate ahead of hw->phy.ops.release(hw), this could allow the
> longest settling time as possible for interface in this function and
> doesn't change the original code logic.
>
> Fixes: 861e8086029e ("e1000e: move force SMBUS from enable ulp function to
> avoid PHY loss issue")
> Signed-off-by: Hui Wang <[email protected]>
> Acked-by: Vitaly Lifshits <[email protected]>
> Tested-by: Naama Meir <[email protected]>
> Signed-off-by: Tony Nguyen <[email protected]>
> ---
> In the v2:
> Change "this commit" to "the referred commit" in the commit header
> Fix a potential infinite loop if ret_val is not zero
Reviewed-by: Simon Horman <[email protected]>
