Changeset 850235d in mainline for kernel/arch/sparc64/src/mm/sun4u/tlb.c

Timestamp:

2013-03-10T14:56:21Z (11 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

05bab88

Parents:

ea906c29 (diff), 2277e03 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

File:

• kernel/arch/sparc64/src/mm/sun4u/tlb.c (modified) (6 diffs)

kernel/arch/sparc64/src/mm/sun4u/tlb.c

@@ -58 +58 @@
 static void dtlb_pte_copy(pte_t *, size_t, bool);
 static void itlb_pte_copy(pte_t *, size_t);
-static void do_fast_instruction_access_mmu_miss_fault(istate_t *, uintptr_t,
-    const char *);
-static void do_fast_data_access_mmu_miss_fault(istate_t *, tlb_tag_access_reg_t,
-    const char *);
-static void do_fast_data_access_protection_fault(istate_t *,
-    tlb_tag_access_reg_t, const char *);
 
 const char *context_encoding[] = {
@@ -222 +216 @@
                  * handler.
                  */
-                if (as_page_fault(page_16k, PF_ACCESS_EXEC, istate) ==
-                    AS_PF_FAULT) {
-                        do_fast_instruction_access_mmu_miss_fault(istate,
-                            istate->tpc, __func__);
-                }
+                as_page_fault(page_16k, PF_ACCESS_EXEC, istate);
         }
 }
@@ -256 +246 @@
                 if (!tag.vpn) {
                         /* NULL access in kernel */
-                        do_fast_data_access_mmu_miss_fault(istate, tag,
-                            "Dereferencing NULL pointer.");
+                        panic("NULL pointer dereference.");
                 } else if (page_8k >= end_of_identity) {
                         /* Kernel non-identity. */
                         as = AS_KERNEL;
                 } else {
-                        do_fast_data_access_mmu_miss_fault(istate, tag,
-                    "Unexpected kernel page fault.");
+                        panic("Unexpected kernel page fault.");
                 }
         }
@@ -283 +271 @@
                  * handler.
                  */
-                if (as_page_fault(page_16k, PF_ACCESS_READ, istate) ==
-                    AS_PF_FAULT) {
-                        do_fast_data_access_mmu_miss_fault(istate, tag,
-                            __func__);
-                }
+                as_page_fault(page_16k, PF_ACCESS_READ, istate);
         }
 }
@@ -332 +316 @@
                  * handler.
                  */             
-                if (as_page_fault(page_16k, PF_ACCESS_WRITE, istate) ==
-                    AS_PF_FAULT) {
-                        do_fast_data_access_protection_fault(istate, tag,
-                            __func__);
-                }
+                as_page_fault(page_16k, PF_ACCESS_WRITE, istate);
         }
 }
@@ -428 +408 @@
 
 #endif
-
-void do_fast_instruction_access_mmu_miss_fault(istate_t *istate,
-    uintptr_t va, const char *str)
-{
-        fault_if_from_uspace(istate, "%s, address=%p.", str, (void *) va);
-        panic_memtrap(istate, PF_ACCESS_EXEC, va, str);
-}
-
-void do_fast_data_access_mmu_miss_fault(istate_t *istate,
-    tlb_tag_access_reg_t tag, const char *str)
-{
-        uintptr_t va;
-
-        va = tag.vpn << MMU_PAGE_WIDTH;
-        fault_if_from_uspace(istate, "%s, page=%p (asid=%u).", str,
-            (void *) va, tag.context);
-        panic_memtrap(istate, PF_ACCESS_UNKNOWN, va, str);
-}
-
-void do_fast_data_access_protection_fault(istate_t *istate,
-    tlb_tag_access_reg_t tag, const char *str)
-{
-        uintptr_t va;
-
-        va = tag.vpn << MMU_PAGE_WIDTH;
-        fault_if_from_uspace(istate, "%s, page=%p (asid=%u).", str,
-            (void *) va, tag.context);
-        panic_memtrap(istate, PF_ACCESS_WRITE, va, str);
-}
 
 void describe_dmmu_fault(void)