Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

[pandora-kernel.git] / arch / powerpc / kernel / crash_dump.c

diff --git a/arch/powerpc/kernel/crash_dump.c b/arch/powerpc/kernel/crash_dump.c
index 40f5246..0a2af50 100644 (file)
--- a/arch/powerpc/kernel/crash_dump.c
+++ b/arch/powerpc/kernel/crash_dump.c
@@ -19,6 +19,7 @@
 #include <asm/prom.h>
 #include <asm/firmware.h>
 #include <asm/uaccess.h>
+#include <asm/rtas.h>
 
 #ifdef DEBUG
 #include <asm/udbg.h>
@@ -128,9 +129,9 @@ ssize_t copy_oldmem_page(unsigned long pfn, char *buf,
        if (!csize)
                return 0;
 
-       csize = min(csize, PAGE_SIZE);
+       csize = min_t(size_t, csize, PAGE_SIZE);
 
-       if (pfn < max_pfn) {
+       if ((min_low_pfn < pfn) && (pfn < max_pfn)) {
                vaddr = __va(pfn << PAGE_SHIFT);
                csize = copy_oldmem_vaddr(vaddr, buf, csize, offset, userbuf);
        } else {
@@ -141,3 +142,35 @@ ssize_t copy_oldmem_page(unsigned long pfn, char *buf,
 
        return csize;
 }
+
+#ifdef CONFIG_PPC_RTAS
+/*
+ * The crashkernel region will almost always overlap the RTAS region, so
+ * we have to be careful when shrinking the crashkernel region.
+ */
+void crash_free_reserved_phys_range(unsigned long begin, unsigned long end)
+{
+       unsigned long addr;
+       const u32 *basep, *sizep;
+       unsigned int rtas_start = 0, rtas_end = 0;
+
+       basep = of_get_property(rtas.dev, "linux,rtas-base", NULL);
+       sizep = of_get_property(rtas.dev, "rtas-size", NULL);
+
+       if (basep && sizep) {
+               rtas_start = *basep;
+               rtas_end = *basep + *sizep;
+       }
+
+       for (addr = begin; addr < end; addr += PAGE_SIZE) {
+               /* Does this page overlap with the RTAS region? */
+               if (addr <= rtas_end && ((addr + PAGE_SIZE) > rtas_start))
+                       continue;
+
+               ClearPageReserved(pfn_to_page(addr >> PAGE_SHIFT));
+               init_page_count(pfn_to_page(addr >> PAGE_SHIFT));
+               free_page((unsigned long)__va(addr));
+               totalram_pages++;
+       }
+}
+#endif