fm10k: start service timer on probe
authorJeff Kirsher <jeffrey.t.kirsher@intel.com>
Fri, 3 Apr 2015 20:27:09 +0000 (13:27 -0700)
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>
Tue, 14 Apr 2015 22:48:43 +0000 (15:48 -0700)
Since the service task handles varying work that doesn't all require the
interface to be up, launch the service timer immediately. This ensures
that we continually check the mailbox, as well as handle other tasks
while the device is down.

Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
Acked-by: Matthew Vick <matthew.vick@intel.com>
Tested-by: Krishneil Singh <krishneil.k.singh@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
drivers/net/ethernet/intel/fm10k/fm10k_pci.c

index 32e99ebdae662c4d504f10d9b94dafbcd4a3d9da..df9fda38bdd11d5fe85f08ed1de118b69013bf19 100644 (file)
@@ -1511,7 +1511,7 @@ void fm10k_up(struct fm10k_intfc *interface)
        /* enable transmits */
        netif_tx_start_all_queues(interface->netdev);
 
-       /* kick off the service timer */
+       /* kick off the service timer now */
        hw->mac.get_host_state = 1;
        mod_timer(&interface->service_timer, jiffies);
 }
@@ -1551,8 +1551,6 @@ void fm10k_down(struct fm10k_intfc *interface)
        /* disable polling routines */
        fm10k_napi_disable_all(interface);
 
-       del_timer_sync(&interface->service_timer);
-
        /* capture stats one last time before stopping interface */
        fm10k_update_stats(interface);
 
@@ -1678,6 +1676,9 @@ static int fm10k_sw_init(struct fm10k_intfc *interface,
                    (unsigned long)interface);
        INIT_WORK(&interface->service_task, fm10k_service_task);
 
+       /* kick off service timer now, even when interface is down */
+       mod_timer(&interface->service_timer, (HZ * 2) + jiffies);
+
        /* Intitialize timestamp data */
        fm10k_ts_init(interface);
 
@@ -1894,6 +1895,8 @@ static void fm10k_remove(struct pci_dev *pdev)
        struct fm10k_intfc *interface = pci_get_drvdata(pdev);
        struct net_device *netdev = interface->netdev;
 
+       del_timer_sync(&interface->service_timer);
+
        set_bit(__FM10K_SERVICE_DISABLE, &interface->state);
        cancel_work_sync(&interface->service_task);