Merge branch 'merge'

[powerpc.git] / include / asm-powerpc / kexec.h

diff --git a/include/asm-powerpc/kexec.h b/include/asm-powerpc/kexec.h
index 4263af3..efe8872 100644 (file)
--- a/include/asm-powerpc/kexec.h
+++ b/include/asm-powerpc/kexec.h
@@ -31,16 +31,83 @@
 #define KEXEC_ARCH KEXEC_ARCH_PPC
 #endif
 
-#define HAVE_ARCH_COPY_OLDMEM_PAGE
-
 #ifndef __ASSEMBLY__
 
 #ifdef CONFIG_KEXEC
 
-#define MAX_NOTE_BYTES 1024
-typedef u32 note_buf_t[MAX_NOTE_BYTES / sizeof(u32)];
+#ifdef __powerpc64__
+/*
+ * This function is responsible for capturing register states if coming
+ * via panic or invoking dump using sysrq-trigger.
+ */
+static inline void crash_setup_regs(struct pt_regs *newregs,
+                                       struct pt_regs *oldregs)
+{
+       if (oldregs)
+               memcpy(newregs, oldregs, sizeof(*newregs));
+       else {
+               /* FIXME Merge this with xmon_save_regs ?? */
+               unsigned long tmp1, tmp2;
+               __asm__ __volatile__ (
+                       "std    0,0(%2)\n"
+                       "std    1,8(%2)\n"
+                       "std    2,16(%2)\n"
+                       "std    3,24(%2)\n"
+                       "std    4,32(%2)\n"
+                       "std    5,40(%2)\n"
+                       "std    6,48(%2)\n"
+                       "std    7,56(%2)\n"
+                       "std    8,64(%2)\n"
+                       "std    9,72(%2)\n"
+                       "std    10,80(%2)\n"
+                       "std    11,88(%2)\n"
+                       "std    12,96(%2)\n"
+                       "std    13,104(%2)\n"
+                       "std    14,112(%2)\n"
+                       "std    15,120(%2)\n"
+                       "std    16,128(%2)\n"
+                       "std    17,136(%2)\n"
+                       "std    18,144(%2)\n"
+                       "std    19,152(%2)\n"
+                       "std    20,160(%2)\n"
+                       "std    21,168(%2)\n"
+                       "std    22,176(%2)\n"
+                       "std    23,184(%2)\n"
+                       "std    24,192(%2)\n"
+                       "std    25,200(%2)\n"
+                       "std    26,208(%2)\n"
+                       "std    27,216(%2)\n"
+                       "std    28,224(%2)\n"
+                       "std    29,232(%2)\n"
+                       "std    30,240(%2)\n"
+                       "std    31,248(%2)\n"
+                       "mfmsr  %0\n"
+                       "std    %0, 264(%2)\n"
+                       "mfctr  %0\n"
+                       "std    %0, 280(%2)\n"
+                       "mflr   %0\n"
+                       "std    %0, 288(%2)\n"
+                       "bl     1f\n"
+               "1:     mflr   %1\n"
+                       "std    %1, 256(%2)\n"
+                       "mtlr   %0\n"
+                       "mfxer  %0\n"
+                       "std    %0, 296(%2)\n"
+                       : "=&r" (tmp1), "=&r" (tmp2)
+                       : "b" (newregs)
+                       : "memory");
+       }
+}
+#else
+/*
+ * Provide a dummy definition to avoid build failures. Will remain
+ * empty till crash dump support is enabled.
+ */
+static inline void crash_setup_regs(struct pt_regs *newregs,
+                                       struct pt_regs *oldregs) { }
+#endif /* !__powerpc64 __ */
 
-extern note_buf_t crash_notes[];
+#define MAX_NOTE_BYTES 1024
 
 #ifdef __powerpc64__
 extern void kexec_smp_wait(void);      /* get and clear naca physid, wait for
@@ -56,8 +123,20 @@ extern void default_machine_kexec(struct kimage *image);
 extern int default_machine_kexec_prepare(struct kimage *image);
 extern void default_machine_crash_shutdown(struct pt_regs *regs);
 
-#endif /* !CONFIG_KEXEC */
+extern void machine_kexec_simple(struct kimage *image);
+extern int overlaps_crashkernel(unsigned long start, unsigned long size);
+extern void reserve_crashkernel(void);
+
+#else /* !CONFIG_KEXEC */
+
+static inline int overlaps_crashkernel(unsigned long start, unsigned long size)
+{
+       return 0;
+}
+
+static inline void reserve_crashkernel(void) { ; }
 
+#endif /* CONFIG_KEXEC */
 #endif /* ! __ASSEMBLY__ */
 #endif /* __KERNEL__ */
 #endif /* _ASM_POWERPC_KEXEC_H */