[PATCH] Maple powerdown patch

Currently reset and powerdown are not implemented on the Maple board,
and attempting to do so will (incorrectly return).  This implements
the proper communication with the service processor, allowing correct
reset and powerdown on the Maple board, by communicating with the
service processor.  If somehow it's unable to communicate with the
service processor it will loop forever instead.

Note that powerdown on the Maple will power down the CPUs, but not the
fans or other board components due to hardware and firmware
limitations.

Signed-off-by: David Gibson <dwg@au1.ibm.com>
Signed-off-by: Frank Rowand <frowand@mvista.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>

diff --git a/arch/ppc64/kernel/maple_setup.c b/arch/ppc64/kernel/maple_setup.c
index 3dabedb..da8900b 100644 (file)
--- a/arch/ppc64/kernel/maple_setup.c
+++ b/arch/ppc64/kernel/maple_setup.c
@@ -78,17 +78,77 @@ extern int maple_pci_get_legacy_ide_irq(struct pci_dev *dev, int channel);
 extern void generic_find_legacy_serial_ports(u64 *physport,
                unsigned int *default_speed);
 
-
 static void maple_restart(char *cmd)
 {
+       unsigned int maple_nvram_base;
+       unsigned int maple_nvram_offset;
+       unsigned int maple_nvram_command;
+       struct device_node *rtcs;
+
+       /* find NVRAM device */
+       rtcs = find_compatible_devices("nvram", "AMD8111");
+       if (rtcs && rtcs->addrs) {
+               maple_nvram_base = rtcs->addrs[0].address;
+       } else {
+               printk(KERN_EMERG "Maple: Unable to find NVRAM\n");
+               printk(KERN_EMERG "Maple: Manual Restart Required\n");
+               return;
+       }
+
+       /* find service processor device */
+       rtcs = find_devices("service-processor");
+       if (!rtcs) {
+               printk(KERN_EMERG "Maple: Unable to find Service Processor\n");
+               printk(KERN_EMERG "Maple: Manual Restart Required\n");
+               return;
+       }
+       maple_nvram_offset = *(unsigned int*) get_property(rtcs,
+                       "restart-addr", NULL);
+       maple_nvram_command = *(unsigned int*) get_property(rtcs,
+                       "restart-value", NULL);
+
+       /* send command */
+       outb_p(maple_nvram_command, maple_nvram_base + maple_nvram_offset);
+       for (;;) ;
 }
 
 static void maple_power_off(void)
 {
+       unsigned int maple_nvram_base;
+       unsigned int maple_nvram_offset;
+       unsigned int maple_nvram_command;
+       struct device_node *rtcs;
+
+       /* find NVRAM device */
+       rtcs = find_compatible_devices("nvram", "AMD8111");
+       if (rtcs && rtcs->addrs) {
+               maple_nvram_base = rtcs->addrs[0].address;
+       } else {
+               printk(KERN_EMERG "Maple: Unable to find NVRAM\n");
+               printk(KERN_EMERG "Maple: Manual Power-Down Required\n");
+               return;
+       }
+
+       /* find service processor device */
+       rtcs = find_devices("service-processor");
+       if (!rtcs) {
+               printk(KERN_EMERG "Maple: Unable to find Service Processor\n");
+               printk(KERN_EMERG "Maple: Manual Power-Down Required\n");
+               return;
+       }
+       maple_nvram_offset = *(unsigned int*) get_property(rtcs,
+                       "power-off-addr", NULL);
+       maple_nvram_command = *(unsigned int*) get_property(rtcs,
+                       "power-off-value", NULL);
+
+       /* send command */
+       outb_p(maple_nvram_command, maple_nvram_base + maple_nvram_offset);
+       for (;;) ;
 }
 
 static void maple_halt(void)
 {
+       maple_power_off();
 }
 
 #ifdef CONFIG_SMP

diff --git a/arch/ppc64/kernel/setup.c b/arch/ppc64/kernel/setup.c
index 8a1ca69..7d060dd 100644 (file)
--- a/arch/ppc64/kernel/setup.c
+++ b/arch/ppc64/kernel/setup.c
@@ -683,6 +683,12 @@ void machine_restart(char *cmd)
        if (ppc_md.nvram_sync)
                ppc_md.nvram_sync();
        ppc_md.restart(cmd);
+#ifdef CONFIG_SMP
+       smp_send_stop();
+#endif
+       printk(KERN_EMERG "System Halted, OK to turn off power\n");
+       local_irq_disable();
+       while (1) ;
 }
 
 EXPORT_SYMBOL(machine_restart);
@@ -692,6 +698,12 @@ void machine_power_off(void)
        if (ppc_md.nvram_sync)
                ppc_md.nvram_sync();
        ppc_md.power_off();
+#ifdef CONFIG_SMP
+       smp_send_stop();
+#endif
+       printk(KERN_EMERG "System Halted, OK to turn off power\n");
+       local_irq_disable();
+       while (1) ;
 }
 
 EXPORT_SYMBOL(machine_power_off);
@@ -701,6 +713,12 @@ void machine_halt(void)
        if (ppc_md.nvram_sync)
                ppc_md.nvram_sync();
        ppc_md.halt();
+#ifdef CONFIG_SMP
+       smp_send_stop();
+#endif
+       printk(KERN_EMERG "System Halted, OK to turn off power\n");
+       local_irq_disable();
+       while (1) ;
 }
 
 EXPORT_SYMBOL(machine_halt);