1 files changed, 25 insertions, 19 deletions

diff --git a/drivers/net/vmxnet3/vmxnet3_drv.c b/drivers/net/vmxnet3/vmxnet3_drv.c
index 7af1f5cfa87a..31439818c27e 100644
--- a/drivers/net/vmxnet3/vmxnet3_drv.c
+++ b/drivers/net/vmxnet3/vmxnet3_drv.c
@@ -3290,27 +3290,15 @@ skip_arp:
 static int
 vmxnet3_resume(struct device *device)
 {
-        int err, i = 0;
+        int err;
         unsigned long flags;
         struct pci_dev *pdev = to_pci_dev(device);
         struct net_device *netdev = pci_get_drvdata(pdev);
         struct vmxnet3_adapter *adapter = netdev_priv(netdev);
-        struct Vmxnet3_PMConf *pmConf;
 
         if (!netif_running(netdev))
                 return 0;
 
-        /* Destroy wake-up filters. */
-        pmConf = adapter->pm_conf;
-        memset(pmConf, 0, sizeof(*pmConf));
-
-        adapter->shared->devRead.pmConfDesc.confVer = cpu_to_le32(1);
-        adapter->shared->devRead.pmConfDesc.confLen = cpu_to_le32(sizeof(
-                                                                  *pmConf));
-        adapter->shared->devRead.pmConfDesc.confPA =
-                cpu_to_le64(adapter->pm_conf_pa);
-
-        netif_device_attach(netdev);
         pci_set_power_state(pdev, PCI_D0);
         pci_restore_state(pdev);
         err = pci_enable_device_mem(pdev);
@@ -3319,15 +3307,31 @@ vmxnet3_resume(struct device *device)
 
         pci_enable_wake(pdev, PCI_D0, 0);
 
+        vmxnet3_alloc_intr_resources(adapter);
+
+        /* During hibernate and suspend, device has to be reinitialized as the
+         * device state need not be preserved.
+         */
+
+        /* Need not check adapter state as other reset tasks cannot run during
+         * device resume.
+         */
         spin_lock_irqsave(&adapter->cmd_lock, flags);
         VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_CMD,
-                               VMXNET3_CMD_UPDATE_PMCFG);
+                               VMXNET3_CMD_QUIESCE_DEV);
         spin_unlock_irqrestore(&adapter->cmd_lock, flags);
-        vmxnet3_alloc_intr_resources(adapter);
-        vmxnet3_request_irqs(adapter);
-        for (i = 0; i < adapter->num_rx_queues; i++)
-                napi_enable(&adapter->rx_queue[i].napi);
-        vmxnet3_enable_all_intrs(adapter);
+        vmxnet3_tq_cleanup_all(adapter);
+        vmxnet3_rq_cleanup_all(adapter);
+
+        vmxnet3_reset_dev(adapter);
+        err = vmxnet3_activate_dev(adapter);
+        if (err != 0) {
+                netdev_err(netdev,
+                           "failed to re-activate on resume, error: %d", err);
+                vmxnet3_force_close(adapter);
+                return err;
+        }
+        netif_device_attach(netdev);
 
         return 0;
 }
@@ -3335,6 +3339,8 @@ vmxnet3_resume(struct device *device)
 static const struct dev_pm_ops vmxnet3_pm_ops = {
         .suspend = vmxnet3_suspend,
         .resume = vmxnet3_resume,
+        .freeze = vmxnet3_suspend,
+        .restore = vmxnet3_resume,
 };
 #endif