Commit 44327236 authored by Qais Yousef's avatar Qais Yousef Committed by Ralf Baechle

MIPS: sead3: allow cmdline/env to change memory size using memsize param

if the user sets memsize parameter in commandline or bootloader
environment, we use it to modify the built-in dtb memory size
Signed-off-by: default avatarQais Yousef <qais.yousef@imgtec.com>
Reviewed-by: default avatarPaul Burton <paul.burton@imgtec.com>
Reviewed-by: default avatarJames Hogan <james.hogan@imgtec.com>
Signed-off-by: default avatarJohn Crispin <blogic@openwrt.org>
Patchwork: http://patchwork.linux-mips.org/patch/6207/
parent e95acd3d
...@@ -344,6 +344,7 @@ config MIPS_SEAD3 ...@@ -344,6 +344,7 @@ config MIPS_SEAD3
select DMA_NONCOHERENT select DMA_NONCOHERENT
select IRQ_CPU select IRQ_CPU
select IRQ_GIC select IRQ_GIC
select LIBFDT
select MIPS_MSC select MIPS_MSC
select SYS_HAS_CPU_MIPS32_R1 select SYS_HAS_CPU_MIPS32_R1
select SYS_HAS_CPU_MIPS32_R2 select SYS_HAS_CPU_MIPS32_R2
......
...@@ -21,5 +21,7 @@ obj-$(CONFIG_EARLY_PRINTK) += sead3-console.o ...@@ -21,5 +21,7 @@ obj-$(CONFIG_EARLY_PRINTK) += sead3-console.o
obj-$(CONFIG_USB_EHCI_HCD) += sead3-ehci.o obj-$(CONFIG_USB_EHCI_HCD) += sead3-ehci.o
obj-$(CONFIG_OF) += sead3.dtb.o obj-$(CONFIG_OF) += sead3.dtb.o
CFLAGS_sead3-setup.o = -I$(src)/../../../scripts/dtc/libfdt
$(obj)/%.dtb: $(obj)/%.dts $(obj)/%.dtb: $(obj)/%.dts
$(call if_changed,dtc) $(call if_changed,dtc)
...@@ -4,13 +4,16 @@ ...@@ -4,13 +4,16 @@
* for more details. * for more details.
* *
* Copyright (C) 2012 MIPS Technologies, Inc. All rights reserved. * Copyright (C) 2012 MIPS Technologies, Inc. All rights reserved.
* Copyright (C) 2013 Imagination Technologies Ltd.
*/ */
#include <linux/init.h> #include <linux/init.h>
#include <linux/libfdt.h>
#include <linux/of_platform.h> #include <linux/of_platform.h>
#include <linux/of_fdt.h> #include <linux/of_fdt.h>
#include <linux/bootmem.h> #include <linux/bootmem.h>
#include <asm/prom.h> #include <asm/prom.h>
#include <asm/fw/fw.h>
#include <asm/mips-boards/generic.h> #include <asm/mips-boards/generic.h>
...@@ -19,8 +22,73 @@ const char *get_system_type(void) ...@@ -19,8 +22,73 @@ const char *get_system_type(void)
return "MIPS SEAD3"; return "MIPS SEAD3";
} }
static uint32_t get_memsize_from_cmdline(void)
{
int memsize = 0;
char *p = arcs_cmdline;
char *s = "memsize=";
p = strstr(p, s);
if (p) {
p += strlen(s);
memsize = memparse(p, NULL);
}
return memsize;
}
static uint32_t get_memsize_from_env(void)
{
int memsize = 0;
char *p;
p = fw_getenv("memsize");
if (p)
memsize = memparse(p, NULL);
return memsize;
}
static uint32_t get_memsize(void)
{
uint32_t memsize;
memsize = get_memsize_from_cmdline();
if (memsize)
return memsize;
return get_memsize_from_env();
}
static void __init parse_memsize_param(void)
{
int offset;
const uint64_t *prop_value;
int prop_len;
uint32_t memsize = get_memsize();
if (!memsize)
return;
offset = fdt_path_offset(&__dtb_start, "/memory");
if (offset > 0) {
uint64_t new_value;
/*
* reg contains 2 32-bits BE values, offset and size. We just
* want to replace the size value without affecting the offset
*/
prop_value = fdt_getprop(&__dtb_start, offset, "reg", &prop_len);
new_value = be64_to_cpu(*prop_value);
new_value = (new_value & ~0xffffffffllu) | memsize;
fdt_setprop_inplace_u64(&__dtb_start, offset, "reg", new_value);
}
}
void __init plat_mem_setup(void) void __init plat_mem_setup(void)
{ {
/* allow command line/bootloader env to override memory size in DT */
parse_memsize_param();
/* /*
* Load the builtin devicetree. This causes the chosen node to be * Load the builtin devicetree. This causes the chosen node to be
* parsed resulting in our memory appearing * parsed resulting in our memory appearing
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment