Revert "UBUNTU: SAUCE: powerpc/fadump: set an upper limit for boot memory size"

This reverts commit bcbdcee5a065dc03defbfcd4a61bcefaf28d8503.

BugLink: https://bugs.launchpad.net/bugs/1655241
Revert in favor of V2

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

diff --git a/arch/powerpc/include/asm/fadump.h b/arch/powerpc/include/asm/fadump.h
index 3d5e8ef5f17c5c03613bab5f423616d2d7df956d..0031806475f0f1b22645336d427bfee9fd9b0462 100644 (file)
--- a/arch/powerpc/include/asm/fadump.h
+++ b/arch/powerpc/include/asm/fadump.h
@@ -43,9 +43,6 @@
 #define MIN_BOOT_MEM   (((RMA_END < (0x1UL << 28)) ? (0x1UL << 28) : RMA_END) \
                        + (0x1UL << 26))
 
-/* The upper limit percentage for user specified boot memory size (25%) */
-#define MAX_BOOT_MEM_RATIO                     4
-
 #define memblock_num_regions(memblock_type)    (memblock.memblock_type.cnt)
 
 /* Firmware provided dump sections */

diff --git a/arch/powerpc/kernel/fadump.c b/arch/powerpc/kernel/fadump.c
index e42e2c5989ed96c2647666af0b2c91439c164235..8f0c7c5d93f2de840826bc22f115d5528c20ea1c 100644 (file)
--- a/arch/powerpc/kernel/fadump.c
+++ b/arch/powerpc/kernel/fadump.c
@@ -216,21 +216,8 @@ static inline unsigned long fadump_calculate_reserve_size(void)
         * Check if the size is specified through fadump_reserve_mem= cmdline
         * option. If yes, then use that.
         */
-       if (fw_dump.reserve_bootvar) {
-               /*
-                * Adjust if the boot memory size specified is above
-                * the upper limit.
-                */
-               if (fw_dump.reserve_bootvar >
-                   (memblock_end_of_DRAM() / MAX_BOOT_MEM_RATIO)) {
-                       fw_dump.reserve_bootvar = (memblock_end_of_DRAM() /
-                                                  MAX_BOOT_MEM_RATIO);
-                       pr_info("Adjusted boot memory size to %luMB\n",
-                               (fw_dump.reserve_bootvar >> 20));
-               }
-
+       if (fw_dump.reserve_bootvar)
                return fw_dump.reserve_bootvar;
-       }
 
        /* divide by 20 to get 5% of value */
        size = memblock_end_of_DRAM() / 20;