search for: virtio_pci_restor

Hello, Turns out S3 is not different from S4 for virtio devices: the device is assumed to be reset, so the host and guest state are to be assumed to be out of sync upon resume. We handle the S4 case with exactly the same scenario, so just point the suspend/resume routines to the freeze/restore ones. Once that is done, we also use the PM API's macro to initialise the sleep functions. A

Hello, Turns out S3 is not different from S4 for virtio devices: the device is assumed to be reset, so the host and guest state are to be assumed to be out of sync upon resume. We handle the S4 case with exactly the same scenario, so just point the suspend/resume routines to the freeze/restore ones. Once that is done, we also use the PM API's macro to initialise the sleep functions. A

...ers/virtio/virtio_pci.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/virtio/virtio_pci.c b/drivers/virtio/virtio_pci.c index 3d1463c6b120..c5fbdb4023d1 100644 --- a/drivers/virtio/virtio_pci.c +++ b/drivers/virtio/virtio_pci.c @@ -810,20 +810,17 @@ static int virtio_pci_restore(struct device *dev) return ret; } - -static const struct dev_pm_ops virtio_pci_pm_ops = { - SET_SYSTEM_SLEEP_PM_OPS(virtio_pci_freeze, virtio_pci_restore) -}; #endif +static SIMPLE_DEV_PM_OPS(virtio_pci_pm_ops, virtio_pci_freeze, + virtio_pci_restore); + static struct pci_driver virtio...

...ers/virtio/virtio_pci.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/virtio/virtio_pci.c b/drivers/virtio/virtio_pci.c index 3d1463c6b120..c5fbdb4023d1 100644 --- a/drivers/virtio/virtio_pci.c +++ b/drivers/virtio/virtio_pci.c @@ -810,20 +810,17 @@ static int virtio_pci_restore(struct device *dev) return ret; } - -static const struct dev_pm_ops virtio_pci_pm_ops = { - SET_SYSTEM_SLEEP_PM_OPS(virtio_pci_freeze, virtio_pci_restore) -}; #endif +static SIMPLE_DEV_PM_OPS(virtio_pci_pm_ops, virtio_pci_freeze, + virtio_pci_restore); + static struct pci_driver virtio...

...is not cofigured but CONFIG_PM_RUNTIME is, the following warning message appeared: drivers/virtio/virtio_pci.c:770:12: warning: ?virtio_pci_freeze? defined but not used [-Wunused-function] static int virtio_pci_freeze(struct device *dev) ^ drivers/virtio/virtio_pci.c:790:12: warning: ?virtio_pci_restore? defined but not used [-Wunused-function] static int virtio_pci_restore(struct device *dev) ^ Fix it by changing CONFIG_PM to CONFIG_PM_SLEEP. Signed-off-by: Aaron Lu <aaron.lu at intel.com> --- drivers/virtio/virtio_pci.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions...

...is not cofigured but CONFIG_PM_RUNTIME is, the following warning message appeared: drivers/virtio/virtio_pci.c:770:12: warning: ?virtio_pci_freeze? defined but not used [-Wunused-function] static int virtio_pci_freeze(struct device *dev) ^ drivers/virtio/virtio_pci.c:790:12: warning: ?virtio_pci_restore? defined but not used [-Wunused-function] static int virtio_pci_restore(struct device *dev) ^ Fix it by changing CONFIG_PM to CONFIG_PM_SLEEP. Signed-off-by: Aaron Lu <aaron.lu at intel.com> --- drivers/virtio/virtio_pci.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions...

..._pci.c | 36 ++++++++++++++++++++++++++++++++---- 1 file changed, 32 insertions(+), 4 deletions(-) diff --git a/drivers/virtio/virtio_pci.c b/drivers/virtio/virtio_pci.c index 58f7e45..58cbf6e 100644 --- a/drivers/virtio/virtio_pci.c +++ b/drivers/virtio/virtio_pci.c @@ -785,6 +785,7 @@ 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; + unsigned status = 0; int ret; drv = container_of(vp_dev->vdev.dev.driver, @@ -795,14 +796,41 @@ static int virtio_pci_restore(stru...

..._pci.c | 36 ++++++++++++++++++++++++++++++++---- 1 file changed, 32 insertions(+), 4 deletions(-) diff --git a/drivers/virtio/virtio_pci.c b/drivers/virtio/virtio_pci.c index 58f7e45..58cbf6e 100644 --- a/drivers/virtio/virtio_pci.c +++ b/drivers/virtio/virtio_pci.c @@ -785,6 +785,7 @@ 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; + unsigned status = 0; int ret; drv = container_of(vp_dev->vdev.dev.driver, @@ -795,14 +796,41 @@ static int virtio_pci_restore(stru...

...he following warning message appeared: >> >> drivers/virtio/virtio_pci.c:770:12: warning: ?virtio_pci_freeze? defined but not used [-Wunused-function] >> static int virtio_pci_freeze(struct device *dev) >> ^ >> drivers/virtio/virtio_pci.c:790:12: warning: ?virtio_pci_restore? defined but not used [-Wunused-function] >> static int virtio_pci_restore(struct device *dev) >> ^ >> Fix it by changing CONFIG_PM to CONFIG_PM_SLEEP. >> >> Signed-off-by: Aaron Lu <aaron.lu at intel.com> >> --- >> drivers/virtio/virti...

...he following warning message appeared: >> >> drivers/virtio/virtio_pci.c:770:12: warning: ?virtio_pci_freeze? defined but not used [-Wunused-function] >> static int virtio_pci_freeze(struct device *dev) >> ^ >> drivers/virtio/virtio_pci.c:790:12: warning: ?virtio_pci_restore? defined but not used [-Wunused-function] >> static int virtio_pci_restore(struct device *dev) >> ^ >> Fix it by changing CONFIG_PM to CONFIG_PM_SLEEP. >> >> Signed-off-by: Aaron Lu <aaron.lu at intel.com> >> --- >> drivers/virtio/virti...

...--- > 1 file changed, 3 insertions(+), 6 deletions(-) > > diff --git a/drivers/virtio/virtio_pci.c b/drivers/virtio/virtio_pci.c > index 3d1463c6b120..c5fbdb4023d1 100644 > --- a/drivers/virtio/virtio_pci.c > +++ b/drivers/virtio/virtio_pci.c > @@ -810,20 +810,17 @@ static int virtio_pci_restore(struct device *dev) > > return ret; > } > - > -static const struct dev_pm_ops virtio_pci_pm_ops = { > - SET_SYSTEM_SLEEP_PM_OPS(virtio_pci_freeze, virtio_pci_restore) > -}; > #endif > > +static SIMPLE_DEV_PM_OPS(virtio_pci_pm_ops, virtio_pci_freeze, > +...

...sertions(+), 6 deletions(-) > > > > diff --git a/drivers/virtio/virtio_pci.c b/drivers/virtio/virtio_pci.c > > index 3d1463c6b120..c5fbdb4023d1 100644 > > --- a/drivers/virtio/virtio_pci.c > > +++ b/drivers/virtio/virtio_pci.c > > @@ -810,20 +810,17 @@ static int virtio_pci_restore(struct device *dev) > > > > return ret; > > } > > - > > -static const struct dev_pm_ops virtio_pci_pm_ops = { > > - SET_SYSTEM_SLEEP_PM_OPS(virtio_pci_freeze, virtio_pci_restore) > > -}; > > #endif > > > > +static SIMPLE_DEV_PM_OPS(vi...

...sertions(+), 6 deletions(-) > > > > diff --git a/drivers/virtio/virtio_pci.c b/drivers/virtio/virtio_pci.c > > index 3d1463c6b120..c5fbdb4023d1 100644 > > --- a/drivers/virtio/virtio_pci.c > > +++ b/drivers/virtio/virtio_pci.c > > @@ -810,20 +810,17 @@ static int virtio_pci_restore(struct device *dev) > > > > return ret; > > } > > - > > -static const struct dev_pm_ops virtio_pci_pm_ops = { > > - SET_SYSTEM_SLEEP_PM_OPS(virtio_pci_freeze, virtio_pci_restore) > > -}; > > #endif > > > > +static SIMPLE_DEV_PM_OPS(vi...

...IG_PM_RUNTIME is, the following warning message appeared: > > drivers/virtio/virtio_pci.c:770:12: warning: ?virtio_pci_freeze? defined but not used [-Wunused-function] > static int virtio_pci_freeze(struct device *dev) > ^ > drivers/virtio/virtio_pci.c:790:12: warning: ?virtio_pci_restore? defined but not used [-Wunused-function] > static int virtio_pci_restore(struct device *dev) > ^ > Fix it by changing CONFIG_PM to CONFIG_PM_SLEEP. > > Signed-off-by: Aaron Lu <aaron.lu at intel.com> > --- > drivers/virtio/virtio_pci.c | 4 ++-- > 1 fi...

...age appeared: > >> > >> drivers/virtio/virtio_pci.c:770:12: warning: ?virtio_pci_freeze? defined but not used [-Wunused-function] > >> static int virtio_pci_freeze(struct device *dev) > >> ^ > >> drivers/virtio/virtio_pci.c:790:12: warning: ?virtio_pci_restore? defined but not used [-Wunused-function] > >> static int virtio_pci_restore(struct device *dev) > >> ^ > >> Fix it by changing CONFIG_PM to CONFIG_PM_SLEEP. > >> > >> Signed-off-by: Aaron Lu <aaron.lu at intel.com> > >> ---...

...IG_PM_RUNTIME is, the following warning message appeared: > > drivers/virtio/virtio_pci.c:770:12: warning: ?virtio_pci_freeze? defined but not used [-Wunused-function] > static int virtio_pci_freeze(struct device *dev) > ^ > drivers/virtio/virtio_pci.c:790:12: warning: ?virtio_pci_restore? defined but not used [-Wunused-function] > static int virtio_pci_restore(struct device *dev) > ^ > Fix it by changing CONFIG_PM to CONFIG_PM_SLEEP. > > Signed-off-by: Aaron Lu <aaron.lu at intel.com> Reviewed-by: Amit Shah <amit.shah at redhat.com> Ami...

...++++++++++---- > 1 file changed, 32 insertions(+), 4 deletions(-) > > diff --git a/drivers/virtio/virtio_pci.c b/drivers/virtio/virtio_pci.c > index 58f7e45..58cbf6e 100644 > --- a/drivers/virtio/virtio_pci.c > +++ b/drivers/virtio/virtio_pci.c > @@ -785,6 +785,7 @@ 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; > + unsigned status = 0; > int ret; > > drv = container_of(vp_dev->vdev...

...+++++++++---- > 1 file changed, 32 insertions(+), 4 deletions(-) > > diff --git a/drivers/virtio/virtio_pci.c b/drivers/virtio/virtio_pci.c > index 3d1463c..0f2db51 100644 > --- a/drivers/virtio/virtio_pci.c > +++ b/drivers/virtio/virtio_pci.c > @@ -789,6 +789,7 @@ 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; > + unsigned status = 0; > int ret; > > drv = container_of(vp_dev->vdev.dev.driver, > @@ -799,14 +800,...

Hello, These patches are an initial attempt at supporting hibernation for virtio drivers. The default configuration of event_index=on doesn't work; i.e. restore from a hibernated image only works if the devices have event_index support turned off. I have not yet dug into this, but is most likely due to some state not being sync'ed. This could be related to the hack that is patch 3.

Hello, These patches are an initial attempt at supporting hibernation for virtio drivers. The default configuration of event_index=on doesn't work; i.e. restore from a hibernated image only works if the devices have event_index support turned off. I have not yet dug into this, but is most likely due to some state not being sync'ed. This could be related to the hack that is patch 3.