target/linux/octeon/patches-4.4/170-cisco-hack.patch

   1 From patchwork Wed Jun  8 13:49:26 2016
   2 Content-Type: text/plain; charset="utf-8"
   3 MIME-Version: 1.0
   4 Content-Transfer-Encoding: 8bit
   5 Subject: [LEDE-DEV] cavium: Ignore MEM boot param when too small
   6 From: =?utf-8?q?Micha=C5=82_Osowiecki?= <michal.osowiecki@gmail.com>
   7 X-Patchwork-Id: 632273
   8 Message-Id: <57582266.8020105@gmail.com>
   9 To: lede-dev@lists.infradead.org
  10 Date: Wed, 8 Jun 2016 15:49:26 +0200
  11
  12 Cisco RV0XX u-boot sets MEM=2048 as boot param. We assume that at least
  13 4MB (mem_alloc_size) of ram is needed to run linux on cavium boards, so
  14 if mem < 4M - ignore it and set default value
  15
  16
  17 Signed-off-by: Michał Osowiecki <michal.osowiecki@gmail.com>
  18
  19 --- a/arch/mips/cavium-octeon/setup.c
  20 +++ b/arch/mips/cavium-octeon/setup.c
  21 @@ -944,6 +944,10 @@ void __init plat_mem_setup(void)
  22         if (mem_alloc_size > MAX_MEMORY)
  23                 mem_alloc_size = MAX_MEMORY;
  24
  25 +       /* Ignore bootarg MEM <= 4MB - cisco uses a b0rked uboot env on their products */
  26 +       if (MAX_MEMORY <= mem_alloc_size)
  27 +               MAX_MEMORY = 512ull << 20;
  28 +
  29  /* Crashkernel ignores bootmem list. It relies on mem=X@Y option */
  30  #ifdef CONFIG_CRASH_DUMP
  31         add_memory_region(RESERVE_LOW_MEM, MAX_MEMORY, BOOT_MEM_RAM);