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

Commit 6a9eba15 authored by Michael Chan's avatar Michael Chan Committed by David S. Miller
Browse files

[TG3]: Fix suspend and resume 



Fix tg3_suspend() and tg3_resume() by clearing and setting the
TG3_FLAG_INIT_COMPLETE flag when appropriate. tg3_set_power_state()
looks at TG3_FLAG_INIT_COMPLETE on the peer device to determine
when to appropriately switch to aux power.  

Signed-off-by: default avatarMichael Chan <mchan@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 381291b7

drivers/net/tg3.c

+3 −0
Original line number Original line Diff line number Diff line
@@ -10826,12 +10826,14 @@ static int tg3_suspend(struct pci_dev *pdev, pm_message_t state) 




	tg3_full_lock(tp, 0);

	tg3_full_lock(tp, 0);

	tg3_halt(tp, RESET_KIND_SHUTDOWN, 1);

	tg3_halt(tp, RESET_KIND_SHUTDOWN, 1);

	tp->tg3_flags &= ~TG3_FLAG_INIT_COMPLETE;

	tg3_full_unlock(tp);

	tg3_full_unlock(tp);





	err = tg3_set_power_state(tp, pci_choose_state(pdev, state));

	err = tg3_set_power_state(tp, pci_choose_state(pdev, state));

	if (err) {

	if (err) {

		tg3_full_lock(tp, 0);

		tg3_full_lock(tp, 0);





		tp->tg3_flags |= TG3_FLAG_INIT_COMPLETE;

		tg3_init_hw(tp);

		tg3_init_hw(tp);





		tp->timer.expires = jiffies + tp->timer_offset;

		tp->timer.expires = jiffies + tp->timer_offset;
@@ -10865,6 +10867,7 @@ static int tg3_resume(struct pci_dev *pdev) 




	tg3_full_lock(tp, 0);

	tg3_full_lock(tp, 0);





	tp->tg3_flags |= TG3_FLAG_INIT_COMPLETE;

	tg3_init_hw(tp);

	tg3_init_hw(tp);





	tp->timer.expires = jiffies + tp->timer_offset;

	tp->timer.expires = jiffies + tp->timer_offset;