Skip to contentSkip to conversation

xen: new power management driver calls

PATCH In review Thadeu Lima de Souza Cascardo 3 participants 3 messages Jul 8, 2008 Xen hypervisor interface

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 xen: new power management driver calls

linux-next won't build with CONFIG_XEN and CONFIG_PM_SLEEP because xen_suspend calls device_power_up and device_resume, which require a parameter since commit 1eede070a59e1cc73da51e1aaa00d9ab86572cfc.

---
 drivers/xen/manage.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
drivers/xen/manage.c +2 -2
index 5b546e3..64c554e 100644
@@ -63,7 +63,7 @@ static int xen_suspend(void *data)
 	gnttab_resume();
 	xen_mm_unpin_all();
 
-	device_power_up();
+	device_power_up(PMSG_RESUME);
 
 	if (!*cancelled) {
 		xen_irq_resume();
@@ -112,7 +112,7 @@ static void do_suspend(void)
 	else
 		xenbus_suspend_cancel();
 
-	device_resume();
+	device_resume(PMSG_RESUME);
 
 	/* Make sure timer events get retriggered on all CPUs */
 	clock_was_set();
Signature · 1 line
1.5.6
Acked-by on v1 1/1
#1 lore raw
Quoted 4 lines · Thadeu Lima de Souza Cascardo

linux-next won't build with CONFIG_XEN and CONFIG_PM_SLEEP because xen_suspend calls device_power_up and device_resume, which require a parameter since commit 1eede070a59e1cc73da51e1aaa00d9ab86572cfc.

Someone (Randy?) reported this before, but then I quietly forgot all about it. Thanks for the patch.

J

Quoted 27 lines
---
 drivers/xen/manage.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
drivers/xen/manage.c +2 -2
index 5b546e3..64c554e 100644
@@ -63,7 +63,7 @@ static int xen_suspend(void *data)
 	gnttab_resume();
 	xen_mm_unpin_all();
 
-	device_power_up();
+	device_power_up(PMSG_RESUME);
 
 	if (!*cancelled) {
 		xen_irq_resume();
@@ -112,7 +112,7 @@ static void do_suspend(void)
 	else
 		xenbus_suspend_cancel();
 
-	device_resume();
+	device_resume(PMSG_RESUME);
 
 	/* Make sure timer events get retriggered on all CPUs */
 	clock_was_set();
Acked-by
#2 lore raw
Quoted 10 lines · On Tue, 08 Jul 2008 13:18:10 -0700 Jeremy Fitzhardinge wrote:
Quoted 4 lines · Thadeu Lima de Souza Cascardo

linux-next won't build with CONFIG_XEN and CONFIG_PM_SLEEP because xen_suspend calls device_power_up and device_resume, which require a parameter since commit 1eede070a59e1cc73da51e1aaa00d9ab86572cfc.

Someone (Randy?) reported this before, but then I quietly forgot all about it. Thanks for the patch.

Thanks.

Quoted 23 lines

J

Quoted 21 lines
---
 drivers/xen/manage.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
drivers/xen/manage.c +1 -1
index 5b546e3..64c554e 100644
@@ -63,7 +63,7 @@ static int xen_suspend(void *data)
 	gnttab_resume();
 	xen_mm_unpin_all();
 
-	device_power_up();
+	device_power_up(PMSG_RESUME);
 
 	if (!*cancelled) {
 		xen_irq_resume();
@@ -112,7 +112,7 @@ static void do_suspend(void)
 	else
 		xenbus_suspend_cancel();
 
Quoted 6 lines

drivers/xen/manage.c static void do_suspend(void) · line 118

Quoted 6 lines
drivers/xen/manage.c +1 -1
-	device_resume();
+	device_resume(PMSG_RESUME);
 
 	/* Make sure timer events get retriggered on all CPUs */
 	clock_was_set();

---
~Randy
Linux Plumbers Conference, 17-19 September 2008, Portland, Oregon USA
http://linuxplumbersconf.org/