octeon: Ignore MEM boot param when too small

Cisco RV0XX u-boot sets MEM=2048 as boot param. We assume that at least 4MB (mem_alloc_size) of ram is needed to run linux on cavium boards, so if mem < 4M - ignore it and set default value Signed-off-by: Michał Osowiecki <michal.osowiecki@gmail.com>
author: Michał Osowiecki <michal.osowiecki@gmail.com> 2016-06-27 16:15:22 +0200
committer: Zoltan HERPAI <wigyori@uid0.hu> 2016-06-27 16:15:22 +0200
commit: 93a03a3dadf7ca0df8315551f314684ea16b3b61 (patch)
tree: b053d22ecd411bad12d5bd7e9cdde3bfa7e72e05 /target
parent: 59d6be20e26e061840bec116c9b893b32996ee75 (diff)
download: master-187ad058-93a03a3dadf7ca0df8315551f314684ea16b3b61.tar.gz
master-187ad058-93a03a3dadf7ca0df8315551f314684ea16b3b61.tar.bz2
master-187ad058-93a03a3dadf7ca0df8315551f314684ea16b3b61.zip
1 files changed, 31 insertions, 0 deletions
diff --git a/target/linux/octeon/patches-4.4/170-cisco-hack.patch b/target/linux/octeon/patches-4.4/170-cisco-hack.patch
new file mode 100644
index 0000000000..2311e351eb
--- /dev/null
+++ b/target/linux/octeon/patches-4.4/170-cisco-hack.patch
@@ -0,0 +1,31 @@
+From patchwork Wed Jun  8 13:49:26 2016
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 8bit
+Subject: [LEDE-DEV] cavium: Ignore MEM boot param when too small
+From: =?utf-8?q?Micha=C5=82_Osowiecki?= <michal.osowiecki@gmail.com>
+X-Patchwork-Id: 632273
+Message-Id: <57582266.8020105@gmail.com>
+To: lede-dev@lists.infradead.org
+Date: Wed, 8 Jun 2016 15:49:26 +0200
+
+Cisco RV0XX u-boot sets MEM=2048 as boot param. We assume that at least 
+4MB (mem_alloc_size) of ram is needed to run linux on cavium boards, so 
+if mem < 4M - ignore it and set default value
+
+
+Signed-off-by: MichaÅ Osowiecki <michal.osowiecki@gmail.com>
+
+--- a/arch/mips/cavium-octeon/setup.c
++++ b/arch/mips/cavium-octeon/setup.c
+@@ -944,6 +944,10 @@
+ 	if (mem_alloc_size > MAX_MEMORY)
+ 		mem_alloc_size = MAX_MEMORY;
+ 
++	/* Ignore bootarg MEM <= 4MB - cisco uses a b0rked uboot env on their products */
++	if (MAX_MEMORY <= mem_alloc_size)
++		MAX_MEMORY = 512ull << 20;
++
+ /* Crashkernel ignores bootmem list. It relies on mem=X@Y option */
+ #ifdef CONFIG_CRASH_DUMP
+ 	add_memory_region(RESERVE_LOW_MEM, MAX_MEMORY, BOOT_MEM_RAM);
author	Michał Osowiecki <michal.osowiecki@gmail.com>	2016-06-27 16:15:22 +0200
committer	Zoltan HERPAI <wigyori@uid0.hu>	2016-06-27 16:15:22 +0200
commit	93a03a3dadf7ca0df8315551f314684ea16b3b61 (patch)
tree	b053d22ecd411bad12d5bd7e9cdde3bfa7e72e05 /target
parent	59d6be20e26e061840bec116c9b893b32996ee75 (diff)
download	master-187ad058-93a03a3dadf7ca0df8315551f314684ea16b3b61.tar.gz master-187ad058-93a03a3dadf7ca0df8315551f314684ea16b3b61.tar.bz2 master-187ad058-93a03a3dadf7ca0df8315551f314684ea16b3b61.zip