Changeset 850235d in mainline for kernel/arch/sparc64/src/mm/sun4v/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/sun4v/tlb.c (modified) (6 diffs)

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

@@ -62 +62 @@
 static void itlb_pte_copy(pte_t *);
 static void dtlb_pte_copy(pte_t *, bool);
-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 *, uint64_t,
-    const char *);
-static void do_fast_data_access_protection_fault(istate_t *,
-    uint64_t, const char *);
 
 /*
@@ -235 +229 @@
                  * handler.
                  */
-                if (as_page_fault(va, PF_ACCESS_EXEC, istate) == AS_PF_FAULT) {
-                        do_fast_instruction_access_mmu_miss_fault(istate,
-                            istate->tpc, __func__);
-                }
+                as_page_fault(va, PF_ACCESS_EXEC, istate);
         }
 }
@@ -264 +255 @@
                 if (va == 0) {
                         /* NULL access in kernel */
-                        do_fast_data_access_mmu_miss_fault(istate, page_and_ctx,
-                            __func__);
+                        panic("NULL pointer dereference.");
                 }
-                do_fast_data_access_mmu_miss_fault(istate, page_and_ctx, "Unexpected "
-                    "kernel page fault.");
+                panic("Unexpected kernel page fault.");
         }
 
@@ -287 +276 @@
                  * handler.
                  */             
-                if (as_page_fault(va, PF_ACCESS_READ, istate) == AS_PF_FAULT) {
-                        do_fast_data_access_mmu_miss_fault(istate, page_and_ctx,
-                            __func__);
-                }
+                as_page_fault(va, PF_ACCESS_READ, istate);
         }
 }
@@ -329 +315 @@
                  * handler.
                  */             
-                if (as_page_fault(va, PF_ACCESS_WRITE, istate) == AS_PF_FAULT) {
-                        do_fast_data_access_protection_fault(istate, page_and_ctx,
-                            __func__);
-                }
+                as_page_fault(va, PF_ACCESS_WRITE, istate);
         }
 }
@@ -346 +329 @@
 }
 
-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,
-    uint64_t page_and_ctx, const char *str)
-{
-        fault_if_from_uspace(istate, "%s, page=%p (asid=%" PRId64 ").", str,
-            (void *) DMISS_ADDRESS(page_and_ctx), DMISS_CONTEXT(page_and_ctx));
-        panic_memtrap(istate, PF_ACCESS_UNKNOWN, DMISS_ADDRESS(page_and_ctx),
-            str);
-}
-
-void do_fast_data_access_protection_fault(istate_t *istate,
-    uint64_t page_and_ctx, const char *str)
-{
-        fault_if_from_uspace(istate, "%s, page=%p (asid=%" PRId64 ").", str,
-            (void *) DMISS_ADDRESS(page_and_ctx), DMISS_CONTEXT(page_and_ctx));
-        panic_memtrap(istate, PF_ACCESS_WRITE, DMISS_ADDRESS(page_and_ctx),
-            str);
-}
-
 /**
  * Describes the exact condition which caused the last DMMU fault.