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 19/29] microblaze_mmu_v2: Add MMU related exceptions handling
Date: Wed, 27 May 2009 08:47:44 +0200 [thread overview]
Message-ID: <1243406874-3917-20-git-send-email-monstr@monstr.eu> (raw)
In-Reply-To: <1243406874-3917-19-git-send-email-monstr@monstr.eu>
Signed-off-by: Michal Simek <monstr@monstr.eu>
---
arch/microblaze/kernel/exceptions.c | 45 ++++++++++++++++++++++++++++------
1 files changed, 37 insertions(+), 8 deletions(-)
diff --git a/arch/microblaze/kernel/exceptions.c b/arch/microblaze/kernel/exceptions.c
index 4a8a406..0cb64a3 100644
--- a/arch/microblaze/kernel/exceptions.c
+++ b/arch/microblaze/kernel/exceptions.c
@@ -21,9 +21,9 @@
#include <asm/exceptions.h>
#include <asm/entry.h> /* For KM CPU var */
-#include <asm/uaccess.h>
-#include <asm/errno.h>
-#include <asm/ptrace.h>
+#include <linux/uaccess.h>
+#include <linux/errno.h>
+#include <linux/ptrace.h>
#include <asm/current.h>
#define MICROBLAZE_ILL_OPCODE_EXCEPTION 0x02
@@ -31,7 +31,7 @@
#define MICROBLAZE_DBUS_EXCEPTION 0x04
#define MICROBLAZE_DIV_ZERO_EXCEPTION 0x05
#define MICROBLAZE_FPU_EXCEPTION 0x06
-#define MICROBLAZE_PRIVILEG_EXCEPTION 0x07
+#define MICROBLAZE_PRIVILEGED_EXCEPTION 0x07
static DEFINE_SPINLOCK(die_lock);
@@ -66,6 +66,11 @@ void _exception(int signr, struct pt_regs *regs, int code, unsigned long addr)
asmlinkage void full_exception(struct pt_regs *regs, unsigned int type,
int fsr, int addr)
{
+#ifdef CONFIG_MMU
+ int code;
+ addr = regs->pc;
+#endif
+
#if 0
printk(KERN_WARNING "Exception %02x in %s mode, FSR=%08x PC=%08x ESR=%08x\n",
type, user_mode(regs) ? "user" : "kernel", fsr,
@@ -74,7 +79,13 @@ asmlinkage void full_exception(struct pt_regs *regs, unsigned int type,
switch (type & 0x1F) {
case MICROBLAZE_ILL_OPCODE_EXCEPTION:
- _exception(SIGILL, regs, ILL_ILLOPC, addr);
+ if (user_mode(regs)) {
+ printk(KERN_WARNING "Illegal opcode exception in user mode.\n");
+ _exception(SIGILL, regs, ILL_ILLOPC, addr);
+ return;
+ }
+ printk(KERN_WARNING "Illegal opcode exception in kernel mode.\n");
+ die("opcode exception", regs, SIGBUS);
break;
case MICROBLAZE_IBUS_EXCEPTION:
if (user_mode(regs)) {
@@ -95,11 +106,16 @@ asmlinkage void full_exception(struct pt_regs *regs, unsigned int type,
die("bus exception", regs, SIGBUS);
break;
case MICROBLAZE_DIV_ZERO_EXCEPTION:
- printk(KERN_WARNING "Divide by zero exception\n");
- _exception(SIGILL, regs, ILL_ILLOPC, addr);
+ if (user_mode(regs)) {
+ printk(KERN_WARNING "Divide by zero exception in user mode\n");
+ _exception(SIGILL, regs, ILL_ILLOPC, addr);
+ return;
+ }
+ printk(KERN_WARNING "Divide by zero exception in kernel mode.\n");
+ die("Divide by exception", regs, SIGBUS);
break;
-
case MICROBLAZE_FPU_EXCEPTION:
+ printk(KERN_WARNING "FPU exception\n");
/* IEEE FP exception */
/* I removed fsr variable and use code var for storing fsr */
if (fsr & FSR_IO)
@@ -115,7 +131,20 @@ asmlinkage void full_exception(struct pt_regs *regs, unsigned int type,
_exception(SIGFPE, regs, fsr, addr);
break;
+#ifdef CONFIG_MMU
+ case MICROBLAZE_PRIVILEGED_EXCEPTION:
+ printk(KERN_WARNING "Privileged exception\n");
+ /* "brk r0,r0" - used as debug breakpoint */
+ if (get_user(code, (unsigned long *)regs->pc) == 0
+ && code == 0x980c0000) {
+ _exception(SIGTRAP, regs, TRAP_BRKPT, addr);
+ } else {
+ _exception(SIGILL, regs, ILL_PRVOPC, addr);
+ }
+ break;
+#endif
default:
+ /* FIXME what to do in unexpected exception */
printk(KERN_WARNING "Unexpected exception %02x "
"PC=%08x in %s mode\n", type, (unsigned int) addr,
kernel_mode(regs) ? "kernel" : "user");
--
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 ` Michal Simek [this message]
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 ` [PATCH 22/29] microblaze_mmu_v2: Traps MMU update Michal Simek
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-20-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®