1 files changed, 74 insertions, 3 deletions

diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c
index e3cb7ae61658..ca55882465d6 100644
--- a/arch/powerpc/platforms/pseries/setup.c
+++ b/arch/powerpc/platforms/pseries/setup.c
@@ -40,6 +40,8 @@
 #include <linux/seq_file.h>
 #include <linux/root_dev.h>
 #include <linux/cpuidle.h>
+#include <linux/of.h>
+#include <linux/kexec.h>
 
 #include <asm/mmu.h>
 #include <asm/processor.h>
@@ -63,7 +65,6 @@
 #include <asm/smp.h>
 #include <asm/firmware.h>
 #include <asm/eeh.h>
-#include <asm/pSeries_reconfig.h>
 
 #include "plpar_wrappers.h"
 #include "pseries.h"
@@ -258,7 +259,7 @@ static int pci_dn_reconfig_notifier(struct notifier_block *nb, unsigned long act
         int err = NOTIFY_OK;
 
         switch (action) {
-        case PSERIES_RECONFIG_ADD:
+        case OF_RECONFIG_ATTACH_NODE:
                 pci = np->parent->data;
                 if (pci) {
                         update_dn_pci_info(np, pci->phb);
@@ -367,6 +368,65 @@ static void pSeries_idle(void)
         }
 }
 
+/*
+ * Enable relocation on during exceptions. This has partition wide scope and
+ * may take a while to complete, if it takes longer than one second we will
+ * just give up rather than wasting any more time on this - if that turns out
+ * to ever be a problem in practice we can move this into a kernel thread to
+ * finish off the process later in boot.
+ */
+static int __init pSeries_enable_reloc_on_exc(void)
+{
+        long rc;
+        unsigned int delay, total_delay = 0;
+
+        while (1) {
+                rc = enable_reloc_on_exceptions();
+                if (!H_IS_LONG_BUSY(rc))
+                        return rc;
+
+                delay = get_longbusy_msecs(rc);
+                total_delay += delay;
+                if (total_delay > 1000) {
+                        pr_warn("Warning: Giving up waiting to enable "
+                                "relocation on exceptions (%u msec)!\n",
+                                total_delay);
+                        return rc;
+                }
+
+                mdelay(delay);
+        }
+}
+
+#ifdef CONFIG_KEXEC
+static long pSeries_disable_reloc_on_exc(void)
+{
+        long rc;
+
+        while (1) {
+                rc = disable_reloc_on_exceptions();
+                if (!H_IS_LONG_BUSY(rc))
+                        return rc;
+                mdelay(get_longbusy_msecs(rc));
+        }
+}
+
+static void pSeries_machine_kexec(struct kimage *image)
+{
+        long rc;
+
+        if (firmware_has_feature(FW_FEATURE_SET_MODE) &&
+            (image->type != KEXEC_TYPE_CRASH)) {
+                rc = pSeries_disable_reloc_on_exc();
+                if (rc != H_SUCCESS)
+                        pr_warning("Warning: Failed to disable relocation on "
+                                   "exceptions: %ld\n", rc);
+        }
+
+        default_machine_kexec(image);
+}
+#endif
+
 static void __init pSeries_setup_arch(void)
 {
         panic_timeout = 10;
@@ -389,7 +449,7 @@ static void __init pSeries_setup_arch(void)
         /* Find and initialize PCI host bridges */
         init_pci_config_tokens();
         find_and_init_phbs();
-        pSeries_reconfig_notifier_register(&pci_dn_reconfig_nb);
+        of_reconfig_notifier_register(&pci_dn_reconfig_nb);
 
         pSeries_nvram_init();
 
@@ -402,6 +462,14 @@ static void __init pSeries_setup_arch(void)
                 ppc_md.enable_pmcs = pseries_lpar_enable_pmcs;
         else
                 ppc_md.enable_pmcs = power4_enable_pmcs;
+
+        if (firmware_has_feature(FW_FEATURE_SET_MODE)) {
+                long rc;
+                if ((rc = pSeries_enable_reloc_on_exc()) != H_SUCCESS) {
+                        pr_warn("Unable to enable relocation on exceptions: "
+                                "%ld\n", rc);
+                }
+        }
 }
 
 static int __init pSeries_init_panel(void)
@@ -659,4 +727,7 @@ define_machine(pseries) {
         .progress               = rtas_progress,
         .system_reset_exception = pSeries_system_reset_exception,
         .machine_check_exception = pSeries_machine_check_exception,
+#ifdef CONFIG_KEXEC
+        .machine_kexec          = pSeries_machine_kexec,
+#endif
 };