From: Anton Vorontsov <avorontsov@ru•mvista.com>
To: linuxppc-dev@ozlabs•org
Cc: Paul Mackerras <paulus@samba•org>
Subject: [PATCH 1/8] powerpc: set up OF properties for ppc32 kexec
Date: Fri, 1 Aug 2008 18:14:14 +0400 [thread overview]
Message-ID: <20080801141414.GA1161@polina.dev.rtsoft.ru> (raw)
In-Reply-To: <20080801141306.GA29127@polina.dev.rtsoft.ru>
From: Dale Farnsworth <dale@farnsworth•org>
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>
---
arch/powerpc/kernel/machine_kexec.c | 27 +++++++++++++++++++++++++++
arch/powerpc/kernel/machine_kexec_64.c | 20 +++++---------------
2 files changed, 32 insertions(+), 15 deletions(-)
diff --git a/arch/powerpc/kernel/machine_kexec.c b/arch/powerpc/kernel/machine_kexec.c
index aab7688..a625673 100644
--- a/arch/powerpc/kernel/machine_kexec.c
+++ b/arch/powerpc/kernel/machine_kexec.c
@@ -13,8 +13,10 @@
#include <linux/reboot.h>
#include <linux/threads.h>
#include <linux/lmb.h>
+#include <linux/of.h>
#include <asm/machdep.h>
#include <asm/prom.h>
+#include <asm/sections.h>
void machine_crash_shutdown(struct pt_regs *regs)
{
@@ -116,3 +118,28 @@ int overlaps_crashkernel(unsigned long start, unsigned long size)
{
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;
+
+ node = of_find_node_by_path("/chosen");
+ if (!node)
+ return -ENOENT;
+
+ kernel_end = __pa(_end);
+ prom_add_property(node, &kernel_end_prop);
+
+ of_node_put(node);
+ return 0;
+}
+__initcall(kexec_setup);
diff --git a/arch/powerpc/kernel/machine_kexec_64.c b/arch/powerpc/kernel/machine_kexec_64.c
index a168514..c30678d 100644
--- a/arch/powerpc/kernel/machine_kexec_64.c
+++ b/arch/powerpc/kernel/machine_kexec_64.c
@@ -289,7 +289,7 @@ void default_machine_kexec(struct kimage *image)
}
/* 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 = {
.name = "linux,htab-base",
@@ -303,32 +303,22 @@ static struct property htab_size_prop = {
.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)
{
struct device_node *node;
+ /* On machines with no htab htab_address is NULL */
+ if (NULL == htab_address)
+ return;
+
node = of_find_node_by_path("/chosen");
if (!node)
return;
- 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);
prom_add_property(node, &htab_base_prop);
prom_add_property(node, &htab_size_prop);
- out:
of_node_put(node);
}
--
1.5.5.4
next prev parent reply other threads:[~2008-08-01 14:14 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-08-01 14:13 [RFC][PATCH 0/8] kexec/kdump support for ppc32 Anton Vorontsov
2008-08-01 14:14 ` Anton Vorontsov [this message]
2008-08-07 10:44 ` [PATCH 1/8] powerpc: set up OF properties for ppc32 kexec Michael Ellerman
2008-08-01 14:14 ` [PATCH 2/8] powerpc: make default kexec/crash_kernel ops implicit Anton Vorontsov
2008-08-01 14:14 ` [PATCH 3/8] powerpc: remove default kexec/crash_kernel ops assignments Anton Vorontsov
2008-08-01 14:14 ` [PATCH 4/8] powerpc: add the ability for a classic ppc kernel to be loaded at 32M Anton Vorontsov
2008-08-01 18:49 ` Scott Wood
2008-08-01 20:38 ` Anton Vorontsov
2008-08-20 4:57 ` Paul Mackerras
2008-08-01 14:14 ` [PATCH 5/8] powerpc: allow to ioremap RAM addresses for kdump kernel on ppc32 Anton Vorontsov
2008-08-01 14:14 ` [PATCH 6/8] powerpc: set up OF properties for ppc32 kdump Anton Vorontsov
2008-08-07 10:47 ` Michael Ellerman
2008-08-07 11:11 ` Anton Vorontsov
2008-08-01 14:14 ` [PATCH 7/8] powerpc: implement crash_setup_regs for ppc32 Anton Vorontsov
2008-08-07 10:32 ` Michael Ellerman
2008-08-01 14:14 ` [PATCH 8/8] powerpc: last bits to support kdump on ppc32 Anton Vorontsov
2008-08-03 14:40 ` Michael Ellerman
2008-08-01 14:21 ` [RFC][PATCH 0/8] kexec/kdump support for ppc32 Kumar Gala
2008-08-01 14:46 ` Anton Vorontsov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20080801141414.GA1161@polina.dev.rtsoft.ru \
--to=avorontsov@ru$(echo .)mvista.com \
--cc=linuxppc-dev@ozlabs$(echo .)org \
--cc=paulus@samba$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox