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

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

ixgbevf: Add bit to mark work queue initialization 



An indication of work queue initialization is needed. This is
because register accesses prior to that time can detect a removal
and attempt to schedule the watchdog task. Adding the
__IXGBEVF_WORK_INIT bit allows this to be checked and if not
set prevent the watchdog task scheduling. By checking for a
removal right after initialization, the probe can be failed
at that point without getting the watchdog task involved.

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 2049e1f6

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

+1 −0
Original line number Diff line number Diff line
@@ -421,6 +421,7 @@ enum ixbgevf_state_t { 
	__IXGBEVF_DOWN,

	__IXGBEVF_DISABLED,

	__IXGBEVF_REMOVING,

	__IXGBEVF_WORK_INIT,

};



struct ixgbevf_cb {

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

+10 −1
Original line number Diff line number Diff line
@@ -107,6 +107,7 @@ static void ixgbevf_remove_adapter(struct ixgbe_hw *hw) 
		return;

	hw->hw_addr = NULL;

	dev_err(&adapter->pdev->dev, "Adapter removed\n");

	if (test_bit(__IXGBEVF_WORK_INIT, &adapter->state))

		schedule_work(&adapter->watchdog_task);

}
@@ -3573,8 +3574,13 @@ static int ixgbevf_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	adapter->watchdog_timer.function = ixgbevf_watchdog;

	adapter->watchdog_timer.data = (unsigned long)adapter;



	if (IXGBE_REMOVED(hw->hw_addr)) {

		err = -EIO;

		goto err_sw_init;

	}

	INIT_WORK(&adapter->reset_task, ixgbevf_reset_task);

	INIT_WORK(&adapter->watchdog_task, ixgbevf_watchdog_task);

	set_bit(__IXGBEVF_WORK_INIT, &adapter->state);



	err = ixgbevf_init_interrupt_scheme(adapter);

	if (err)
@@ -3667,6 +3673,9 @@ static pci_ers_result_t ixgbevf_io_error_detected(struct pci_dev *pdev, 
	struct net_device *netdev = pci_get_drvdata(pdev);

	struct ixgbevf_adapter *adapter = netdev_priv(netdev);



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

		return PCI_ERS_RESULT_DISCONNECT;



	rtnl_lock();

	netif_device_detach(netdev);