virtio/s390: implement PM operations for virtio_ccw

Web:        https://git.kernel.org/torvalds/c/fa08a3b4eba59429cf7e241a7af089103e79160f
Commit:     fa08a3b4eba59429cf7e241a7af089103e79160f
Parent:     26d99834f89e76514076d9cd06f61e56e6a509b8
Refname:    refs/heads/master
Author:     Christian Borntraeger <[email protected]>
AuthorDate: Mon Dec 18 17:21:23 2017 +0100
Committer:  Michael S. Tsirkin <[email protected]>
CommitDate: Wed Feb 14 14:34:09 2018 +0200

    virtio/s390: implement PM operations for virtio_ccw
    
    Suspend/Resume to/from disk currently fails. Let us wire
    up the necessary callbacks. This is mostly just forwarding
    the requests to the virtio drivers. The only thing that
    has to be done in virtio_ccw itself is to re-set the
    virtio revision.
    
    Suggested-by: Thomas Huth <[email protected]>
    Signed-off-by: Christian Borntraeger <[email protected]>
    Message-Id: <[email protected]>
    Reviewed-by: David Hildenbrand <[email protected]>
    [CH: merged <[email protected]> to fix
    !CONFIG_PM configs]
    Signed-off-by: Cornelia Huck <[email protected]>
    Signed-off-by: Michael S. Tsirkin <[email protected]>
---
 drivers/s390/virtio/virtio_ccw.c | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/drivers/s390/virtio/virtio_ccw.c b/drivers/s390/virtio/virtio_ccw.c
index ba2e0856d22c..8f5c1d7f751a 100644
--- a/drivers/s390/virtio/virtio_ccw.c
+++ b/drivers/s390/virtio/virtio_ccw.c
@@ -1297,6 +1297,9 @@ static int virtio_ccw_cio_notify(struct ccw_device *cdev, int event)
 		vcdev->device_lost = true;
 		rc = NOTIFY_DONE;
 		break;
+	case CIO_OPER:
+		rc = NOTIFY_OK;
+		break;
 	default:
 		rc = NOTIFY_DONE;
 		break;
@@ -1309,6 +1312,27 @@ static struct ccw_device_id virtio_ids[] = {
 	{},
 };
 
+#ifdef CONFIG_PM_SLEEP
+static int virtio_ccw_freeze(struct ccw_device *cdev)
+{
+	struct virtio_ccw_device *vcdev = dev_get_drvdata(&cdev->dev);
+
+	return virtio_device_freeze(&vcdev->vdev);
+}
+
+static int virtio_ccw_restore(struct ccw_device *cdev)
+{
+	struct virtio_ccw_device *vcdev = dev_get_drvdata(&cdev->dev);
+	int ret;
+
+	ret = virtio_ccw_set_transport_rev(vcdev);
+	if (ret)
+		return ret;
+
+	return virtio_device_restore(&vcdev->vdev);
+}
+#endif
+
 static struct ccw_driver virtio_ccw_driver = {
 	.driver = {
 		.owner = THIS_MODULE,
@@ -1321,6 +1345,11 @@ static struct ccw_driver virtio_ccw_driver = {
 	.set_online = virtio_ccw_online,
 	.notify = virtio_ccw_cio_notify,
 	.int_class = IRQIO_VIR,
+#ifdef CONFIG_PM_SLEEP
+	.freeze = virtio_ccw_freeze,
+	.thaw = virtio_ccw_restore,
+	.restore = virtio_ccw_restore,
+#endif
 };
 
 static int __init pure_hex(char **cp, unsigned int *val, int min_digit,
--
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html