lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

powerpc: Setup OF properties for ppc32 kexec

Browse Source 
Refactor the setting of kexec OF properties, moving the common code
from machine_kexec_64.c to machine_kexec.c where it can be used on
both ppc64 and ppc32.  This is needed for kexec to work on ppc32
platforms.

Signed-off-by: Dale Farnsworth <dale@farnsworth.org>
Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
Dale Farnsworth
2008-12-16 06:22:59 +00:00
committed by Paul Mackerras
parent b906cfa397
commit 2e8e4f5b80
2 changed files with 39 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
arch/powerpc/kernel/machine_kexec.c
View File

@@ -13,8 +13,10 @@
#include <linux/reboot.h> #include <linux/reboot.h>
#include <linux/threads.h> #include <linux/threads.h>
#include <linux/lmb.h> #include <linux/lmb.h>
#include <linux/of.h>
#include <asm/machdep.h> #include <asm/machdep.h>
#include <asm/prom.h> #include <asm/prom.h>
#include <asm/sections.h>
void machine_crash_shutdown(struct pt_regs *regs) void machine_crash_shutdown(struct pt_regs *regs)
{ {
@@ -118,3 +120,35 @@ int overlaps_crashkernel(unsigned long start, unsigned long size)
{ {
return (start + size) > crashk_res.start && start <= crashk_res.end; return (start + size) > crashk_res.start && start <= crashk_res.end;
} }
/* Values we need to export to the second kernel via the device tree. */
static unsigned long kernel_end;
static struct property kernel_end_prop = {
.name = "linux,kernel-end",
.length = sizeof(unsigned long),
.value = &kernel_end,
};
static int __init kexec_setup(void)
{
struct device_node *node;
struct property *prop;
node = of_find_node_by_path("/chosen");
if (!node)
return -ENOENT;
/* remove any stale properties so ours can be found */
prop = of_find_property(node, kernel_end_prop.name, NULL);
if (prop)
prom_remove_property(node, prop);
/* information needed by userspace when using default_machine_kexec */
kernel_end = __pa(_end);
prom_add_property(node, &kernel_end_prop);
of_node_put(node);
return 0;
}
late_initcall(kexec_setup);

24
arch/powerpc/kernel/machine_kexec_64.c
View File

@@ -289,7 +289,7 @@ void default_machine_kexec(struct kimage *image)
} }
/* Values we need to export to the second kernel via the device tree. */ /* Values we need to export to the second kernel via the device tree. */
static unsigned long htab_base, kernel_end; static unsigned long htab_base;
static struct property htab_base_prop = { static struct property htab_base_prop = {
.name = "linux,htab-base", .name = "linux,htab-base",
@@ -303,25 +303,20 @@ static struct property htab_size_prop = {
.value = &htab_size_bytes, .value = &htab_size_bytes,
}; };
static struct property kernel_end_prop = {
.name = "linux,kernel-end",
.length = sizeof(unsigned long),
.value = &kernel_end,
};
static void __init export_htab_values(void) static void __init export_htab_values(void)
{ {
struct device_node *node; struct device_node *node;
struct property *prop; struct property *prop;
/* On machines with no htab htab_address is NULL */
if (!htab_address)
return;
node = of_find_node_by_path("/chosen"); node = of_find_node_by_path("/chosen");
if (!node) if (!node)
return; return;
/* remove any stale propertys so ours can be found */ /* remove any stale propertys so ours can be found */
prop = of_find_property(node, kernel_end_prop.name, NULL);
if (prop)
prom_remove_property(node, prop);
prop = of_find_property(node, htab_base_prop.name, NULL); prop = of_find_property(node, htab_base_prop.name, NULL);
if (prop) if (prop)
prom_remove_property(node, prop); prom_remove_property(node, prop);
@@ -329,19 +324,10 @@ static void __init export_htab_values(void)
if (prop) if (prop)
prom_remove_property(node, prop); prom_remove_property(node, prop);
/* information needed by userspace when using default_machine_kexec */
kernel_end = __pa(_end);
prom_add_property(node, &kernel_end_prop);
/* On machines with no htab htab_address is NULL */
if (NULL == htab_address)
goto out;
htab_base = __pa(htab_address); htab_base = __pa(htab_address);
prom_add_property(node, &htab_base_prop); prom_add_property(node, &htab_base_prop);
prom_add_property(node, &htab_size_prop); prom_add_property(node, &htab_size_prop);
out:
of_node_put(node); of_node_put(node);
} }