From: Michal Simek <monstr@monstr.eu>
To: linux-kernel@vger.kernel.org
Cc: john.williams@petalogix.com, microblaze-uclinux@itee.uq.edu.au,
michal.simek@petalogix.com, Michal Simek <monstr@monstr.eu>
Subject: [PATCH 22/29] microblaze_mmu_v2: Traps MMU update
Date: Wed, 27 May 2009 08:47:47 +0200 [thread overview]
Message-ID: <1243406874-3917-23-git-send-email-monstr@monstr.eu> (raw)
In-Reply-To: <1243406874-3917-22-git-send-email-monstr@monstr.eu>
Signed-off-by: Michal Simek <monstr@monstr.eu>
---
arch/microblaze/include/asm/exceptions.h | 24 +++++++--------------
arch/microblaze/kernel/traps.c | 34 ++++++++++++++++++++++++++++++
2 files changed, 42 insertions(+), 16 deletions(-)
diff --git a/arch/microblaze/include/asm/exceptions.h b/arch/microblaze/include/asm/exceptions.h
index 24ca540..90731df 100644
--- a/arch/microblaze/include/asm/exceptions.h
+++ b/arch/microblaze/include/asm/exceptions.h
@@ -1,8 +1,8 @@
/*
* Preliminary support for HW exception handing for Microblaze
*
- * Copyright (C) 2008 Michal Simek
- * Copyright (C) 2008 PetaLogix
+ * Copyright (C) 2008-2009 Michal Simek <monstr@monstr.eu>
+ * Copyright (C) 2008-2009 PetaLogix
* Copyright (C) 2005 John Williams <jwilliams@itee.uq.edu.au>
*
* This file is subject to the terms and conditions of the GNU General
@@ -64,21 +64,13 @@ asmlinkage void full_exception(struct pt_regs *regs, unsigned int type,
void die(const char *str, struct pt_regs *fp, long err);
void _exception(int signr, struct pt_regs *regs, int code, unsigned long addr);
-#if defined(CONFIG_XMON)
-extern void xmon(struct pt_regs *regs);
-extern int xmon_bpt(struct pt_regs *regs);
-extern int xmon_sstep(struct pt_regs *regs);
-extern int xmon_iabr_match(struct pt_regs *regs);
-extern int xmon_dabr_match(struct pt_regs *regs);
-extern void (*xmon_fault_handler)(struct pt_regs *regs);
+#ifdef CONFIG_MMU
+void __bug(const char *file, int line, void *data);
+int bad_trap(int trap_num, struct pt_regs *regs);
+int debug_trap(struct pt_regs *regs);
+#endif /* CONFIG_MMU */
-void (*debugger)(struct pt_regs *regs) = xmon;
-int (*debugger_bpt)(struct pt_regs *regs) = xmon_bpt;
-int (*debugger_sstep)(struct pt_regs *regs) = xmon_sstep;
-int (*debugger_iabr_match)(struct pt_regs *regs) = xmon_iabr_match;
-int (*debugger_dabr_match)(struct pt_regs *regs) = xmon_dabr_match;
-void (*debugger_fault_handler)(struct pt_regs *regs);
-#elif defined(CONFIG_KGDB)
+#if defined(CONFIG_KGDB)
void (*debugger)(struct pt_regs *regs);
int (*debugger_bpt)(struct pt_regs *regs);
int (*debugger_sstep)(struct pt_regs *regs);
diff --git a/arch/microblaze/kernel/traps.c b/arch/microblaze/kernel/traps.c
index 6322cc1..eaaaf80 100644
--- a/arch/microblaze/kernel/traps.c
+++ b/arch/microblaze/kernel/traps.c
@@ -97,3 +97,37 @@ void dump_stack(void)
show_stack(NULL, NULL);
}
EXPORT_SYMBOL(dump_stack);
+
+#ifdef CONFIG_MMU
+void __bug(const char *file, int line, void *data)
+{
+ if (data)
+ printk(KERN_CRIT "kernel BUG at %s:%d (data = %p)!\n",
+ file, line, data);
+ else
+ printk(KERN_CRIT "kernel BUG at %s:%d!\n", file, line);
+
+ machine_halt();
+}
+
+int bad_trap(int trap_num, struct pt_regs *regs)
+{
+ printk(KERN_CRIT
+ "unimplemented trap %d called at 0x%08lx, pid %d!\n",
+ trap_num, regs->pc, current->pid);
+ return -ENOSYS;
+}
+
+int debug_trap(struct pt_regs *regs)
+{
+ int i;
+ printk(KERN_CRIT "debug trap\n");
+ for (i = 0; i < 32; i++) {
+ /* printk("r%i:%08X\t",i,regs->gpr[i]); */
+ if ((i % 4) == 3)
+ printk(KERN_CRIT "\n");
+ }
+ printk(KERN_CRIT "pc:%08lX\tmsr:%08lX\n", regs->pc, regs->msr);
+ return -ENOSYS;
+}
+#endif
--
1.5.5.1
next prev parent reply other threads:[~2009-05-27 7:31 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-05-27 6:47 Microblaze MMU v2 Michal Simek
2009-05-27 6:47 ` [PATCH 01/29] microblaze_mmu_v2: Add mmu_defconfig Michal Simek
2009-05-27 6:47 ` [PATCH 02/29] microblaze_mmu_v2: MMU update for startup code Michal Simek
2009-05-27 6:47 ` [PATCH 03/29] microblaze_mmu_v2: Alocate TLB for early console Michal Simek
2009-05-27 6:47 ` [PATCH 04/29] microblaze_mmu_v2: TLB low level code Michal Simek
2009-05-27 6:47 ` [PATCH 05/29] microblaze_mmu_v2: MMU initialization Michal Simek
2009-05-27 6:47 ` [PATCH 06/29] microblaze_mmu_v2: mmu.h update Michal Simek
2009-05-27 6:47 ` [PATCH 07/29] microblaze_mmu_v2: Page fault handling high level - fault.c Michal Simek
2009-05-27 6:47 ` [PATCH 08/29] microblaze_mmu_v2: Context handling - mmu_context.c/h Michal Simek
2009-05-27 6:47 ` [PATCH 09/29] microblaze_mmu_v2: Page table - ioremap - pgtable.c/h, section update Michal Simek
2009-05-27 6:47 ` [PATCH 10/29] microblaze_mmu_v2: io.h MMU update Michal Simek
2009-05-27 6:47 ` [PATCH 11/29] microblaze_mmu_v2: pgalloc.h and page.h Michal Simek
2009-05-27 6:47 ` [PATCH 12/29] microblaze_mmu_v2: Update process creation for MMU Michal Simek
2009-05-27 6:47 ` [PATCH 13/29] microblaze_mmu_v2: Update tlb.h and tlbflush.h Michal Simek
2009-05-27 6:47 ` [PATCH 14/29] microblaze_mmu_v2: MMU asm offset update Michal Simek
2009-05-27 6:47 ` [PATCH 15/29] microblaze_mmu_v2: Add CURRENT_TASK for entry.S Michal Simek
2009-05-27 6:47 ` [PATCH 16/29] microblaze_mmu_v2: entry.S, entry.h Michal Simek
2009-05-27 6:47 ` [PATCH 17/29] microblaze_mmu_v2: Update exception handling - MMU exception Michal Simek
2009-05-27 6:47 ` [PATCH 18/29] microblaze_mmu_v2: uaccess MMU update Michal Simek
2009-05-27 6:47 ` [PATCH 19/29] microblaze_mmu_v2: Add MMU related exceptions handling Michal Simek
2009-05-27 6:47 ` [PATCH 20/29] microblaze_mmu_v2: Update linker script for MMU Michal Simek
2009-05-27 6:47 ` [PATCH 21/29] microblaze_mmu_v2: Enable fork syscall for MMU and add fork as vfork for noMMU Michal Simek
2009-05-27 6:47 ` Michal Simek [this message]
2009-05-27 6:47 ` [PATCH 23/29] microblaze_mmu_v2: Update signal returning address Michal Simek
2009-05-27 6:47 ` [PATCH 24/29] microblaze_mmu_v2: Update cacheflush.h Michal Simek
2009-05-27 6:47 ` [PATCH 25/29] microblaze_mmu_v2: Update dma.h for MMU Michal Simek
2009-05-27 6:47 ` [PATCH 26/29] microblaze_mmu_v2: Elf update Michal Simek
2009-05-27 6:47 ` [PATCH 27/29] microblaze_mmu_v2: stat.h MMU update Michal Simek
2009-05-27 6:47 ` [PATCH 28/29] microblaze_mmu_v2: Kconfig update Michal Simek
2009-05-27 6:47 ` [PATCH 29/29] microblaze_mmu_v2: Makefiles Michal Simek
2009-05-27 11:08 ` [PATCH 08/29] microblaze_mmu_v2: Context handling - mmu_context.c/h Arnd Bergmann
2009-05-27 11:59 ` Michal Simek
2009-05-29 14:39 ` [microblaze-uclinux] Microblaze MMU v2 John Linn
2009-06-11 8:46 ` John Williams
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=1243406874-3917-23-git-send-email-monstr@monstr.eu \
--to=monstr@monstr.eu \
--cc=john.williams@petalogix.com \
--cc=linux-kernel@vger.kernel.org \
--cc=michal.simek@petalogix.com \
--cc=microblaze-uclinux@itee.uq.edu.au \
/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
all inboxes | Powered by JetHome®