Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ae6b4d9a authored by Jay Cliburn's avatar Jay Cliburn Committed by Jeff Garzik
Browse files

atl1: fix suspend regression 



Using vendor magic to force the PHY into power save mode breaks
suspend.  It isn't needed anyway, so remove it.

Tested-by: default avatarAvuton Olrich <avuton@gmail.com>
Signed-off-by: default avatarJay Cliburn <jacliburn@bellsouth.net>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent d0ec0f54

drivers/net/atlx/atl1.c

+0 −17
Original line number Diff line number Diff line
@@ -636,22 +636,6 @@ static s32 atl1_phy_leave_power_saving(struct atl1_hw *hw) 
	return atl1_write_phy_reg(hw, 30, 0);

}



/*

 * Force the PHY into power saving mode using vendor magic.

 */

#ifdef CONFIG_PM

static void atl1_phy_enter_power_saving(struct atl1_hw *hw)

{

	atl1_write_phy_reg(hw, MII_DBG_ADDR, 0);

	atl1_write_phy_reg(hw, MII_DBG_DATA, 0x124E);

	atl1_write_phy_reg(hw, MII_DBG_ADDR, 2);

	atl1_write_phy_reg(hw, MII_DBG_DATA, 0x3000);

	atl1_write_phy_reg(hw, MII_DBG_ADDR, 3);

	atl1_write_phy_reg(hw, MII_DBG_DATA, 0);



}

#endif



/*

 * Resets the PHY and make all config validate

 * hw - Struct containing variables accessed by shared code
@@ -2860,7 +2844,6 @@ disable_wol: 
	ctrl |= PCIE_PHYMISC_FORCE_RCV_DET;

	iowrite32(ctrl, hw->hw_addr + REG_PCIE_PHYMISC);

	ioread32(hw->hw_addr + REG_PCIE_PHYMISC);

	atl1_phy_enter_power_saving(hw);

	hw->phy_configured = false;

	pci_enable_wake(pdev, pci_choose_state(pdev, state), 0);

exit: