aboutsummaryrefslogtreecommitdiff
path: root/arch/sh/mm
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2012-05-14 17:46:49 +0900
committerPaul Mundt <lethal@linux-sh.org>2012-05-14 17:46:49 +0900
commitfd37e75ed56e3f9ddde15c57a9cbde8256221404 (patch)
tree6ae537e09c4cfd8f73e2f34d403b7a3a081c60fc /arch/sh/mm
parent392c3822a6fc247c0708c9e52c0818d1fbc9d7d7 (diff)
sh64: Set additional fault code values.
The SSR.MD status amongst other things are already made available, which can be used for encoding a more precise fault code value. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/mm')
-rw-r--r--arch/sh/mm/tlbex_64.c20
1 files changed, 19 insertions, 1 deletions
diff --git a/arch/sh/mm/tlbex_64.c b/arch/sh/mm/tlbex_64.c
index 24dd4ab33de..8557548fc53 100644
--- a/arch/sh/mm/tlbex_64.c
+++ b/arch/sh/mm/tlbex_64.c
@@ -108,6 +108,17 @@ static struct expevt_lookup expevt_lookup_table = {
.is_text_access = {1, 1, 0, 0, 0, 0, 0, 0}
};
+static inline unsigned int
+expevt_to_fault_code(unsigned long expevt)
+{
+ if (expevt == 0xa40)
+ return FAULT_CODE_ITLB;
+ else if (expevt == 0x060)
+ return FAULT_CODE_WRITE;
+
+ return 0;
+}
+
/*
This routine handles page faults that can be serviced just by refilling a
TLB entry from an existing page table entry. (This case represents a very
@@ -123,6 +134,7 @@ do_fast_page_fault(unsigned long long ssr_md, unsigned long long expevt,
unsigned long long protection_flags;
unsigned long long index;
unsigned long long expevt4;
+ unsigned int fault_code;
/* The next few lines implement a way of hashing EXPEVT into a
* small array index which can be used to lookup parameters
@@ -139,10 +151,16 @@ do_fast_page_fault(unsigned long long ssr_md, unsigned long long expevt,
index = expevt4 ^ (expevt4 >> 5);
index &= 7;
+ fault_code = expevt_to_fault_code(expevt);
+
protection_flags = expevt_lookup_table.protection_flags[index];
if (expevt_lookup_table.is_text_access[index])
- set_thread_fault_code(FAULT_CODE_ITLB);
+ fault_code |= FAULT_CODE_ITLB;
+ if (!ssr_md)
+ fault_code |= FAULT_CODE_USER;
+
+ set_thread_fault_code(fault_code);
return handle_tlbmiss(protection_flags, address);
}