Changes in kernel/arch/sparc64/src/mm/sun4u/tlb.c [c15b374:d99c1d2] in mainline

File:

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

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

@@ -27 +27 @@
  */
 
-/** @addtogroup sparc64mm
+/** @addtogroup sparc64mm       
  * @{
  */
@@ -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_instruction_access_mmu_miss_fault(istate_t *, const char *);
 static void do_fast_data_access_mmu_miss_fault(istate_t *, tlb_tag_access_reg_t,
     const char *);
@@ -223 +222 @@
                  * Forward the page fault to the address space page fault
                  * handler.
-                 */
+                 */             
                 page_table_unlock(AS, true);
                 if (as_page_fault(page_16k, PF_ACCESS_EXEC, istate) ==
                     AS_PF_FAULT) {
                         do_fast_instruction_access_mmu_miss_fault(istate,
-                            istate->tpc, __func__);
+                            __func__);
                 }
         }
@@ -259 +258 @@
                         /* NULL access in kernel */
                         do_fast_data_access_mmu_miss_fault(istate, tag,
-                            "Dereferencing NULL pointer.");
+                            __func__);
                 } else if (page_8k >= end_of_identity) {
                         /*
@@ -439 +438 @@
 
 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, va);
-        panic_memtrap(istate, PF_ACCESS_EXEC, va, str);
+    const char *str)
+{
+        fault_if_from_uspace(istate, "%s.", str);
+        dump_istate(istate);
+        panic("%s.", str);
 }
 
@@ -451 +451 @@
 
         va = tag.vpn << MMU_PAGE_WIDTH;
-        fault_if_from_uspace(istate, "%s, Page=%p (ASID=%d).", str, va,
-            tag.context);
-        panic_memtrap(istate, PF_ACCESS_UNKNOWN, va, str);
+        if (tag.context) {
+                fault_if_from_uspace(istate, "%s, Page=%p (ASID=%d).", str, va,
+                    tag.context);
+        }
+        dump_istate(istate);
+        printf("Faulting page: %p, ASID=%d.\n", va, tag.context);
+        panic("%s.", str);
 }
 
@@ -462 +466 @@
 
         va = tag.vpn << MMU_PAGE_WIDTH;
-        fault_if_from_uspace(istate, "%s, Page=%p (ASID=%d).", str, va,
-            tag.context);
-        panic_memtrap(istate, PF_ACCESS_WRITE, va, str);
+
+        if (tag.context) {
+                fault_if_from_uspace(istate, "%s, Page=%p (ASID=%d).", str, va,
+                    tag.context);
+        }
+        printf("Faulting page: %p, ASID=%d\n", va, tag.context);
+        dump_istate(istate);
+        panic("%s.", str);
 }