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

Commit cd0d7228 authored by Matt Carlson's avatar Matt Carlson Committed by David S. Miller
Browse files

tg3: Match power source to driver state 



Now that the driver state (and power source) is being more intensely
scrutinized, we need to make sure it is correct 100% of the time.  This
patch finds and fixes all dangling power state transitions.

Signed-off-by: default avatarMatt Carlson <mcarlson@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3a1e19d3

drivers/net/tg3.c

+16 −8
Original line number Original line Diff line number Diff line
@@ -2357,7 +2357,7 @@ static void tg3_pwrsrc_switch_to_vaux(struct tg3 *tp) 
	}

	}

}

}





static void tg3_frob_aux_power_5717(struct tg3 *tp)

static void tg3_frob_aux_power_5717(struct tg3 *tp, bool wol_enable)

{

{

	u32 msg = 0;

	u32 msg = 0;
@@ -2365,8 +2365,7 @@ static void tg3_frob_aux_power_5717(struct tg3 *tp) 
	if (tg3_ape_lock(tp, TG3_APE_LOCK_GPIO))

	if (tg3_ape_lock(tp, TG3_APE_LOCK_GPIO))

		return;

		return;





	if (tg3_flag(tp, ENABLE_ASF) || tg3_flag(tp, ENABLE_APE) ||

	if (tg3_flag(tp, ENABLE_ASF) || tg3_flag(tp, ENABLE_APE) || wol_enable)

	    tg3_flag(tp, WOL_ENABLE))

		msg = TG3_GPIO_MSG_NEED_VAUX;

		msg = TG3_GPIO_MSG_NEED_VAUX;





	msg = tg3_set_function_status(tp, msg);

	msg = tg3_set_function_status(tp, msg);
@@ -2383,7 +2382,7 @@ static void tg3_frob_aux_power_5717(struct tg3 *tp) 
	tg3_ape_unlock(tp, TG3_APE_LOCK_GPIO);

	tg3_ape_unlock(tp, TG3_APE_LOCK_GPIO);

}

}





static void tg3_frob_aux_power(struct tg3 *tp)

static void tg3_frob_aux_power(struct tg3 *tp, bool include_wol)

{

{

	bool need_vaux = false;

	bool need_vaux = false;
@@ -2395,7 +2394,8 @@ static void tg3_frob_aux_power(struct tg3 *tp) 
	if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5717 ||

	if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5717 ||

	    GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5719 ||

	    GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5719 ||

	    GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5720) {

	    GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5720) {

		tg3_frob_aux_power_5717(tp);

		tg3_frob_aux_power_5717(tp, include_wol ?

					tg3_flag(tp, WOL_ENABLE) != 0 : 0);

		return;

		return;

	}

	}
@@ -2411,13 +2411,14 @@ static void tg3_frob_aux_power(struct tg3 *tp) 
			if (tg3_flag(tp_peer, INIT_COMPLETE))

			if (tg3_flag(tp_peer, INIT_COMPLETE))

				return;

				return;





			if (tg3_flag(tp_peer, WOL_ENABLE) ||

			if ((include_wol && tg3_flag(tp_peer, WOL_ENABLE)) ||

			    tg3_flag(tp_peer, ENABLE_ASF))

			    tg3_flag(tp_peer, ENABLE_ASF))

				need_vaux = true;

				need_vaux = true;

		}

		}

	}

	}





	if (tg3_flag(tp, WOL_ENABLE) || tg3_flag(tp, ENABLE_ASF))

	if ((include_wol && tg3_flag(tp, WOL_ENABLE)) ||

	    tg3_flag(tp, ENABLE_ASF))

		need_vaux = true;

		need_vaux = true;





	if (need_vaux)

	if (need_vaux)
@@ -3000,7 +3001,7 @@ static int tg3_power_down_prepare(struct tg3 *tp) 
	if (!(device_should_wake) && !tg3_flag(tp, ENABLE_ASF))

	if (!(device_should_wake) && !tg3_flag(tp, ENABLE_ASF))

		tg3_power_down_phy(tp, do_low_power);

		tg3_power_down_phy(tp, do_low_power);





	tg3_frob_aux_power(tp);

	tg3_frob_aux_power(tp, true);





	/* Workaround for unstable PLL clock */

	/* Workaround for unstable PLL clock */

	if ((GET_CHIP_REV(tp->pci_chip_rev_id) == CHIPREV_5750_AX) ||

	if ((GET_CHIP_REV(tp->pci_chip_rev_id) == CHIPREV_5750_AX) ||
@@ -9556,6 +9557,8 @@ static int tg3_open(struct net_device *dev) 




err_out1:

err_out1:

	tg3_ints_fini(tp);

	tg3_ints_fini(tp);

	tg3_frob_aux_power(tp, false);

	pci_set_power_state(tp->pdev, PCI_D3hot);

	return err;

	return err;

}

}
@@ -15400,6 +15403,11 @@ static int __devinit tg3_init_one(struct pci_dev *pdev, 




	pci_set_drvdata(pdev, dev);

	pci_set_drvdata(pdev, dev);





	if (tg3_flag(tp, 5717_PLUS)) {

		/* Resume a low-power mode */

		tg3_frob_aux_power(tp, false);

	}



	err = register_netdev(dev);

	err = register_netdev(dev);

	if (err) {

	if (err) {

		dev_err(&pdev->dev, "Cannot register net device, aborting\n");

		dev_err(&pdev->dev, "Cannot register net device, aborting\n");