1 files changed, 104 insertions, 6 deletions

diff --git a/drivers/virtio/virtio_pci.c b/drivers/virtio/virtio_pci.c
index baabb7937ec2..635e1efb3792 100644
--- a/drivers/virtio/virtio_pci.c
+++ b/drivers/virtio/virtio_pci.c
@@ -55,6 +55,10 @@ struct virtio_pci_device
         unsigned msix_vectors;
         /* Vectors allocated, excluding per-vq vectors if any */
         unsigned msix_used_vectors;
+
+        /* Status saved during hibernate/restore */
+        u8 saved_status;
+
         /* Whether we have vector per vq */
         bool per_vq_vectors;
 };
@@ -414,8 +418,8 @@ static struct virtqueue *setup_vq(struct virtio_device *vdev, unsigned index,
                   vp_dev->ioaddr + VIRTIO_PCI_QUEUE_PFN);
 
         /* create the vring */
-        vq = vring_new_virtqueue(info->num, VIRTIO_PCI_VRING_ALIGN,
-                                 vdev, info->queue, vp_notify, callback, name);
+        vq = vring_new_virtqueue(info->num, VIRTIO_PCI_VRING_ALIGN, vdev,
+                                 true, info->queue, vp_notify, callback, name);
         if (!vq) {
                 err = -ENOMEM;
                 goto out_activate_queue;
@@ -716,19 +720,114 @@ static void __devexit virtio_pci_remove(struct pci_dev *pci_dev)
 }
 
 #ifdef CONFIG_PM
-static int virtio_pci_suspend(struct pci_dev *pci_dev, pm_message_t state)
+static int virtio_pci_suspend(struct device *dev)
 {
+        struct pci_dev *pci_dev = to_pci_dev(dev);
+
         pci_save_state(pci_dev);
         pci_set_power_state(pci_dev, PCI_D3hot);
         return 0;
 }
 
-static int virtio_pci_resume(struct pci_dev *pci_dev)
+static int virtio_pci_resume(struct device *dev)
 {
+        struct pci_dev *pci_dev = to_pci_dev(dev);
+
         pci_restore_state(pci_dev);
         pci_set_power_state(pci_dev, PCI_D0);
         return 0;
 }
+
+static int virtio_pci_freeze(struct device *dev)
+{
+        struct pci_dev *pci_dev = to_pci_dev(dev);
+        struct virtio_pci_device *vp_dev = pci_get_drvdata(pci_dev);
+        struct virtio_driver *drv;
+        int ret;
+
+        drv = container_of(vp_dev->vdev.dev.driver,
+                           struct virtio_driver, driver);
+
+        ret = 0;
+        vp_dev->saved_status = vp_get_status(&vp_dev->vdev);
+        if (drv && drv->freeze)
+                ret = drv->freeze(&vp_dev->vdev);
+
+        if (!ret)
+                pci_disable_device(pci_dev);
+        return ret;
+}
+
+static int restore_common(struct device *dev)
+{
+        struct pci_dev *pci_dev = to_pci_dev(dev);
+        struct virtio_pci_device *vp_dev = pci_get_drvdata(pci_dev);
+        int ret;
+
+        ret = pci_enable_device(pci_dev);
+        if (ret)
+                return ret;
+        pci_set_master(pci_dev);
+        vp_finalize_features(&vp_dev->vdev);
+
+        return ret;
+}
+
+static int virtio_pci_thaw(struct device *dev)
+{
+        struct pci_dev *pci_dev = to_pci_dev(dev);
+        struct virtio_pci_device *vp_dev = pci_get_drvdata(pci_dev);
+        struct virtio_driver *drv;
+        int ret;
+
+        ret = restore_common(dev);
+        if (ret)
+                return ret;
+
+        drv = container_of(vp_dev->vdev.dev.driver,
+                           struct virtio_driver, driver);
+
+        if (drv && drv->thaw)
+                ret = drv->thaw(&vp_dev->vdev);
+        else if (drv && drv->restore)
+                ret = drv->restore(&vp_dev->vdev);
+
+        /* Finally, tell the device we're all set */
+        if (!ret)
+                vp_set_status(&vp_dev->vdev, vp_dev->saved_status);
+
+        return ret;
+}
+
+static int virtio_pci_restore(struct device *dev)
+{
+        struct pci_dev *pci_dev = to_pci_dev(dev);
+        struct virtio_pci_device *vp_dev = pci_get_drvdata(pci_dev);
+        struct virtio_driver *drv;
+        int ret;
+
+        drv = container_of(vp_dev->vdev.dev.driver,
+                           struct virtio_driver, driver);
+
+        ret = restore_common(dev);
+        if (!ret && drv && drv->restore)
+                ret = drv->restore(&vp_dev->vdev);
+
+        /* Finally, tell the device we're all set */
+        if (!ret)
+                vp_set_status(&vp_dev->vdev, vp_dev->saved_status);
+
+        return ret;
+}
+
+static const struct dev_pm_ops virtio_pci_pm_ops = {
+        .suspend        = virtio_pci_suspend,
+        .resume         = virtio_pci_resume,
+        .freeze         = virtio_pci_freeze,
+        .thaw           = virtio_pci_thaw,
+        .restore        = virtio_pci_restore,
+        .poweroff       = virtio_pci_suspend,
+};
 #endif
 
 static struct pci_driver virtio_pci_driver = {
@@ -737,8 +836,7 @@ static struct pci_driver virtio_pci_driver = {
         .probe          = virtio_pci_probe,
         .remove         = __devexit_p(virtio_pci_remove),
 #ifdef CONFIG_PM
-        .suspend        = virtio_pci_suspend,
-        .resume         = virtio_pci_resume,
+        .driver.pm      = &virtio_pci_pm_ops,
 #endif
 };