1 files changed, 73 insertions, 12 deletions
diff --git a/include/asm-powerpc/kexec.h b/include/asm-powerpc/kexec.h
index fffdf690b840..640a6459f2f4 100644
--- a/include/asm-powerpc/kexec.h
+++ b/include/asm-powerpc/kexec.h
@@ -31,12 +31,80 @@
 #define KEXEC_ARCH KEXEC_ARCH_PPC
 #endif
-#define HAVE_ARCH_COPY_OLDMEM_PAGE
-#ifndef __ASSEMBLY__
 #ifdef CONFIG_KEXEC
+#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));
+        }
+}
+#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 __ */
+#ifndef __ASSEMBLY__
 #define MAX_NOTE_BYTES 1024
 #ifdef __powerpc64__
@@ -53,14 +121,7 @@ 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 */
-/*
- * 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 /* ! __ASSEMBLY__ */
+#endif /* CONFIG_KEXEC */
 #endif /* __KERNEL__ */
 #endif /* _ASM_POWERPC_KEXEC_H */

diff --git a/include/asm-powerpc/kexec.h b/include/asm-powerpc/kexec.h index fffdf690b840..640a6459f2f4 100644 --- a/include/asm-powerpc/kexec.h +++ b/include/asm-powerpc/kexec.h
@@ -31,12 +31,80 @@
31	#define KEXEC_ARCH KEXEC_ARCH_PPC	31	#define KEXEC_ARCH KEXEC_ARCH_PPC
32	#endif	32	#endif
33		33
34	#define HAVE_ARCH_COPY_OLDMEM_PAGE
35
36	#ifndef __ASSEMBLY__
37
38	#ifdef CONFIG_KEXEC	34	#ifdef CONFIG_KEXEC
39		35
		36	#ifdef __powerpc64__
		37	/*
		38	* This function is responsible for capturing register states if coming
		39	* via panic or invoking dump using sysrq-trigger.
		40	*/
		41	static inline void crash_setup_regs(struct pt_regs *newregs,
		42	struct pt_regs *oldregs)
		43	{
		44	if (oldregs)
		45	memcpy(newregs, oldregs, sizeof(*newregs));
		46	else {
		47	/* FIXME Merge this with xmon_save_regs ?? */
		48	unsigned long tmp1, tmp2;
		49	__asm__ __volatile__ (
		50	"std 0,0(%2)\n"
		51	"std 1,8(%2)\n"
		52	"std 2,16(%2)\n"
		53	"std 3,24(%2)\n"
		54	"std 4,32(%2)\n"
		55	"std 5,40(%2)\n"
		56	"std 6,48(%2)\n"
		57	"std 7,56(%2)\n"
		58	"std 8,64(%2)\n"
		59	"std 9,72(%2)\n"
		60	"std 10,80(%2)\n"
		61	"std 11,88(%2)\n"
		62	"std 12,96(%2)\n"
		63	"std 13,104(%2)\n"
		64	"std 14,112(%2)\n"
		65	"std 15,120(%2)\n"
		66	"std 16,128(%2)\n"
		67	"std 17,136(%2)\n"
		68	"std 18,144(%2)\n"
		69	"std 19,152(%2)\n"
		70	"std 20,160(%2)\n"
		71	"std 21,168(%2)\n"
		72	"std 22,176(%2)\n"
		73	"std 23,184(%2)\n"
		74	"std 24,192(%2)\n"
		75	"std 25,200(%2)\n"
		76	"std 26,208(%2)\n"
		77	"std 27,216(%2)\n"
		78	"std 28,224(%2)\n"
		79	"std 29,232(%2)\n"
		80	"std 30,240(%2)\n"
		81	"std 31,248(%2)\n"
		82	"mfmsr %0\n"
		83	"std %0, 264(%2)\n"
		84	"mfctr %0\n"
		85	"std %0, 280(%2)\n"
		86	"mflr %0\n"
		87	"std %0, 288(%2)\n"
		88	"bl 1f\n"
		89	"1: mflr %1\n"
		90	"std %1, 256(%2)\n"
		91	"mtlr %0\n"
		92	"mfxer %0\n"
		93	"std %0, 296(%2)\n"
		94	: "=&r" (tmp1), "=&r" (tmp2)
		95	: "b" (newregs));
		96	}
		97	}
		98	#else
		99	/*
		100	* Provide a dummy definition to avoid build failures. Will remain
		101	* empty till crash dump support is enabled.
		102	*/
		103	static inline void crash_setup_regs(struct pt_regs *newregs,
		104	struct pt_regs *oldregs) { }
		105	#endif /* !__powerpc64 __ */
		106
		107	#ifndef __ASSEMBLY__
40	#define MAX_NOTE_BYTES 1024	108	#define MAX_NOTE_BYTES 1024
41		109
42	#ifdef __powerpc64__	110	#ifdef __powerpc64__
@@ -53,14 +121,7 @@ extern void default_machine_kexec(struct kimage *image);
53	extern int default_machine_kexec_prepare(struct kimage *image);	121	extern int default_machine_kexec_prepare(struct kimage *image);
54	extern void default_machine_crash_shutdown(struct pt_regs *regs);	122	extern void default_machine_crash_shutdown(struct pt_regs *regs);
55		123
56	#endif /* !CONFIG_KEXEC */
57
58	/*
59	* Provide a dummy definition to avoid build failures. Will remain
60	* empty till crash dump support is enabled.
61	*/
62	static inline void crash_setup_regs(struct pt_regs *newregs,
63	struct pt_regs *oldregs) { }
64	#endif /* ! __ASSEMBLY__ */	124	#endif /* ! __ASSEMBLY__ */
		125	#endif /* CONFIG_KEXEC */
65	#endif /* __KERNEL__ */	126	#endif /* __KERNEL__ */
66	#endif /* _ASM_POWERPC_KEXEC_H */	127	#endif /* _ASM_POWERPC_KEXEC_H */