Initial Contribution
msm-2.6.38: tag AU_LINUX_ANDROID_GINGERBREAD.02.03.04.00.142
Signed-off-by: Bryan Huntsman <bryanh@codeaurora.org>
diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
index acbb447..6b1ee83 100644
--- a/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c
@@ -29,6 +29,9 @@
#include <linux/fs.h>
#include <linux/proc_fs.h>
#include <linux/memblock.h>
+#ifdef CONFIG_MEMORY_HOTPLUG
+#include <linux/memory_hotplug.h>
+#endif
#include <asm/unified.h>
#include <asm/cpu.h>
@@ -97,6 +100,8 @@
unsigned int elf_hwcap __read_mostly;
EXPORT_SYMBOL(elf_hwcap);
+unsigned int boot_reason;
+EXPORT_SYMBOL(boot_reason);
#ifdef MULTI_CPU
struct processor processor __read_mostly;
@@ -517,6 +522,62 @@
}
early_param("mem", early_mem);
+#ifdef CONFIG_MEMORY_HOTPLUG
+static void __init early_mem_reserved(char **p)
+{
+ unsigned int start;
+ unsigned int size;
+ unsigned int end;
+ unsigned int h_end;
+
+ start = PHYS_OFFSET;
+ size = memparse(*p, p);
+ if (**p == '@')
+ start = memparse(*p + 1, p);
+
+ if (movable_reserved_start) {
+ end = start + size;
+ h_end = movable_reserved_start + movable_reserved_size;
+ end = max(end, h_end);
+ movable_reserved_start = min(movable_reserved_start,
+ (unsigned long)start);
+ movable_reserved_size = end - movable_reserved_start;
+ } else {
+ movable_reserved_start = start;
+ movable_reserved_size = size;
+ }
+}
+__early_param("mem_reserved=", early_mem_reserved);
+
+static void __init early_mem_low_power(char **p)
+{
+ unsigned int start;
+ unsigned int size;
+ unsigned int end;
+ unsigned int h_end;
+
+ start = PHYS_OFFSET;
+ size = memparse(*p, p);
+ if (**p == '@')
+ start = memparse(*p + 1, p);
+
+ if (low_power_memory_start) {
+ end = start + size;
+ h_end = low_power_memory_start + low_power_memory_size;
+ end = max(end, h_end);
+ low_power_memory_start = min(low_power_memory_start,
+ (unsigned long)start);
+ low_power_memory_size = end - low_power_memory_start;
+ } else {
+ low_power_memory_start = start;
+ low_power_memory_size = size;
+ }
+
+ arm_add_memory(start, size);
+}
+__early_param("mem_low_power=", early_mem_low_power);
+#endif
+
static void __init
setup_ramdisk(int doload, int prompt, int image_start, unsigned int rd_sz)
{
@@ -606,6 +667,66 @@
__tagtable(ATAG_MEM, parse_tag_mem32);
+#ifdef CONFIG_MEMORY_HOTPLUG
+static int __init parse_tag_mem32_reserved(const struct tag *tag)
+{
+ unsigned int start;
+ unsigned int size;
+ unsigned int end;
+ unsigned int h_end;
+
+ start = tag->u.mem.start;
+ size = tag->u.mem.size;
+
+ if (movable_reserved_start) {
+ end = start + size;
+ h_end = movable_reserved_start + movable_reserved_size;
+ end = max(end, h_end);
+ movable_reserved_start = min(movable_reserved_start,
+ (unsigned long)start);
+ movable_reserved_size = end - movable_reserved_start;
+ } else {
+ movable_reserved_start = tag->u.mem.start;
+ movable_reserved_size = tag->u.mem.size;
+ }
+ printk(KERN_ALERT "reserved %lx at %lx for hotplug\n",
+ movable_reserved_size, movable_reserved_start);
+
+ return 0;
+}
+
+__tagtable(ATAG_MEM_RESERVED, parse_tag_mem32_reserved);
+
+static int __init parse_tag_mem32_low_power(const struct tag *tag)
+{
+ unsigned int start;
+ unsigned int size;
+ unsigned int end;
+ unsigned int h_end;
+
+ start = tag->u.mem.start;
+ size = tag->u.mem.size;
+
+ if (low_power_memory_start) {
+ end = start + size;
+ h_end = low_power_memory_start + low_power_memory_size;
+ end = max(end, h_end);
+ low_power_memory_start = min(low_power_memory_start,
+ (unsigned long)start);
+ low_power_memory_size = end - low_power_memory_start;
+ } else {
+ low_power_memory_start = tag->u.mem.start;
+ low_power_memory_size = tag->u.mem.size;
+ }
+ printk(KERN_ALERT "low power memory %lx at %lx\n",
+ low_power_memory_size, low_power_memory_start);
+
+ return arm_add_memory(tag->u.mem.start, tag->u.mem.size);
+}
+
+__tagtable(ATAG_MEM_LOW_POWER, parse_tag_mem32_low_power);
+#endif
+
#if defined(CONFIG_VGA_CONSOLE) || defined(CONFIG_DUMMY_CONSOLE)
struct screen_info screen_info = {
.orig_video_lines = 30,