diff options
| author | Kirill A. Shutemov | 2010-07-26 12:20:41 +0200 |
|---|---|---|
| committer | Russell King | 2010-07-27 11:48:41 +0200 |
| commit | b8ab5397bcbd92e3fd4a9770e0bf59315fa38dab (patch) | |
| tree | 4def9ea84d54ce112c91e906e10fb8756151327c /arch/arm/mm/alignment.c | |
| parent | ARM: 6256/1: Check arch version and modify fsr_info[] depends on it at runtime (diff) | |
| download | kernel-qcow2-linux-b8ab5397bcbd92e3fd4a9770e0bf59315fa38dab.tar.gz kernel-qcow2-linux-b8ab5397bcbd92e3fd4a9770e0bf59315fa38dab.tar.xz kernel-qcow2-linux-b8ab5397bcbd92e3fd4a9770e0bf59315fa38dab.zip | |
ARM: 6268/1: ARMv6K and ARMv7 use fault statuses 3 and 6 as Access Flag fault
Statuses 3 (0b00011) and 6 (0x00110) of DFSR are Access Flags faults on
ARMv6K and ARMv7. Let's patch fsr_info[] at runtime if we are on ARMv7
or later.
Unfortunately, we don't have runtime check for 'K' extension, so we
can't check for it.
Signed-off-by: Kirill A. Shutemov <kirill@shutemov.name>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mm/alignment.c')
| -rw-r--r-- | arch/arm/mm/alignment.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/arch/arm/mm/alignment.c b/arch/arm/mm/alignment.c index 77cfdbed9501..d073b64ae87e 100644 --- a/arch/arm/mm/alignment.c +++ b/arch/arm/mm/alignment.c @@ -926,8 +926,18 @@ static int __init alignment_init(void) hook_fault_code(1, do_alignment, SIGBUS, BUS_ADRALN, "alignment exception"); - hook_fault_code(3, do_alignment, SIGBUS, BUS_ADRALN, - "alignment exception"); + + /* + * ARMv6K and ARMv7 use fault status 3 (0b00011) as Access Flag section + * fault, not as alignment error. + * + * TODO: handle ARMv6K properly. Runtime check for 'K' extension is + * needed. + */ + if (cpu_architecture() <= CPU_ARCH_ARMv6) { + hook_fault_code(3, do_alignment, SIGBUS, BUS_ADRALN, + "alignment exception"); + } return 0; } |