Commit 6f29c329 authored by Dale Farnsworth's avatar Dale Farnsworth Committed by Paul Mackerras

powerpc/32: Setup OF properties for kdump

Refactor the setting of kdump 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 will be needed for kdump to work on ppc32
platforms.
Signed-off-by: default avatarDale Farnsworth <dale@farnsworth.org>
Signed-off-by: default avatarAnton Vorontsov <avorontsov@ru.mvista.com>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 73753313
...@@ -120,6 +120,7 @@ int overlaps_crashkernel(unsigned long start, unsigned long size) ...@@ -120,6 +120,7 @@ int overlaps_crashkernel(unsigned long start, unsigned long size)
/* 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 kernel_end; static unsigned long kernel_end;
static unsigned long crashk_size;
static struct property kernel_end_prop = { static struct property kernel_end_prop = {
.name = "linux,kernel-end", .name = "linux,kernel-end",
...@@ -127,6 +128,39 @@ static struct property kernel_end_prop = { ...@@ -127,6 +128,39 @@ static struct property kernel_end_prop = {
.value = &kernel_end, .value = &kernel_end,
}; };
static struct property crashk_base_prop = {
.name = "linux,crashkernel-base",
.length = sizeof(unsigned long),
.value = &crashk_res.start,
};
static struct property crashk_size_prop = {
.name = "linux,crashkernel-size",
.length = sizeof(unsigned long),
.value = &crashk_size,
};
static void __init export_crashk_values(struct device_node *node)
{
struct property *prop;
/* There might be existing crash kernel properties, but we can't
* be sure what's in them, so remove them. */
prop = of_find_property(node, "linux,crashkernel-base", NULL);
if (prop)
prom_remove_property(node, prop);
prop = of_find_property(node, "linux,crashkernel-size", NULL);
if (prop)
prom_remove_property(node, prop);
if (crashk_res.start != 0) {
prom_add_property(node, &crashk_base_prop);
crashk_size = crashk_res.end - crashk_res.start + 1;
prom_add_property(node, &crashk_size_prop);
}
}
static int __init kexec_setup(void) static int __init kexec_setup(void)
{ {
struct device_node *node; struct device_node *node;
...@@ -145,6 +179,8 @@ static int __init kexec_setup(void) ...@@ -145,6 +179,8 @@ static int __init kexec_setup(void)
kernel_end = __pa(_end); kernel_end = __pa(_end);
prom_add_property(node, &kernel_end_prop); prom_add_property(node, &kernel_end_prop);
export_crashk_values(node);
of_node_put(node); of_node_put(node);
return 0; return 0;
} }
......
...@@ -303,18 +303,18 @@ static struct property htab_size_prop = { ...@@ -303,18 +303,18 @@ static struct property htab_size_prop = {
.value = &htab_size_bytes, .value = &htab_size_bytes,
}; };
static void __init export_htab_values(void) static int __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 */ /* On machines with no htab htab_address is NULL */
if (!htab_address) if (!htab_address)
return; return -ENODEV;
node = of_find_node_by_path("/chosen"); node = of_find_node_by_path("/chosen");
if (!node) if (!node)
return; return -ENODEV;
/* remove any stale propertys so ours can be found */ /* remove any stale propertys so ours can be found */
prop = of_find_property(node, htab_base_prop.name, NULL); prop = of_find_property(node, htab_base_prop.name, NULL);
...@@ -329,54 +329,6 @@ static void __init export_htab_values(void) ...@@ -329,54 +329,6 @@ static void __init export_htab_values(void)
prom_add_property(node, &htab_size_prop); prom_add_property(node, &htab_size_prop);
of_node_put(node); of_node_put(node);
}
static struct property crashk_base_prop = {
.name = "linux,crashkernel-base",
.length = sizeof(unsigned long),
.value = &crashk_res.start,
};
static unsigned long crashk_size;
static struct property crashk_size_prop = {
.name = "linux,crashkernel-size",
.length = sizeof(unsigned long),
.value = &crashk_size,
};
static void __init export_crashk_values(void)
{
struct device_node *node;
struct property *prop;
node = of_find_node_by_path("/chosen");
if (!node)
return;
/* There might be existing crash kernel properties, but we can't
* be sure what's in them, so remove them. */
prop = of_find_property(node, "linux,crashkernel-base", NULL);
if (prop)
prom_remove_property(node, prop);
prop = of_find_property(node, "linux,crashkernel-size", NULL);
if (prop)
prom_remove_property(node, prop);
if (crashk_res.start != 0) {
prom_add_property(node, &crashk_base_prop);
crashk_size = crashk_res.end - crashk_res.start + 1;
prom_add_property(node, &crashk_size_prop);
}
of_node_put(node);
}
static int __init kexec_setup(void)
{
export_htab_values();
export_crashk_values();
return 0; return 0;
} }
__initcall(kexec_setup); late_initcall(export_htab_values);
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