* [PULL 0/1] s390/virtio update @ 2017-12-14 9:59 Cornelia Huck 2017-12-14 9:59 ` [PULL 1/1] virtio/s390: implement PM operations for virtio_ccw Cornelia Huck 2017-12-18 8:47 ` [PULL 0/1] s390/virtio update Cornelia Huck 0 siblings, 2 replies; 3+ messages in thread From: Cornelia Huck @ 2017-12-14 9:59 UTC (permalink / raw) To: mst; +Cc: jasowang, pasic, linux-s390, virtualization, kvm, Cornelia Huck The following changes since commit e073f74a5a39c6dc45f28a5006c21aa94490d9b8: Merge branch 'this' into vhost (2017-12-07 18:39:24 +0200) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git tags/virtio-s390-20171214 for you to fetch changes up to 619b4b0ba832144d4be899640a2047f9675df849: virtio/s390: implement PM operations for virtio_ccw (2017-12-14 10:32:21 +0100) ---------------------------------------------------------------- Hibernation support for virtio-ccw. ---------------------------------------------------------------- Christian Borntraeger (1): virtio/s390: implement PM operations for virtio_ccw drivers/s390/virtio/virtio_ccw.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) -- 2.13.6 ^ permalink raw reply [flat|nested] 3+ messages in thread
* [PULL 1/1] virtio/s390: implement PM operations for virtio_ccw 2017-12-14 9:59 [PULL 0/1] s390/virtio update Cornelia Huck @ 2017-12-14 9:59 ` Cornelia Huck 2017-12-18 8:47 ` [PULL 0/1] s390/virtio update Cornelia Huck 1 sibling, 0 replies; 3+ messages in thread From: Cornelia Huck @ 2017-12-14 9:59 UTC (permalink / raw) To: mst Cc: jasowang, pasic, linux-s390, virtualization, kvm, Christian Borntraeger, Cornelia Huck From: Christian Borntraeger <borntraeger@de.ibm.com> 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 <thuth@redhat.com> Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com> Message-Id: <20171207141102.70190-2-borntraeger@de.ibm.com> Reviewed-by: David Hildenbrand <david@redhat.com> Signed-off-by: Cornelia Huck <cohuck@redhat.com> --- drivers/s390/virtio/virtio_ccw.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/drivers/s390/virtio/virtio_ccw.c b/drivers/s390/virtio/virtio_ccw.c index b18fe2014cf2..330b3fa3430a 100644 --- a/drivers/s390/virtio/virtio_ccw.c +++ b/drivers/s390/virtio/virtio_ccw.c @@ -1300,6 +1300,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; @@ -1312,6 +1315,25 @@ static struct ccw_device_id virtio_ids[] = { {}, }; +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); +} + static struct ccw_driver virtio_ccw_driver = { .driver = { .owner = THIS_MODULE, @@ -1324,6 +1346,9 @@ static struct ccw_driver virtio_ccw_driver = { .set_online = virtio_ccw_online, .notify = virtio_ccw_cio_notify, .int_class = IRQIO_VIR, + .freeze = virtio_ccw_freeze, + .thaw = virtio_ccw_restore, + .restore = virtio_ccw_restore, }; static int __init pure_hex(char **cp, unsigned int *val, int min_digit, -- 2.13.6 ^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PULL 0/1] s390/virtio update 2017-12-14 9:59 [PULL 0/1] s390/virtio update Cornelia Huck 2017-12-14 9:59 ` [PULL 1/1] virtio/s390: implement PM operations for virtio_ccw Cornelia Huck @ 2017-12-18 8:47 ` Cornelia Huck 1 sibling, 0 replies; 3+ messages in thread From: Cornelia Huck @ 2017-12-18 8:47 UTC (permalink / raw) To: mst; +Cc: jasowang, pasic, linux-s390, virtualization, kvm On Thu, 14 Dec 2017 10:59:53 +0100 Cornelia Huck <cohuck@redhat.com> wrote: > The following changes since commit e073f74a5a39c6dc45f28a5006c21aa94490d9b8: > > Merge branch 'this' into vhost (2017-12-07 18:39:24 +0200) > > are available in the git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git tags/virtio-s390-20171214 > > for you to fetch changes up to 619b4b0ba832144d4be899640a2047f9675df849: > > virtio/s390: implement PM operations for virtio_ccw (2017-12-14 10:32:21 +0100) > > ---------------------------------------------------------------- > Hibernation support for virtio-ccw. > > ---------------------------------------------------------------- > > Christian Borntraeger (1): > virtio/s390: implement PM operations for virtio_ccw > > drivers/s390/virtio/virtio_ccw.c | 25 +++++++++++++++++++++++++ > 1 file changed, 25 insertions(+) > Self-NAK; this needs a fixup for !CONFIG_PM. ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-12-18 8:47 UTC | newest] Thread overview: 3+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2017-12-14 9:59 [PULL 0/1] s390/virtio update Cornelia Huck 2017-12-14 9:59 ` [PULL 1/1] virtio/s390: implement PM operations for virtio_ccw Cornelia Huck 2017-12-18 8:47 ` [PULL 0/1] s390/virtio update Cornelia Huck
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).