From bcd8a1ed600737df190c8824ca7844bf736abe8b Mon Sep 17 00:00:00 2001 From: Kai-Heng Feng Date: Tue, 23 Nov 2021 00:37:50 +0800 Subject: [PATCH] UBUNTU: SAUCE: Revert "e1000e: Additional PHY power saving in S0ix" BugLink: https://bugs.launchpad.net/bugs/1951861 This reverts commit 3ad3e28cb203309fb29022dea41cd65df0583632. The s0ix series makes e1000e on TGL and ADL fails to work after s2idle resume. There doesn't seem to be any solution soon, so revert the whole series. Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=214821 Link: https://lkml.org/lkml/2021/11/22/542 Signed-off-by: Kai-Heng Feng Acked-by: Kleber Sacilotto de Souza Acked-by: Stefan Bader Signed-off-by: Andrea Righi --- drivers/net/ethernet/intel/e1000e/netdev.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c index ebcb2a30add0..5d6df75963ba 100644 --- a/drivers/net/ethernet/intel/e1000e/netdev.c +++ b/drivers/net/ethernet/intel/e1000e/netdev.c @@ -6381,16 +6381,10 @@ 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); -- 2.39.5