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

Commit 87eabe6b authored by Huang, Xiong's avatar Huang, Xiong Committed by David S. Miller
Browse files

atl1c: clear WoL status when reset pcie 



WoL status is read-clear and should be cleared when in S0
status.
putting it in atl1c_reset_pcie is more suitable than
in atl1c_get_permanent_address.

Signed-off-by: default avatarxiong <xiong@qca.qualcomm.com>
Tested-by: default avatarLiu David <dwliu@qca.qualcomm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 903d7ce0

drivers/net/ethernet/atheros/atl1c/atl1c_hw.c

+0 −5
Original line number Diff line number Diff line
@@ -73,7 +73,6 @@ static int atl1c_get_permanent_address(struct atl1c_hw *hw) 
	u32 otp_ctrl_data;

	u32 twsi_ctrl_data;

	u32 ltssm_ctrl_data;

	u32 wol_data;

	u8  eth_addr[ETH_ALEN];

	u16 phy_data;

	bool raise_vol = false;
@@ -114,10 +113,6 @@ static int atl1c_get_permanent_address(struct atl1c_hw *hw) 
		ltssm_ctrl_data &= ~LTSSM_ID_EN_WRO;

		AT_WRITE_REG(hw, REG_LTSSM_ID_CTRL, ltssm_ctrl_data);



		/* clear any WOL settings */

		AT_WRITE_REG(hw, REG_WOL_CTRL, 0);

		AT_READ_REG(hw, REG_WOL_CTRL, &wol_data);





		AT_READ_REG(hw, REG_TWSI_CTRL, &twsi_ctrl_data);

		twsi_ctrl_data |= TWSI_CTRL_SW_LDSTART;

drivers/net/ethernet/atheros/atl1c/atl1c_main.c

+3 −0
Original line number Diff line number Diff line
@@ -133,6 +133,9 @@ static void atl1c_reset_pcie(struct atl1c_hw *hw, u32 flag) 
	 */

	pci_enable_wake(pdev, PCI_D3hot, 0);

	pci_enable_wake(pdev, PCI_D3cold, 0);

	/* wol sts read-clear */

	AT_READ_REG(hw, REG_WOL_CTRL, &data);

	AT_WRITE_REG(hw, REG_WOL_CTRL, 0);



	/*

	 * Mask some pcie error bits