From: Michael Ellerman <michael@ellerman.id.au>
To: Paul Mackerras <paulus@samba.org>
Cc: linuxppc-dev@ozlabs.org, Kumar Gala <kumar.gala@freescale.com>
Subject: [PATCH 1/5] powerpc: Make early xmon logic immune to location of early parsing
Date: Wed, 17 May 2006 18:00:41 +1000 [thread overview]
Message-ID: <1147852841.148164.91320074069.qpush@concordia> (raw)
Currently early_xmon() calls directly into debugger() if xmon=early is passed.
This ties the invocation of early xmon to the location of parse_early_param(),
which might change.
Tested on P5 LPAR and F50.
Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
---
arch/powerpc/kernel/setup-common.c | 3 ++-
arch/powerpc/kernel/setup.h | 1 +
arch/powerpc/kernel/setup_32.c | 3 +++
arch/powerpc/kernel/setup_64.c | 3 +++
4 files changed, 9 insertions(+), 1 deletion(-)
Index: to-merge/arch/powerpc/kernel/setup-common.c
===================================================================
--- to-merge.orig/arch/powerpc/kernel/setup-common.c
+++ to-merge/arch/powerpc/kernel/setup-common.c
@@ -443,6 +443,7 @@ void __init smp_setup_cpu_maps(void)
}
#endif /* CONFIG_SMP */
+int __initdata do_early_xmon;
#ifdef CONFIG_XMON
static int __init early_xmon(char *p)
{
@@ -456,7 +457,7 @@ static int __init early_xmon(char *p)
return 0;
}
xmon_init(1);
- debugger(NULL);
+ do_early_xmon = 1;
return 0;
}
Index: to-merge/arch/powerpc/kernel/setup.h
===================================================================
--- to-merge.orig/arch/powerpc/kernel/setup.h
+++ to-merge/arch/powerpc/kernel/setup.h
@@ -2,5 +2,6 @@
#define _POWERPC_KERNEL_SETUP_H
void check_for_initrd(void);
+extern int do_early_xmon;
#endif /* _POWERPC_KERNEL_SETUP_H */
Index: to-merge/arch/powerpc/kernel/setup_32.c
===================================================================
--- to-merge.orig/arch/powerpc/kernel/setup_32.c
+++ to-merge/arch/powerpc/kernel/setup_32.c
@@ -296,6 +296,9 @@ void __init setup_arch(char **cmdline_p)
parse_early_param();
+ if (do_early_xmon)
+ debugger(NULL);
+
/* set up the bootmem stuff with available memory */
do_init_bootmem();
if ( ppc_md.progress ) ppc_md.progress("setup_arch: bootmem", 0x3eab);
Index: to-merge/arch/powerpc/kernel/setup_64.c
===================================================================
--- to-merge.orig/arch/powerpc/kernel/setup_64.c
+++ to-merge/arch/powerpc/kernel/setup_64.c
@@ -425,6 +425,9 @@ void __init setup_system(void)
parse_early_param();
+ if (do_early_xmon)
+ debugger(NULL);
+
check_smt_enabled();
smp_setup_cpu_maps();
next reply other threads:[~2006-05-17 8:00 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-05-17 8:00 Michael Ellerman [this message]
2006-05-17 8:00 ` [PATCH 2/5] powerpc: Parse early parameters early, rather than sorta early Michael Ellerman
2006-05-17 8:00 ` [PATCH 3/5] powerpc: Unify mem= handling Michael Ellerman
2006-05-17 8:00 ` [PATCH 4/5] powerpc: Kdump header cleanup Michael Ellerman
2006-05-17 8:00 ` [PATCH 5/5] powerpc: Move crashkernel= handling into the kernel Michael Ellerman
2006-05-18 1:16 ` [PATCH] " Michael Ellerman
2006-05-17 21:29 ` [PATCH 1/5] powerpc: Make early xmon logic immune to location of early parsing Tom Rini
2006-05-18 0:03 ` Michael Ellerman
2006-05-18 1:08 ` Tom Rini
2006-05-22 7:03 ` Michael Ellerman
2006-05-22 14:26 ` Tom Rini
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=1147852841.148164.91320074069.qpush@concordia \
--to=michael@ellerman.id.au \
--cc=kumar.gala@freescale.com \
--cc=linuxppc-dev@ozlabs.org \
--cc=paulus@samba.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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