1 files changed, 54 insertions, 2 deletions

diff --git a/arch/powerpc/platforms/powernv/setup.c b/arch/powerpc/platforms/powernv/setup.c
index 8723d32632f5..8c16a5f96728 100644
--- a/arch/powerpc/platforms/powernv/setup.c
+++ b/arch/powerpc/platforms/powernv/setup.c
@@ -27,6 +27,7 @@
 #include <linux/interrupt.h>
 #include <linux/bug.h>
 #include <linux/pci.h>
+#include <linux/cpufreq.h>
 
 #include <asm/machdep.h>
 #include <asm/firmware.h>
@@ -98,11 +99,32 @@ static void pnv_show_cpuinfo(struct seq_file *m)
         of_node_put(root);
 }
 
+static void pnv_prepare_going_down(void)
+{
+        /*
+         * Disable all notifiers from OPAL, we can't
+         * service interrupts anymore anyway
+         */
+        opal_notifier_disable();
+
+        /* Soft disable interrupts */
+        local_irq_disable();
+
+        /*
+         * Return secondary CPUs to firwmare if a flash update
+         * is pending otherwise we will get all sort of error
+         * messages about CPU being stuck etc.. This will also
+         * have the side effect of hard disabling interrupts so
+         * past this point, the kernel is effectively dead.
+         */
+        opal_flash_term_callback();
+}
+
 static void  __noreturn pnv_restart(char *cmd)
 {
         long rc = OPAL_BUSY;
 
-        opal_notifier_disable();
+        pnv_prepare_going_down();
 
         while (rc == OPAL_BUSY || rc == OPAL_BUSY_EVENT) {
                 rc = opal_cec_reboot();
@@ -119,7 +141,7 @@ static void __noreturn pnv_power_off(void)
 {
         long rc = OPAL_BUSY;
 
-        opal_notifier_disable();
+        pnv_prepare_going_down();
 
         while (rc == OPAL_BUSY || rc == OPAL_BUSY_EVENT) {
                 rc = opal_cec_power_down(0);
@@ -222,6 +244,13 @@ static void pnv_kexec_cpu_down(int crash_shutdown, int secondary)
 }
 #endif /* CONFIG_KEXEC */
 
+#ifdef CONFIG_MEMORY_HOTPLUG_SPARSE
+static unsigned long pnv_memory_block_size(void)
+{
+        return 256UL * 1024 * 1024;
+}
+#endif
+
 static void __init pnv_setup_machdep_opal(void)
 {
         ppc_md.get_boot_time = opal_get_boot_time;
@@ -269,6 +298,25 @@ static int __init pnv_probe(void)
         return 1;
 }
 
+/*
+ * Returns the cpu frequency for 'cpu' in Hz. This is used by
+ * /proc/cpuinfo
+ */
+unsigned long pnv_get_proc_freq(unsigned int cpu)
+{
+        unsigned long ret_freq;
+
+        ret_freq = cpufreq_quick_get(cpu) * 1000ul;
+
+        /*
+         * If the backend cpufreq driver does not exist,
+         * then fallback to old way of reporting the clockrate.
+         */
+        if (!ret_freq)
+                ret_freq = ppc_proc_freq;
+        return ret_freq;
+}
+
 define_machine(powernv) {
         .name                   = "PowerNV",
         .probe                  = pnv_probe,
@@ -276,6 +324,7 @@ define_machine(powernv) {
         .setup_arch             = pnv_setup_arch,
         .init_IRQ               = pnv_init_IRQ,
         .show_cpuinfo           = pnv_show_cpuinfo,
+        .get_proc_freq          = pnv_get_proc_freq,
         .progress               = pnv_progress,
         .machine_shutdown       = pnv_shutdown,
         .power_save             = power7_idle,
@@ -284,4 +333,7 @@ define_machine(powernv) {
 #ifdef CONFIG_KEXEC
         .kexec_cpu_down         = pnv_kexec_cpu_down,
 #endif
+#ifdef CONFIG_MEMORY_HOTPLUG_SPARSE
+        .memory_block_size      = pnv_memory_block_size,
+#endif
 };