* [PATCH] [v2] PPC 4xx: Enable XMON on PPC 4xx boards
@ 2006-09-07 12:33 Josh Boyer
2006-09-07 13:23 ` Matt Porter
0 siblings, 1 reply; 3+ messages in thread
From: Josh Boyer @ 2006-09-07 12:33 UTC (permalink / raw)
To: mporter, paulus; +Cc: linuxppc-dev
Hi All,
The following patch allows XMON to run on the 4xx platform. Tested on
Walnut, Ebony, and Nova (440GX based) eval boards. Patch is against
2.6.18-rc6.
Signed-off-by: Josh Boyer <jdub@us.ibm.com>
---
arch/ppc/xmon/start.c | 6 ++++++
arch/ppc/xmon/xmon.c | 26 ++++++++++++++++++++------
2 files changed, 26 insertions(+), 6 deletions(-)
--- linux-2.6.orig/arch/ppc/xmon/xmon.c
+++ linux-2.6/arch/ppc/xmon/xmon.c
@@ -153,6 +153,12 @@ static int xmon_trace[NR_CPUS];
#define SSTEP 1 /* stepping because of 's' command */
#define BRSTEP 2 /* stepping over breakpoint */
+#ifdef CONFIG_4xx
+#define MSR_SSTEP_ENABLE 0x200
+#else
+#define MSR_SSTEP_ENABLE 0x400
+#endif
+
static struct pt_regs *xmon_regs[NR_CPUS];
extern inline void sync(void)
@@ -211,6 +217,14 @@ static void get_tb(unsigned *p)
p[1] = lo;
}
+static inline void xmon_enable_sstep(struct pt_regs *regs)
+{
+ regs->msr |= MSR_SSTEP_ENABLE;
+#ifdef CONFIG_4xx
+ mtspr(SPRN_DBCR0, mfspr(SPRN_DBCR0) | DBCR0_IC | DBCR0_IDM);
+#endif
+}
+
int xmon(struct pt_regs *excp)
{
struct pt_regs regs;
@@ -254,10 +268,10 @@ int xmon(struct pt_regs *excp)
cmd = cmds(excp);
if (cmd == 's') {
xmon_trace[smp_processor_id()] = SSTEP;
- excp->msr |= 0x400;
+ xmon_enable_sstep(excp);
} else if (at_breakpoint(excp->nip)) {
xmon_trace[smp_processor_id()] = BRSTEP;
- excp->msr |= 0x400;
+ xmon_enable_sstep(excp);
} else {
xmon_trace[smp_processor_id()] = 0;
insert_bpts();
@@ -298,7 +312,7 @@ xmon_bpt(struct pt_regs *regs)
remove_bpts();
excprint(regs);
xmon_trace[smp_processor_id()] = BRSTEP;
- regs->msr |= 0x400;
+ xmon_enable_sstep(regs);
} else {
xmon(regs);
}
@@ -385,7 +399,7 @@ insert_bpts(void)
}
store_inst((void *) bp->address);
}
-#if !defined(CONFIG_8xx)
+#if ! (defined(CONFIG_8xx) || defined(CONFIG_4xx))
if (dabr.enabled)
set_dabr(dabr.address);
if (iabr.enabled)
@@ -400,7 +414,7 @@ remove_bpts(void)
struct bpt *bp;
unsigned instr;
-#if !defined(CONFIG_8xx)
+#if ! (defined(CONFIG_8xx) || defined(CONFIG_4xx))
set_dabr(0);
set_iabr(0);
#endif
@@ -677,7 +691,7 @@ bpt_cmds(void)
cmd = inchar();
switch (cmd) {
-#if !defined(CONFIG_8xx)
+#if ! (defined(CONFIG_8xx) || defined(CONFIG_4xx))
case 'd':
mode = 7;
cmd = inchar();
--- linux-2.6.orig/arch/ppc/xmon/start.c
+++ linux-2.6/arch/ppc/xmon/start.c
@@ -73,6 +73,12 @@ xmon_map_scc(void)
TXRDY = 0x20;
RXRDY = 1;
DLAB = 0x80;
+#elif ( defined(CONFIG_440) || defined(CONFIG_440GX) )
+ sccd = (volatile unsigned char *) ioremap64(0x0000000140000200ULL, 8);
+ sccc = sccd + 5;
+ TXRDY = 0x20;
+ RXRDY = 1;
+ DLAB = 0x80;
#endif /* platform */
register_sysrq_key('x', &sysrq_xmon_op);
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] [v2] PPC 4xx: Enable XMON on PPC 4xx boards
2006-09-07 12:33 [PATCH] [v2] PPC 4xx: Enable XMON on PPC 4xx boards Josh Boyer
@ 2006-09-07 13:23 ` Matt Porter
2006-09-07 13:29 ` Josh Boyer
0 siblings, 1 reply; 3+ messages in thread
From: Matt Porter @ 2006-09-07 13:23 UTC (permalink / raw)
To: Josh Boyer; +Cc: linuxppc-dev, paulus
On Thu, Sep 07, 2006 at 07:33:44AM -0500, Josh Boyer wrote:
> --- linux-2.6.orig/arch/ppc/xmon/start.c
> +++ linux-2.6/arch/ppc/xmon/start.c
> @@ -73,6 +73,12 @@ xmon_map_scc(void)
> TXRDY = 0x20;
> RXRDY = 1;
> DLAB = 0x80;
> +#elif ( defined(CONFIG_440) || defined(CONFIG_440GX) )
> + sccd = (volatile unsigned char *) ioremap64(0x0000000140000200ULL, 8);
> + sccc = sccd + 5;
> + TXRDY = 0x20;
> + RXRDY = 1;
> + DLAB = 0x80;
> #endif /* platform */
These can be represented with CONFIG_44x. Though it doesn't work for
440EP since it doesn't have the 36-bit memory map. It should be:
+#elif ( defined(CONFIG_44x) && !defined(CONFIG_440EP) )
+ sccd = (volatile unsigned char *) ioremap64(0x0000000140000200ULL, 8);
+ sccc = sccd + 5;
+ TXRDY = 0x20;
+ RXRDY = 1;
+ DLAB = 0x80;
Adding in another case would enable 440EP as well:
+#elif ( defined(CONFIG_440EP) )
+ sccd = (volatile unsigned char *) ioremap(0xef600300, 8);
+ sccc = sccd + 5;
+ TXRDY = 0x20;
+ RXRDY = 1;
+ DLAB = 0x80;
-Matt
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] [v2] PPC 4xx: Enable XMON on PPC 4xx boards
2006-09-07 13:23 ` Matt Porter
@ 2006-09-07 13:29 ` Josh Boyer
0 siblings, 0 replies; 3+ messages in thread
From: Josh Boyer @ 2006-09-07 13:29 UTC (permalink / raw)
To: Matt Porter; +Cc: linuxppc-dev, paulus
On Thu, 2006-09-07 at 09:23 -0400, Matt Porter wrote:
>
> These can be represented with CONFIG_44x. Though it doesn't work for
> 440EP since it doesn't have the 36-bit memory map. It should be:
>
> +#elif ( defined(CONFIG_44x) && !defined(CONFIG_440EP) )
> + sccd = (volatile unsigned char *) ioremap64(0x0000000140000200ULL, 8);
> + sccc = sccd + 5;
> + TXRDY = 0x20;
> + RXRDY = 1;
> + DLAB = 0x80;
Right. I don't have access to a 440EP board anymore, so I couldn't test
it.
> Adding in another case would enable 440EP as well:
>
> +#elif ( defined(CONFIG_440EP) )
> + sccd = (volatile unsigned char *) ioremap(0xef600300, 8);
> + sccc = sccd + 5;
> + TXRDY = 0x20;
> + RXRDY = 1;
> + DLAB = 0x80;
That seems correct to me. I'll add that and send out another version
shortly.
josh
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2006-09-07 13:28 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-09-07 12:33 [PATCH] [v2] PPC 4xx: Enable XMON on PPC 4xx boards Josh Boyer
2006-09-07 13:23 ` Matt Porter
2006-09-07 13:29 ` Josh Boyer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).