From: Paolo Pisati Date: Thu, 10 Feb 2022 14:22:28 +0000 (+0100) Subject: Revert "UBUNTU: SAUCE: Revert "e1000e: Additional PHY power saving in S0ix"" X-Git-Tag: Ubuntu-5.15.0-23.23~1072 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=7d9addf3c22ef61d66fe4a35e8a780c3bf0d6c67;p=mirror_ubuntu-jammy-kernel.git Revert "UBUNTU: SAUCE: Revert "e1000e: Additional PHY power saving in S0ix"" BugLink: https://bugs.launchpad.net/bugs/1960509 This reverts commit bcd8a1ed600737df190c8824ca7844bf736abe8b. Signed-off-by: Paolo Pisati --- diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c index 5d6df75963ba..ebcb2a30add0 100644 --- a/drivers/net/ethernet/intel/e1000e/netdev.c +++ b/drivers/net/ethernet/intel/e1000e/netdev.c @@ -6381,10 +6381,16 @@ static void e1000e_s0ix_entry_flow(struct e1000_adapter *adapter) ew32(CTRL_EXT, mac_data); /* DFT control: PHY bit: page769_20[0] = 1 + * page769_20[7] - PHY PLL stop + * page769_20[8] - PHY go to the electrical idle + * page769_20[9] - PHY serdes disable * Gate PPW via EXTCNF_CTRL - set 0x0F00[7] = 1 */ e1e_rphy(hw, I82579_DFT_CTRL, &phy_data); phy_data |= BIT(0); + phy_data |= BIT(7); + phy_data |= BIT(8); + phy_data |= BIT(9); e1e_wphy(hw, I82579_DFT_CTRL, phy_data); mac_data = er32(EXTCNF_CTRL);