Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c7853aea authored by Kazuhiro SUZUKI's avatar Kazuhiro SUZUKI Committed by Konrad Rzeszutek Wilk
Browse files

xen: xenbus PM events support 



Make xenbus frontend device subscribe to PM events
to receive suspend/resume/freeze/thaw/restore
notifications.

Signed-off-by: default avatarKenji Wakamiya <wkenji@jp.fujitsu.com>
Signed-off-by: default avatarKazuhiro Suzuki <kaz@jp.fujitsu.com>
Signed-off-by: default avatarShriram Rajagopalan <rshriram@cs.ubc.ca>
Acked-by: default avatarIan Campbell <ian.campbell@citrix.com>
[shriram--minor mods and improved commit message]
Signed-off-by: default avatarKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
parent 76ca0783

drivers/xen/xenbus/xenbus_probe.c

+10 −2
Original line number Diff line number Diff line
@@ -577,7 +577,7 @@ void xenbus_dev_changed(const char *node, struct xen_bus_type *bus) 
}

EXPORT_SYMBOL_GPL(xenbus_dev_changed);



int xenbus_dev_suspend(struct device *dev, pm_message_t state)

int xenbus_dev_suspend(struct device *dev)

{

	int err = 0;

	struct xenbus_driver *drv;
@@ -590,7 +590,7 @@ int xenbus_dev_suspend(struct device *dev, pm_message_t state) 
		return 0;

	drv = to_xenbus_driver(dev->driver);

	if (drv->suspend)

		err = drv->suspend(xdev, state);

		err = drv->suspend(xdev);

	if (err)

		printk(KERN_WARNING

		       "xenbus: suspend %s failed: %i\n", dev_name(dev), err);
@@ -642,6 +642,14 @@ int xenbus_dev_resume(struct device *dev) 
}

EXPORT_SYMBOL_GPL(xenbus_dev_resume);



int xenbus_dev_cancel(struct device *dev)

{

	/* Do nothing */

	DPRINTK("cancel");

	return 0;

}

EXPORT_SYMBOL_GPL(xenbus_dev_cancel);



/* A flag to determine if xenstored is 'ready' (i.e. has started) */

int xenstored_ready = 0;

drivers/xen/xenbus/xenbus_probe.h

+2 −1
Original line number Diff line number Diff line
@@ -64,8 +64,9 @@ extern void xenbus_dev_changed(const char *node, struct xen_bus_type *bus); 


extern void xenbus_dev_shutdown(struct device *_dev);



extern int xenbus_dev_suspend(struct device *dev, pm_message_t state);

extern int xenbus_dev_suspend(struct device *dev);

extern int xenbus_dev_resume(struct device *dev);

extern int xenbus_dev_cancel(struct device *dev);



extern void xenbus_otherend_changed(struct xenbus_watch *watch,

				    const char **vec, unsigned int len,

drivers/xen/xenbus/xenbus_probe_frontend.c

+7 −2
Original line number Diff line number Diff line
@@ -85,6 +85,12 @@ static struct device_attribute xenbus_frontend_dev_attrs[] = { 
	__ATTR_NULL

};



static const struct dev_pm_ops xenbus_pm_ops = {

	.suspend = xenbus_dev_suspend,

	.resume  = xenbus_dev_resume,

	.thaw  = xenbus_dev_cancel,

};



static struct xen_bus_type xenbus_frontend = {

	.root = "device",

	.levels = 2,		/* device/type/<id> */
@@ -100,8 +106,7 @@ static struct xen_bus_type xenbus_frontend = { 
		.shutdown	= xenbus_dev_shutdown,

		.dev_attrs	= xenbus_frontend_dev_attrs,



		.suspend	= xenbus_dev_suspend,

		.resume		= xenbus_dev_resume,

		.pm		= &xenbus_pm_ops,

	},

};

include/xen/xenbus.h

+1 −1
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ struct xenbus_driver { 
	void (*otherend_changed)(struct xenbus_device *dev,

				 enum xenbus_state backend_state);

	int (*remove)(struct xenbus_device *dev);

	int (*suspend)(struct xenbus_device *dev, pm_message_t state);

	int (*suspend)(struct xenbus_device *dev);

	int (*resume)(struct xenbus_device *dev);

	int (*uevent)(struct xenbus_device *, struct kobj_uevent_env *);

	struct device_driver driver;