3 files changed, 57 insertions, 0 deletions

diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c
index fdbd9f9122f2..608fee7c7e20 100644
--- a/arch/powerpc/kernel/setup_64.c
+++ b/arch/powerpc/kernel/setup_64.c
@@ -59,6 +59,7 @@
 #include <asm/firmware.h>
 #include <asm/xmon.h>
 #include <asm/udbg.h>
+#include <asm/kexec.h>
 
 #include "setup.h"
 
@@ -415,6 +416,10 @@ void __init setup_system(void)
          */
         unflatten_device_tree();
 
+#ifdef CONFIG_KEXEC
+        kexec_setup();  /* requires unflattened device tree. */
+#endif
+
         /*
          * Fill the ppc64_caches & systemcfg structures with informations
          * retreived from the device-tree. Need to be called before
diff --git a/arch/ppc64/kernel/machine_kexec.c b/arch/ppc64/kernel/machine_kexec.c
index 203f1d5e6f10..97c51e452be7 100644
--- a/arch/ppc64/kernel/machine_kexec.c
+++ b/arch/ppc64/kernel/machine_kexec.c
@@ -305,3 +305,54 @@ void machine_kexec(struct kimage *image)
                         ppc_md.hpte_clear_all);
         /* NOTREACHED */
 }
+
+/* Values we need to export to the second kernel via the device tree. */
+static unsigned long htab_base, htab_size, kernel_end;
+
+static struct property htab_base_prop = {
+        .name = "linux,htab-base",
+        .length = sizeof(unsigned long),
+        .value = (unsigned char *)&htab_base,
+};
+
+static struct property htab_size_prop = {
+        .name = "linux,htab-size",
+        .length = sizeof(unsigned long),
+        .value = (unsigned char *)&htab_size,
+};
+
+static struct property kernel_end_prop = {
+        .name = "linux,kernel-end",
+        .length = sizeof(unsigned long),
+        .value = (unsigned char *)&kernel_end,
+};
+
+static void __init export_htab_values(void)
+{
+        struct device_node *node;
+
+        node = of_find_node_by_path("/chosen");
+        if (!node)
+                return;
+
+        kernel_end = __pa(_end);
+        prom_add_property(node, &kernel_end_prop);
+
+        /* On machines with no htab htab_address is NULL */
+        if (NULL == htab_address)
+                goto out;
+
+        htab_base = __pa(htab_address);
+        prom_add_property(node, &htab_base_prop);
+
+        htab_size = 1UL << ppc64_pft_size;
+        prom_add_property(node, &htab_size_prop);
+
+ out:
+        of_node_put(node);
+}
+
+void __init kexec_setup(void)
+{
+        export_htab_values();
+}
diff --git a/include/asm-powerpc/kexec.h b/include/asm-powerpc/kexec.h
index 062ab9ba68eb..c72ffc709ea8 100644
--- a/include/asm-powerpc/kexec.h
+++ b/include/asm-powerpc/kexec.h
@@ -40,6 +40,7 @@ extern note_buf_t crash_notes[];
 #ifdef __powerpc64__
 extern void kexec_smp_wait(void);       /* get and clear naca physid, wait for
                                           master to copy new code to 0 */
+extern void __init kexec_setup(void);
 #else
 struct kimage;
 extern void machine_kexec_simple(struct kimage *image);