fadump: Remove the phyp assisted dump code.

Remove the phyp assisted dump implementation which is not is use.

Signed-off-by: Mahesh Salgaonkar <mahesh@linux.vnet.ibm.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

1 files changed, 0 insertions, 87 deletions

diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c
index 70222b35cfc..89e850af3dd 100644
--- a/arch/powerpc/kernel/prom.c
+++ b/arch/powerpc/kernel/prom.c
@@ -52,7 +52,6 @@
 #include <asm/machdep.h>
 #include <asm/pSeries_reconfig.h>
 #include <asm/pci-bridge.h>
-#include <asm/phyp_dump.h>
 #include <asm/kexec.h>
 #include <asm/opal.h>
 #include <asm/fadump.h>
@@ -616,86 +615,6 @@ static void __init early_reserve_mem(void)
         }
 }
 
-#ifdef CONFIG_PHYP_DUMP
-/**
- * phyp_dump_calculate_reserve_size() - reserve variable boot area 5% or arg
- *
- * Function to find the largest size we need to reserve
- * during early boot process.
- *
- * It either looks for boot param and returns that OR
- * returns larger of 256 or 5% rounded down to multiples of 256MB.
- *
- */
-static inline unsigned long phyp_dump_calculate_reserve_size(void)
-{
-        unsigned long tmp;
-
-        if (phyp_dump_info->reserve_bootvar)
-                return phyp_dump_info->reserve_bootvar;
-
-        /* divide by 20 to get 5% of value */
-        tmp = memblock_end_of_DRAM();
-        do_div(tmp, 20);
-
-        /* round it down in multiples of 256 */
-        tmp = tmp & ~0x0FFFFFFFUL;
-
-        return (tmp > PHYP_DUMP_RMR_END ? tmp : PHYP_DUMP_RMR_END);
-}
-
-/**
- * phyp_dump_reserve_mem() - reserve all not-yet-dumped mmemory
- *
- * This routine may reserve memory regions in the kernel only
- * if the system is supported and a dump was taken in last
- * boot instance or if the hardware is supported and the
- * scratch area needs to be setup. In other instances it returns
- * without reserving anything. The memory in case of dump being
- * active is freed when the dump is collected (by userland tools).
- */
-static void __init phyp_dump_reserve_mem(void)
-{
-        unsigned long base, size;
-        unsigned long variable_reserve_size;
-
-        if (!phyp_dump_info->phyp_dump_configured) {
-                printk(KERN_ERR "Phyp-dump not supported on this hardware\n");
-                return;
-        }
-
-        if (!phyp_dump_info->phyp_dump_at_boot) {
-                printk(KERN_INFO "Phyp-dump disabled at boot time\n");
-                return;
-        }
-
-        variable_reserve_size = phyp_dump_calculate_reserve_size();
-
-        if (phyp_dump_info->phyp_dump_is_active) {
-                /* Reserve *everything* above RMR.Area freed by userland tools*/
-                base = variable_reserve_size;
-                size = memblock_end_of_DRAM() - base;
-
-                /* XXX crashed_ram_end is wrong, since it may be beyond
-                 * the memory_limit, it will need to be adjusted. */
-                memblock_reserve(base, size);
-
-                phyp_dump_info->init_reserve_start = base;
-                phyp_dump_info->init_reserve_size = size;
-        } else {
-                size = phyp_dump_info->cpu_state_size +
-                        phyp_dump_info->hpte_region_size +
-                        variable_reserve_size;
-                base = memblock_end_of_DRAM() - size;
-                memblock_reserve(base, size);
-                phyp_dump_info->init_reserve_start = base;
-                phyp_dump_info->init_reserve_size = size;
-        }
-}
-#else
-static inline void __init phyp_dump_reserve_mem(void) {}
-#endif /* CONFIG_PHYP_DUMP  && CONFIG_PPC_RTAS */
-
 void __init early_init_devtree(void *params)
 {
         phys_addr_t limit;
@@ -715,11 +634,6 @@ void __init early_init_devtree(void *params)
         of_scan_flat_dt(early_init_dt_scan_opal, NULL);
 #endif
 
-#ifdef CONFIG_PHYP_DUMP
-        /* scan tree to see if dump occurred during last boot */
-        of_scan_flat_dt(early_init_dt_scan_phyp_dump, NULL);
-#endif
-
 #ifdef CONFIG_FA_DUMP
         /* scan tree to see if dump is active during last boot */
         of_scan_flat_dt(early_init_dt_scan_fw_dump, NULL);
@@ -765,7 +679,6 @@ void __init early_init_devtree(void *params)
 #endif
                 reserve_crashkernel();
         early_reserve_mem();
-        phyp_dump_reserve_mem();
 
         /*
          * Ensure that total memory size is page-aligned, because otherwise