Commit ea29103d authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Linus Torvalds

[PATCH] m68k: bus error handling

M68k: Allow to catch a bus error via the exception mechanism (from Roman
Zippel)
Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent bd992e78
...@@ -329,7 +329,8 @@ static inline void access_error060 (struct frame *fp) ...@@ -329,7 +329,8 @@ static inline void access_error060 (struct frame *fp)
* fault during mem_read/mem_write in ifpsp060/os.S * fault during mem_read/mem_write in ifpsp060/os.S
*/ */
send_fault_sig(&fp->ptregs); send_fault_sig(&fp->ptregs);
} else { } else if (!(fslw & (MMU060_RE|MMU060_WE)) ||
send_fault_sig(&fp->ptregs) > 0) {
printk("pc=%#lx, fa=%#lx\n", fp->ptregs.pc, fp->un.fmt4.effaddr); printk("pc=%#lx, fa=%#lx\n", fp->ptregs.pc, fp->un.fmt4.effaddr);
printk( "68060 access error, fslw=%lx\n", fslw ); printk( "68060 access error, fslw=%lx\n", fslw );
trap_c( fp ); trap_c( fp );
...@@ -517,7 +518,7 @@ static inline void access_error040(struct frame *fp) ...@@ -517,7 +518,7 @@ static inline void access_error040(struct frame *fp)
if (fp->un.fmt7.wb2a == fp->un.fmt7.faddr) if (fp->un.fmt7.wb2a == fp->un.fmt7.faddr)
fp->un.fmt7.wb2s &= ~WBV_040; fp->un.fmt7.wb2s &= ~WBV_040;
} }
} else { } else if (send_fault_sig(&fp->ptregs) > 0) {
printk("68040 access error, ssw=%x\n", ssw); printk("68040 access error, ssw=%x\n", ssw);
trap_c(fp); trap_c(fp);
} }
...@@ -732,7 +733,7 @@ static inline void bus_error030 (struct frame *fp) ...@@ -732,7 +733,7 @@ static inline void bus_error030 (struct frame *fp)
return; return;
} else if (!(mmusr & MMU_I)) { } else if (!(mmusr & MMU_I)) {
/* probably a 020 cas fault */ /* probably a 020 cas fault */
if (!(ssw & RM)) if (!(ssw & RM) && send_fault_sig(&fp->ptregs) > 0)
printk("unexpected bus error (%#x,%#x)\n", ssw, mmusr); printk("unexpected bus error (%#x,%#x)\n", ssw, mmusr);
} else if (mmusr & (MMU_B|MMU_L|MMU_S)) { } else if (mmusr & (MMU_B|MMU_L|MMU_S)) {
printk("invalid %s access at %#lx from pc %#lx\n", printk("invalid %s access at %#lx from pc %#lx\n",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment