mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-06 10:57:46 +00:00
ARM: LPAE: Move the FSR definitions to separate files
The FSR structure is different with LPAE and this patch moves the classic MMU specific definition to a separate fsr-2level.c file that is included in fault.c. It also moves the fsr_fs and FSR bits to the fault.h file. Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
This commit is contained in:
parent
e0c0313bd7
commit
136848d4ca
3 changed files with 100 additions and 93 deletions
|
@ -27,19 +27,6 @@
|
||||||
|
|
||||||
#include "fault.h"
|
#include "fault.h"
|
||||||
|
|
||||||
/*
|
|
||||||
* Fault status register encodings. We steal bit 31 for our own purposes.
|
|
||||||
*/
|
|
||||||
#define FSR_LNX_PF (1 << 31)
|
|
||||||
#define FSR_WRITE (1 << 11)
|
|
||||||
#define FSR_FS4 (1 << 10)
|
|
||||||
#define FSR_FS3_0 (15)
|
|
||||||
|
|
||||||
static inline int fsr_fs(unsigned int fsr)
|
|
||||||
{
|
|
||||||
return (fsr & FSR_FS3_0) | (fsr & FSR_FS4) >> 6;
|
|
||||||
}
|
|
||||||
|
|
||||||
#ifdef CONFIG_MMU
|
#ifdef CONFIG_MMU
|
||||||
|
|
||||||
#ifdef CONFIG_KPROBES
|
#ifdef CONFIG_KPROBES
|
||||||
|
@ -489,55 +476,16 @@ do_bad(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct fsr_info {
|
struct fsr_info {
|
||||||
int (*fn)(unsigned long addr, unsigned int fsr, struct pt_regs *regs);
|
int (*fn)(unsigned long addr, unsigned int fsr, struct pt_regs *regs);
|
||||||
int sig;
|
int sig;
|
||||||
int code;
|
int code;
|
||||||
const char *name;
|
const char *name;
|
||||||
} fsr_info[] = {
|
|
||||||
/*
|
|
||||||
* The following are the standard ARMv3 and ARMv4 aborts. ARMv5
|
|
||||||
* defines these to be "precise" aborts.
|
|
||||||
*/
|
|
||||||
{ do_bad, SIGSEGV, 0, "vector exception" },
|
|
||||||
{ do_bad, SIGBUS, BUS_ADRALN, "alignment exception" },
|
|
||||||
{ do_bad, SIGKILL, 0, "terminal exception" },
|
|
||||||
{ do_bad, SIGBUS, BUS_ADRALN, "alignment exception" },
|
|
||||||
{ do_bad, SIGBUS, 0, "external abort on linefetch" },
|
|
||||||
{ do_translation_fault, SIGSEGV, SEGV_MAPERR, "section translation fault" },
|
|
||||||
{ do_bad, SIGBUS, 0, "external abort on linefetch" },
|
|
||||||
{ do_page_fault, SIGSEGV, SEGV_MAPERR, "page translation fault" },
|
|
||||||
{ do_bad, SIGBUS, 0, "external abort on non-linefetch" },
|
|
||||||
{ do_bad, SIGSEGV, SEGV_ACCERR, "section domain fault" },
|
|
||||||
{ do_bad, SIGBUS, 0, "external abort on non-linefetch" },
|
|
||||||
{ do_bad, SIGSEGV, SEGV_ACCERR, "page domain fault" },
|
|
||||||
{ do_bad, SIGBUS, 0, "external abort on translation" },
|
|
||||||
{ do_sect_fault, SIGSEGV, SEGV_ACCERR, "section permission fault" },
|
|
||||||
{ do_bad, SIGBUS, 0, "external abort on translation" },
|
|
||||||
{ do_page_fault, SIGSEGV, SEGV_ACCERR, "page permission fault" },
|
|
||||||
/*
|
|
||||||
* The following are "imprecise" aborts, which are signalled by bit
|
|
||||||
* 10 of the FSR, and may not be recoverable. These are only
|
|
||||||
* supported if the CPU abort handler supports bit 10.
|
|
||||||
*/
|
|
||||||
{ do_bad, SIGBUS, 0, "unknown 16" },
|
|
||||||
{ do_bad, SIGBUS, 0, "unknown 17" },
|
|
||||||
{ do_bad, SIGBUS, 0, "unknown 18" },
|
|
||||||
{ do_bad, SIGBUS, 0, "unknown 19" },
|
|
||||||
{ do_bad, SIGBUS, 0, "lock abort" }, /* xscale */
|
|
||||||
{ do_bad, SIGBUS, 0, "unknown 21" },
|
|
||||||
{ do_bad, SIGBUS, BUS_OBJERR, "imprecise external abort" }, /* xscale */
|
|
||||||
{ do_bad, SIGBUS, 0, "unknown 23" },
|
|
||||||
{ do_bad, SIGBUS, 0, "dcache parity error" }, /* xscale */
|
|
||||||
{ do_bad, SIGBUS, 0, "unknown 25" },
|
|
||||||
{ do_bad, SIGBUS, 0, "unknown 26" },
|
|
||||||
{ do_bad, SIGBUS, 0, "unknown 27" },
|
|
||||||
{ do_bad, SIGBUS, 0, "unknown 28" },
|
|
||||||
{ do_bad, SIGBUS, 0, "unknown 29" },
|
|
||||||
{ do_bad, SIGBUS, 0, "unknown 30" },
|
|
||||||
{ do_bad, SIGBUS, 0, "unknown 31" }
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/* FSR definition */
|
||||||
|
#include "fsr-2level.c"
|
||||||
|
|
||||||
void __init
|
void __init
|
||||||
hook_fault_code(int nr, int (*fn)(unsigned long, unsigned int, struct pt_regs *),
|
hook_fault_code(int nr, int (*fn)(unsigned long, unsigned int, struct pt_regs *),
|
||||||
int sig, int code, const char *name)
|
int sig, int code, const char *name)
|
||||||
|
@ -573,42 +521,6 @@ do_DataAbort(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
|
||||||
arm_notify_die("", regs, &info, fsr, 0);
|
arm_notify_die("", regs, &info, fsr, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static struct fsr_info ifsr_info[] = {
|
|
||||||
{ do_bad, SIGBUS, 0, "unknown 0" },
|
|
||||||
{ do_bad, SIGBUS, 0, "unknown 1" },
|
|
||||||
{ do_bad, SIGBUS, 0, "debug event" },
|
|
||||||
{ do_bad, SIGSEGV, SEGV_ACCERR, "section access flag fault" },
|
|
||||||
{ do_bad, SIGBUS, 0, "unknown 4" },
|
|
||||||
{ do_translation_fault, SIGSEGV, SEGV_MAPERR, "section translation fault" },
|
|
||||||
{ do_bad, SIGSEGV, SEGV_ACCERR, "page access flag fault" },
|
|
||||||
{ do_page_fault, SIGSEGV, SEGV_MAPERR, "page translation fault" },
|
|
||||||
{ do_bad, SIGBUS, 0, "external abort on non-linefetch" },
|
|
||||||
{ do_bad, SIGSEGV, SEGV_ACCERR, "section domain fault" },
|
|
||||||
{ do_bad, SIGBUS, 0, "unknown 10" },
|
|
||||||
{ do_bad, SIGSEGV, SEGV_ACCERR, "page domain fault" },
|
|
||||||
{ do_bad, SIGBUS, 0, "external abort on translation" },
|
|
||||||
{ do_sect_fault, SIGSEGV, SEGV_ACCERR, "section permission fault" },
|
|
||||||
{ do_bad, SIGBUS, 0, "external abort on translation" },
|
|
||||||
{ do_page_fault, SIGSEGV, SEGV_ACCERR, "page permission fault" },
|
|
||||||
{ do_bad, SIGBUS, 0, "unknown 16" },
|
|
||||||
{ do_bad, SIGBUS, 0, "unknown 17" },
|
|
||||||
{ do_bad, SIGBUS, 0, "unknown 18" },
|
|
||||||
{ do_bad, SIGBUS, 0, "unknown 19" },
|
|
||||||
{ do_bad, SIGBUS, 0, "unknown 20" },
|
|
||||||
{ do_bad, SIGBUS, 0, "unknown 21" },
|
|
||||||
{ do_bad, SIGBUS, 0, "unknown 22" },
|
|
||||||
{ do_bad, SIGBUS, 0, "unknown 23" },
|
|
||||||
{ do_bad, SIGBUS, 0, "unknown 24" },
|
|
||||||
{ do_bad, SIGBUS, 0, "unknown 25" },
|
|
||||||
{ do_bad, SIGBUS, 0, "unknown 26" },
|
|
||||||
{ do_bad, SIGBUS, 0, "unknown 27" },
|
|
||||||
{ do_bad, SIGBUS, 0, "unknown 28" },
|
|
||||||
{ do_bad, SIGBUS, 0, "unknown 29" },
|
|
||||||
{ do_bad, SIGBUS, 0, "unknown 30" },
|
|
||||||
{ do_bad, SIGBUS, 0, "unknown 31" },
|
|
||||||
};
|
|
||||||
|
|
||||||
void __init
|
void __init
|
||||||
hook_ifault_code(int nr, int (*fn)(unsigned long, unsigned int, struct pt_regs *),
|
hook_ifault_code(int nr, int (*fn)(unsigned long, unsigned int, struct pt_regs *),
|
||||||
int sig, int code, const char *name)
|
int sig, int code, const char *name)
|
||||||
|
|
|
@ -1,3 +1,20 @@
|
||||||
void do_bad_area(unsigned long addr, unsigned int fsr, struct pt_regs *regs);
|
#ifndef __ARCH_ARM_FAULT_H
|
||||||
|
#define __ARCH_ARM_FAULT_H
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Fault status register encodings. We steal bit 31 for our own purposes.
|
||||||
|
*/
|
||||||
|
#define FSR_LNX_PF (1 << 31)
|
||||||
|
#define FSR_WRITE (1 << 11)
|
||||||
|
#define FSR_FS4 (1 << 10)
|
||||||
|
#define FSR_FS3_0 (15)
|
||||||
|
|
||||||
|
static inline int fsr_fs(unsigned int fsr)
|
||||||
|
{
|
||||||
|
return (fsr & FSR_FS3_0) | (fsr & FSR_FS4) >> 6;
|
||||||
|
}
|
||||||
|
|
||||||
|
void do_bad_area(unsigned long addr, unsigned int fsr, struct pt_regs *regs);
|
||||||
unsigned long search_exception_table(unsigned long addr);
|
unsigned long search_exception_table(unsigned long addr);
|
||||||
|
|
||||||
|
#endif /* __ARCH_ARM_FAULT_H */
|
||||||
|
|
78
arch/arm/mm/fsr-2level.c
Normal file
78
arch/arm/mm/fsr-2level.c
Normal file
|
@ -0,0 +1,78 @@
|
||||||
|
static struct fsr_info fsr_info[] = {
|
||||||
|
/*
|
||||||
|
* The following are the standard ARMv3 and ARMv4 aborts. ARMv5
|
||||||
|
* defines these to be "precise" aborts.
|
||||||
|
*/
|
||||||
|
{ do_bad, SIGSEGV, 0, "vector exception" },
|
||||||
|
{ do_bad, SIGBUS, BUS_ADRALN, "alignment exception" },
|
||||||
|
{ do_bad, SIGKILL, 0, "terminal exception" },
|
||||||
|
{ do_bad, SIGBUS, BUS_ADRALN, "alignment exception" },
|
||||||
|
{ do_bad, SIGBUS, 0, "external abort on linefetch" },
|
||||||
|
{ do_translation_fault, SIGSEGV, SEGV_MAPERR, "section translation fault" },
|
||||||
|
{ do_bad, SIGBUS, 0, "external abort on linefetch" },
|
||||||
|
{ do_page_fault, SIGSEGV, SEGV_MAPERR, "page translation fault" },
|
||||||
|
{ do_bad, SIGBUS, 0, "external abort on non-linefetch" },
|
||||||
|
{ do_bad, SIGSEGV, SEGV_ACCERR, "section domain fault" },
|
||||||
|
{ do_bad, SIGBUS, 0, "external abort on non-linefetch" },
|
||||||
|
{ do_bad, SIGSEGV, SEGV_ACCERR, "page domain fault" },
|
||||||
|
{ do_bad, SIGBUS, 0, "external abort on translation" },
|
||||||
|
{ do_sect_fault, SIGSEGV, SEGV_ACCERR, "section permission fault" },
|
||||||
|
{ do_bad, SIGBUS, 0, "external abort on translation" },
|
||||||
|
{ do_page_fault, SIGSEGV, SEGV_ACCERR, "page permission fault" },
|
||||||
|
/*
|
||||||
|
* The following are "imprecise" aborts, which are signalled by bit
|
||||||
|
* 10 of the FSR, and may not be recoverable. These are only
|
||||||
|
* supported if the CPU abort handler supports bit 10.
|
||||||
|
*/
|
||||||
|
{ do_bad, SIGBUS, 0, "unknown 16" },
|
||||||
|
{ do_bad, SIGBUS, 0, "unknown 17" },
|
||||||
|
{ do_bad, SIGBUS, 0, "unknown 18" },
|
||||||
|
{ do_bad, SIGBUS, 0, "unknown 19" },
|
||||||
|
{ do_bad, SIGBUS, 0, "lock abort" }, /* xscale */
|
||||||
|
{ do_bad, SIGBUS, 0, "unknown 21" },
|
||||||
|
{ do_bad, SIGBUS, BUS_OBJERR, "imprecise external abort" }, /* xscale */
|
||||||
|
{ do_bad, SIGBUS, 0, "unknown 23" },
|
||||||
|
{ do_bad, SIGBUS, 0, "dcache parity error" }, /* xscale */
|
||||||
|
{ do_bad, SIGBUS, 0, "unknown 25" },
|
||||||
|
{ do_bad, SIGBUS, 0, "unknown 26" },
|
||||||
|
{ do_bad, SIGBUS, 0, "unknown 27" },
|
||||||
|
{ do_bad, SIGBUS, 0, "unknown 28" },
|
||||||
|
{ do_bad, SIGBUS, 0, "unknown 29" },
|
||||||
|
{ do_bad, SIGBUS, 0, "unknown 30" },
|
||||||
|
{ do_bad, SIGBUS, 0, "unknown 31" },
|
||||||
|
};
|
||||||
|
|
||||||
|
static struct fsr_info ifsr_info[] = {
|
||||||
|
{ do_bad, SIGBUS, 0, "unknown 0" },
|
||||||
|
{ do_bad, SIGBUS, 0, "unknown 1" },
|
||||||
|
{ do_bad, SIGBUS, 0, "debug event" },
|
||||||
|
{ do_bad, SIGSEGV, SEGV_ACCERR, "section access flag fault" },
|
||||||
|
{ do_bad, SIGBUS, 0, "unknown 4" },
|
||||||
|
{ do_translation_fault, SIGSEGV, SEGV_MAPERR, "section translation fault" },
|
||||||
|
{ do_bad, SIGSEGV, SEGV_ACCERR, "page access flag fault" },
|
||||||
|
{ do_page_fault, SIGSEGV, SEGV_MAPERR, "page translation fault" },
|
||||||
|
{ do_bad, SIGBUS, 0, "external abort on non-linefetch" },
|
||||||
|
{ do_bad, SIGSEGV, SEGV_ACCERR, "section domain fault" },
|
||||||
|
{ do_bad, SIGBUS, 0, "unknown 10" },
|
||||||
|
{ do_bad, SIGSEGV, SEGV_ACCERR, "page domain fault" },
|
||||||
|
{ do_bad, SIGBUS, 0, "external abort on translation" },
|
||||||
|
{ do_sect_fault, SIGSEGV, SEGV_ACCERR, "section permission fault" },
|
||||||
|
{ do_bad, SIGBUS, 0, "external abort on translation" },
|
||||||
|
{ do_page_fault, SIGSEGV, SEGV_ACCERR, "page permission fault" },
|
||||||
|
{ do_bad, SIGBUS, 0, "unknown 16" },
|
||||||
|
{ do_bad, SIGBUS, 0, "unknown 17" },
|
||||||
|
{ do_bad, SIGBUS, 0, "unknown 18" },
|
||||||
|
{ do_bad, SIGBUS, 0, "unknown 19" },
|
||||||
|
{ do_bad, SIGBUS, 0, "unknown 20" },
|
||||||
|
{ do_bad, SIGBUS, 0, "unknown 21" },
|
||||||
|
{ do_bad, SIGBUS, 0, "unknown 22" },
|
||||||
|
{ do_bad, SIGBUS, 0, "unknown 23" },
|
||||||
|
{ do_bad, SIGBUS, 0, "unknown 24" },
|
||||||
|
{ do_bad, SIGBUS, 0, "unknown 25" },
|
||||||
|
{ do_bad, SIGBUS, 0, "unknown 26" },
|
||||||
|
{ do_bad, SIGBUS, 0, "unknown 27" },
|
||||||
|
{ do_bad, SIGBUS, 0, "unknown 28" },
|
||||||
|
{ do_bad, SIGBUS, 0, "unknown 29" },
|
||||||
|
{ do_bad, SIGBUS, 0, "unknown 30" },
|
||||||
|
{ do_bad, SIGBUS, 0, "unknown 31" },
|
||||||
|
};
|
Loading…
Reference in a new issue