[PATCH 11/12] powerpc: Add arch-dependant copy_oldmem_page

[Michael Ellerman]

Add arch-dependant copy_oldmem_page.

Patch-by: Haren Myneni <haren at us.ibm.com>

 arch/powerpc/kernel/crash.c |   36 ++++++++++++++++++++++++++++++++++++
 include/asm-powerpc/kexec.h |    2 ++
 kernel/crash_dump.c         |    3 +++
 3 files changed, 41 insertions(+)

Index: kexec/arch/powerpc/kernel/crash.c
===================================================================
--- kexec.orig/arch/powerpc/kernel/crash.c
+++ kexec/arch/powerpc/kernel/crash.c
@@ -28,6 +28,7 @@
 #include <asm/kdump.h>
 #include <asm/lmb.h>
 #include <asm/firmware.h>
+#include <asm/uaccess.h>
 
 #ifdef DEBUG
 #define DBG(fmt...) udbg_printf(fmt)
@@ -285,6 +286,41 @@ void __init kdump_setup(void)
 	DBG(" <- kdump_setup()\n");
 }
 
+/*
+ * copy_oldmem_page - copy one page from "oldmem"
+ * @pfn: page frame number to be copied
+ * @buf: target memory address for the copy; this can be in kernel address
+ *      space or user address space (see @userbuf)
+ * @csize: number of bytes to copy
+ * @offset: offset in bytes into the page (based on pfn) to begin the copy
+ * @userbuf: if set, @buf is in user address space, use copy_to_user(),
+ *      otherwise @buf is in kernel address space, use memcpy().
+ *
+ * Copy a page from "oldmem". For this page, there is no pte mapped
+ * in the current kernel. We stitch up a pte, similar to kmap_atomic.
+ */
+ssize_t copy_oldmem_page(unsigned long pfn, char *buf,
+			size_t csize, unsigned long offset, int userbuf)
+{
+	void  *vaddr;
+
+	if (!csize)
+		return 0;
+
+	vaddr = (void *)__ioremap(pfn << PAGE_SHIFT, PAGE_SIZE, 0);
+
+	if (userbuf) {
+		if (copy_to_user(buf, (vaddr + offset), csize)) {
+			iounmap(vaddr);
+			return -EFAULT;
+		}
+	} else
+		memcpy(buf, (vaddr + offset), csize);
+
+	iounmap(vaddr);
+	return csize;
+}
+
 static int __init parse_elfcorehdr(char *p)
 {
 	if (p)
Index: kexec/include/asm-powerpc/kexec.h
===================================================================
--- kexec.orig/include/asm-powerpc/kexec.h
+++ kexec/include/asm-powerpc/kexec.h
@@ -30,6 +30,8 @@
 #define KEXEC_ARCH KEXEC_ARCH_PPC
 #endif
 
+#define HAVE_ARCH_COPY_OLDMEM_PAGE
+
 #ifndef __ASSEMBLY__
 
 #define MAX_NOTE_BYTES 2048
Index: kexec/kernel/crash_dump.c
===================================================================
--- kexec.orig/kernel/crash_dump.c
+++ kexec/kernel/crash_dump.c
@@ -14,10 +14,12 @@
 
 #include <asm/io.h>
 #include <asm/uaccess.h>
+#include <asm/kexec.h>
 
 /* Stores the physical address of elf header of crash image. */
 unsigned long long elfcorehdr_addr = ELFCORE_ADDR_MAX;
 
+#ifndef HAVE_ARCH_COPY_OLDMEM_PAGE
 /**
  * copy_oldmem_page - copy one page from "oldmem"
  * @pfn: page frame number to be copied
@@ -59,3 +61,4 @@ ssize_t copy_oldmem_page(unsigned long p
 	kfree(page);
 	return csize;
 }
+#endif