On Mon, 12 Feb 2018 09:52:00 +0100 Christian Borntraeger <borntraeger@xxxxxxxxxx> wrote: > Michael, Conny, > it seems that this patch did not make it into 4.16-rc1. Michael, please let me know what you plan to do with the virtio-s390-20171218-v2 pull request. > > > > On 12/18/2017 05:21 PM, Cornelia Huck wrote: > > From: Christian Borntraeger <borntraeger@xxxxxxxxxx> > > > > 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@xxxxxxxxxx> > > Signed-off-by: Christian Borntraeger <borntraeger@xxxxxxxxxx> > > Message-Id: <20171207141102.70190-2-borntraeger@xxxxxxxxxx> > > Reviewed-by: David Hildenbrand <david@xxxxxxxxxx> > > [CH: merged <20171218083706.223836-1-borntraeger@xxxxxxxxxx> to fix > > !CONFIG_PM configs] > > Signed-off-by: Cornelia Huck <cohuck@xxxxxxxxxx> > > --- > > 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 b18fe2014cf2..985184ebda45 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,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, > > @@ -1324,6 +1348,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 linux-s390" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html