Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-12 00:38:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ixgbevf: Add bit to mark work queue initialization

Browse Source 
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: Mark Rustad <mark.d.rustad@intel.com>
Tested-by: Phil Schmitt <phillip.j.schmitt@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
This commit is contained in:
Mark Rustad 2014-03-12 00:38:51 +00:00 committed by Jeff Kirsher
parent 2049e1f6f5
commit ea699569b1
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/net/ethernet/intel/ixgbevf/ixgbevf.h
View File

@ -421,6 +421,7 @@ enum ixbgevf_state_t {
__IXGBEVF_DOWN, __IXGBEVF_DOWN,
__IXGBEVF_DISABLED, __IXGBEVF_DISABLED,
__IXGBEVF_REMOVING, __IXGBEVF_REMOVING,
__IXGBEVF_WORK_INIT,
}; };
struct ixgbevf_cb { struct ixgbevf_cb {

11
drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
View File

@ -107,7 +107,8 @@ static void ixgbevf_remove_adapter(struct ixgbe_hw *hw)
return; return;
hw->hw_addr = NULL; hw->hw_addr = NULL;
dev_err(&adapter->pdev->dev, "Adapter removed\n"); dev_err(&adapter->pdev->dev, "Adapter removed\n");
schedule_work(&adapter->watchdog_task); if (test_bit(__IXGBEVF_WORK_INIT, &adapter->state))
schedule_work(&adapter->watchdog_task);
} }
static void ixgbevf_check_remove(struct ixgbe_hw *hw, u32 reg) static void ixgbevf_check_remove(struct ixgbe_hw *hw, u32 reg)
@ -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.function = ixgbevf_watchdog;
adapter->watchdog_timer.data = (unsigned long)adapter; 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->reset_task, ixgbevf_reset_task);
INIT_WORK(&adapter->watchdog_task, ixgbevf_watchdog_task); INIT_WORK(&adapter->watchdog_task, ixgbevf_watchdog_task);
set_bit(__IXGBEVF_WORK_INIT, &adapter->state);
err = ixgbevf_init_interrupt_scheme(adapter); err = ixgbevf_init_interrupt_scheme(adapter);
if (err) 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 net_device *netdev = pci_get_drvdata(pdev);
struct ixgbevf_adapter *adapter = netdev_priv(netdev); struct ixgbevf_adapter *adapter = netdev_priv(netdev);
if (!test_bit(__IXGBEVF_WORK_INIT, &adapter->state))
return PCI_ERS_RESULT_DISCONNECT;
rtnl_lock(); rtnl_lock();
netif_device_detach(netdev); netif_device_detach(netdev);