From 26c116744640d1b0c1f4124a5b3a2436f49f4535 Mon Sep 17 00:00:00 2001
From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Mon, 19 Sep 2011 18:28:03 +0000
Subject: [PATCH] --- yaml --- r: 274187 b: refs/heads/master c:
 ec27329ffb3b4f619be9f0065c473fcb36ea52ce h: refs/heads/master i:   274185:
 15e611c0c8b3a79814b1dd288033da018ff4389a   274183:
 8c1ba5f8cb868d156336541eb65a5dd8098c7951 v: v3

---
 [refs]                                       |  2 +-
 trunk/arch/powerpc/platforms/powernv/setup.c | 32 ++++++++++++++++----
 2 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 708f1ff455cd..3fffaa33afe6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: daea1175a9f0f70eab5b33e2827d57ba8c686816
+refs/heads/master: ec27329ffb3b4f619be9f0065c473fcb36ea52ce
diff --git a/trunk/arch/powerpc/platforms/powernv/setup.c b/trunk/arch/powerpc/platforms/powernv/setup.c
index 07ba1ecd1807..0fac0a6c951e 100644
--- a/trunk/arch/powerpc/platforms/powernv/setup.c
+++ b/trunk/arch/powerpc/platforms/powernv/setup.c
@@ -83,19 +83,39 @@ static void pnv_show_cpuinfo(struct seq_file *m)
 	of_node_put(root);
 }
 
-static void pnv_restart(char *cmd)
+static void  __noreturn pnv_restart(char *cmd)
 {
-	for (;;);
+	long rc = OPAL_BUSY;
+
+	while (rc == OPAL_BUSY || rc == OPAL_BUSY_EVENT) {
+		rc = opal_cec_reboot();
+		if (rc == OPAL_BUSY_EVENT)
+			opal_poll_events(NULL);
+		else
+			mdelay(10);
+	}
+	for (;;)
+		opal_poll_events(NULL);
 }
 
-static void pnv_power_off(void)
+static void __noreturn pnv_power_off(void)
 {
-	for (;;);
+	long rc = OPAL_BUSY;
+
+	while (rc == OPAL_BUSY || rc == OPAL_BUSY_EVENT) {
+		rc = opal_cec_power_down(0);
+		if (rc == OPAL_BUSY_EVENT)
+			opal_poll_events(NULL);
+		else
+			mdelay(10);
+	}
+	for (;;)
+		opal_poll_events(NULL);
 }
 
-static void pnv_halt(void)
+static void __noreturn pnv_halt(void)
 {
-	for (;;);
+	pnv_power_off();
 }
 
 static unsigned long __init pnv_get_boot_time(void)