aboutsummaryrefslogtreecommitdiff
path: root/arch/arc/kernel
diff options
context:
space:
mode:
authorVineet Gupta <vgupta@synopsys.com>2013-02-21 17:37:06 +0530
committerVineet Gupta <vgupta@synopsys.com>2013-02-26 14:25:18 +0530
commiteab6a08c082b82dff884eb49a2229b0474d0b7e5 (patch)
tree4acffa75b89ecdef8d4f38558155b0afdd2fbe19 /arch/arc/kernel
parentfc32781bfdb56dad883469b65e468e749ef35fe5 (diff)
downloadvexpress-lsk-eab6a08c082b82dff884eb49a2229b0474d0b7e5.tar.gz
ARC: make a copy of flat DT
The flat DT (currently embedded in vmlinux) is in .init section. The unflattened/binary tree doesn't copy strings through and references them from orig flat DT - which could cause catestrohpy if of_* APIs are called post init, say from a driver which is a loadable module. Reported-by: James Hogan <james.hogan@imgtec.com> Signed-off-by: Vineet Gupta <vgupta@synopsys.com>
Diffstat (limited to 'arch/arc/kernel')
-rw-r--r--arch/arc/kernel/devtree.c15
-rw-r--r--arch/arc/kernel/setup.c2
2 files changed, 17 insertions, 0 deletions
diff --git a/arch/arc/kernel/devtree.c b/arch/arc/kernel/devtree.c
index a7d98b30358..bdee3a81205 100644
--- a/arch/arc/kernel/devtree.c
+++ b/arch/arc/kernel/devtree.c
@@ -106,3 +106,18 @@ struct machine_desc * __init setup_machine_fdt(void *dt)
return mdesc_best;
}
+
+/*
+ * Copy the flattened DT out of .init since unflattening doesn't copy strings
+ * and the normal DT APIs refs them from orig flat DT
+ */
+void __init copy_devtree(void)
+{
+ void *alloc = early_init_dt_alloc_memory_arch(
+ be32_to_cpu(initial_boot_params->totalsize), 64);
+ if (alloc) {
+ memcpy(alloc, initial_boot_params,
+ be32_to_cpu(initial_boot_params->totalsize));
+ initial_boot_params = alloc;
+ }
+}
diff --git a/arch/arc/kernel/setup.c b/arch/arc/kernel/setup.c
index e591c6ae88a..dc0f968dae0 100644
--- a/arch/arc/kernel/setup.c
+++ b/arch/arc/kernel/setup.c
@@ -354,6 +354,8 @@ void __init setup_arch(char **cmdline_p)
setup_arch_memory();
+ /* copy flat DT out of .init and then unflatten it */
+ copy_devtree();
unflatten_device_tree();
/* Can be issue if someone passes cmd line arg "ro"