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

Commit 2e7cfbdd authored by Mark Rustad's avatar Mark Rustad Committed by Jeff Kirsher
Browse files

ixgbevf: Indicate removal state explicitly 



Add a bit, __IXGBEVF_REMOVING, to indicate that the module is being
removed. The __IXGBEVF_DOWN bit had been overloaded for this purpose,
but that leads to trouble. A few places now check both __IXGBEVF_DOWN
and __IXGBEVF_REMOVING.

Signed-off-by: default avatarMark Rustad <mark.d.rustad@intel.com>
Tested-by: default avatarPhil Schmitt <phillip.j.schmitt@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent ed19231c

drivers/net/ethernet/intel/ixgbevf/ixgbevf.h

+3 −2
Original line number Diff line number Diff line 
/*******************************************************************************



  Intel 82599 Virtual Function driver

  Copyright(c) 1999 - 2012 Intel Corporation.

  Copyright(c) 1999 - 2014 Intel Corporation.



  This program is free software; you can redistribute it and/or modify it

  under the terms and conditions of the GNU General Public License,
@@ -412,7 +412,8 @@ struct ixgbevf_adapter { 
enum ixbgevf_state_t {

	__IXGBEVF_TESTING,

	__IXGBEVF_RESETTING,

	__IXGBEVF_DOWN

	__IXGBEVF_DOWN,

	__IXGBEVF_REMOVING,

};



struct ixgbevf_cb {

drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c

+9 −5
Original line number Diff line number Diff line 
/*******************************************************************************



  Intel 82599 Virtual Function driver

  Copyright(c) 1999 - 2012 Intel Corporation.

  Copyright(c) 1999 - 2014 Intel Corporation.



  This program is free software; you can redistribute it and/or modify it

  under the terms and conditions of the GNU General Public License,
@@ -608,7 +608,8 @@ static int ixgbevf_poll(struct napi_struct *napi, int budget) 
	napi_complete(napi);

	if (adapter->rx_itr_setting & 1)

		ixgbevf_set_itr(q_vector);

	if (!test_bit(__IXGBEVF_DOWN, &adapter->state))

	if (!test_bit(__IXGBEVF_DOWN, &adapter->state) &&

	    !test_bit(__IXGBEVF_REMOVING, &adapter->state))

		ixgbevf_irq_enable_queues(adapter,

					  1 << q_vector->v_idx);
@@ -833,7 +834,8 @@ static irqreturn_t ixgbevf_msix_other(int irq, void *data) 


	hw->mac.get_link_status = 1;



	if (!test_bit(__IXGBEVF_DOWN, &adapter->state))

	if (!test_bit(__IXGBEVF_DOWN, &adapter->state) &&

	    !test_bit(__IXGBEVF_REMOVING, &adapter->state))

		mod_timer(&adapter->watchdog_timer, jiffies);



	IXGBE_WRITE_REG(hw, IXGBE_VTEIMS, adapter->eims_other);
@@ -2329,6 +2331,7 @@ static void ixgbevf_reset_task(struct work_struct *work) 


	/* If we're already down or resetting, just bail */

	if (test_bit(__IXGBEVF_DOWN, &adapter->state) ||

	    test_bit(__IXGBEVF_REMOVING, &adapter->state) ||

	    test_bit(__IXGBEVF_RESETTING, &adapter->state))

		return;
@@ -2413,7 +2416,8 @@ static void ixgbevf_watchdog_task(struct work_struct *work) 


pf_has_reset:

	/* Reset the timer */

	if (!test_bit(__IXGBEVF_DOWN, &adapter->state))

	if (!test_bit(__IXGBEVF_DOWN, &adapter->state) &&

	    !test_bit(__IXGBEVF_REMOVING, &adapter->state))

		mod_timer(&adapter->watchdog_timer,

			  round_jiffies(jiffies + (2 * HZ)));
@@ -3563,7 +3567,7 @@ static void ixgbevf_remove(struct pci_dev *pdev) 
	struct net_device *netdev = pci_get_drvdata(pdev);

	struct ixgbevf_adapter *adapter = netdev_priv(netdev);



	set_bit(__IXGBEVF_DOWN, &adapter->state);

	set_bit(__IXGBEVF_REMOVING, &adapter->state);



	del_timer_sync(&adapter->watchdog_timer);