aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/kernel/machine_kexec.c
diff options
context:
space:
mode:
authorDale Farnsworth <dale@farnsworth.org>2008-12-17 05:09:06 -0500
committerPaul Mackerras <paulus@samba.org>2008-12-22 23:13:29 -0500
commit6f29c3298b18216198631cbee01c349adecb225d (patch)
tree3ca157092ef9c3092ca67babe401b5f2a80cef19 /arch/powerpc/kernel/machine_kexec.c
parent73753313884e8d063d9bf9d3e36325743ca006ba (diff)
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: Dale Farnsworth <dale@farnsworth.org> Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/kernel/machine_kexec.c')
-rw-r--r--arch/powerpc/kernel/machine_kexec.c36
1 files changed, 36 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/machine_kexec.c b/arch/powerpc/kernel/machine_kexec.c
index 4f797c0b7148..b3abebb7ee64 100644
--- a/arch/powerpc/kernel/machine_kexec.c
+++ b/arch/powerpc/kernel/machine_kexec.c
@@ -120,6 +120,7 @@ int overlaps_crashkernel(unsigned long start, unsigned long size)
120 120
121/* Values we need to export to the second kernel via the device tree. */ 121/* Values we need to export to the second kernel via the device tree. */
122static unsigned long kernel_end; 122static unsigned long kernel_end;
123static unsigned long crashk_size;
123 124
124static struct property kernel_end_prop = { 125static struct property kernel_end_prop = {
125 .name = "linux,kernel-end", 126 .name = "linux,kernel-end",
@@ -127,6 +128,39 @@ static struct property kernel_end_prop = {
127 .value = &kernel_end, 128 .value = &kernel_end,
128}; 129};
129 130
131static struct property crashk_base_prop = {
132 .name = "linux,crashkernel-base",
133 .length = sizeof(unsigned long),
134 .value = &crashk_res.start,
135};
136
137static struct property crashk_size_prop = {
138 .name = "linux,crashkernel-size",
139 .length = sizeof(unsigned long),
140 .value = &crashk_size,
141};
142
143static void __init export_crashk_values(struct device_node *node)
144{
145 struct property *prop;
146
147 /* There might be existing crash kernel properties, but we can't
148 * be sure what's in them, so remove them. */
149 prop = of_find_property(node, "linux,crashkernel-base", NULL);
150 if (prop)
151 prom_remove_property(node, prop);
152
153 prop = of_find_property(node, "linux,crashkernel-size", NULL);
154 if (prop)
155 prom_remove_property(node, prop);
156
157 if (crashk_res.start != 0) {
158 prom_add_property(node, &crashk_base_prop);
159 crashk_size = crashk_res.end - crashk_res.start + 1;
160 prom_add_property(node, &crashk_size_prop);
161 }
162}
163
130static int __init kexec_setup(void) 164static int __init kexec_setup(void)
131{ 165{
132 struct device_node *node; 166 struct device_node *node;
@@ -145,6 +179,8 @@ static int __init kexec_setup(void)
145 kernel_end = __pa(_end); 179 kernel_end = __pa(_end);
146 prom_add_property(node, &kernel_end_prop); 180 prom_add_property(node, &kernel_end_prop);
147 181
182 export_crashk_values(node);
183
148 of_node_put(node); 184 of_node_put(node);
149 return 0; 185 return 0;
150} 186}