Changeset 46c20c8 in mainline for kernel/arch/sparc64/src/mm/sun4u/tlb.c

Timestamp:

2010-11-26T20:08:10Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

45df59a

Parents:

fb150d78 (diff), ffdd2b9 (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 (moved) (moved from kernel/arch/sparc64/src/mm/tlb.c ) (13 diffs)

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

@@ -27 +27 @@
  */
 
-/** @addtogroup sparc64mm       
+/** @addtogroup sparc64mm
  * @{
  */
@@ -37 +37 @@
 #include <mm/as.h>
 #include <mm/asid.h>
-#include <genarch/mm/page_ht.h>
 #include <arch/mm/frame.h>
 #include <arch/mm/page.h>
@@ -45 +44 @@
 #include <arch.h>
 #include <print.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <config.h>
 #include <arch/trap/trap.h>
@@ -51 +50 @@
 #include <panic.h>
 #include <arch/asm.h>
+#include <genarch/mm/page_ht.h>
 
 #ifdef CONFIG_TSB
@@ -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 *, const char *);
+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 *);
@@ -64 +65 @@
     tlb_tag_access_reg_t, const char *);
 
-char *context_encoding[] = {
+const char *context_encoding[] = {
         "Primary",
         "Secondary",
@@ -222 +223 @@
                  * 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,
-                            __func__);
+                            istate->tpc, __func__);
                 }
         }
@@ -258 +259 @@
                         /* NULL access in kernel */
                         do_fast_data_access_mmu_miss_fault(istate, tag,
-                            __func__);
+                            "Dereferencing NULL pointer.");
                 } else if (page_8k >= end_of_identity) {
                         /*
@@ -359 +360 @@
 static void print_tlb_entry(int i, tlb_tag_read_reg_t t, tlb_data_t d)
 {
-        printf("%d: vpn=%#llx, context=%d, v=%d, size=%d, nfo=%d, "
-            "ie=%d, soft2=%#x, pfn=%#x, soft=%#x, l=%d, "
-            "cp=%d, cv=%d, e=%d, p=%d, w=%d, g=%d\n", i, t.vpn,
+        printf("%u: vpn=%#" PRIx64 ", context=%u, v=%u, size=%u, nfo=%u, "
+            "ie=%u, soft2=%#x, pfn=%#x, soft=%#x, l=%u, "
+            "cp=%u, cv=%u, e=%u, p=%u, w=%u, g=%u\n", i, (uint64_t) t.vpn,
             t.context, d.v, d.size, d.nfo, d.ie, d.soft2,
             d.pfn, d.soft, d.l, d.cp, d.cv, d.e, d.p, d.w, d.g);
@@ -438 +439 @@
 
 void do_fast_instruction_access_mmu_miss_fault(istate_t *istate,
-    const char *str)
-{
-        fault_if_from_uspace(istate, "%s.", str);
-        dump_istate(istate);
-        panic("%s.", str);
+    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);
 }
 
@@ -451 +451 @@
 
         va = tag.vpn << MMU_PAGE_WIDTH;
-        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);
+        fault_if_from_uspace(istate, "%s, page=%p (asid=%u).", str,
+            (void *) va, tag.context);
+        panic_memtrap(istate, PF_ACCESS_UNKNOWN, va, str);
 }
 
@@ -466 +462 @@
 
         va = tag.vpn << MMU_PAGE_WIDTH;
-
-        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);
-}
-
-void dump_sfsr_and_sfar(void)
+        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)
 {
         tlb_sfsr_reg_t sfsr;
@@ -493 +484 @@
             sfsr.e, sfsr.ct, sfsr.pr, sfsr.w, sfsr.ow, sfsr.fv);
 #endif
+        
+        printf("DTLB SFAR: address=%p\n", (void *) sfar);
+        
+        dtlb_sfsr_write(0);
+}
+
+void dump_sfsr_and_sfar(void)
+{
+        tlb_sfsr_reg_t sfsr;
+        uintptr_t sfar;
+
+        sfsr.value = dtlb_sfsr_read();
+        sfar = dtlb_sfar_read();
+        
+#if defined (US)
+        printf("DTLB SFSR: asi=%#x, ft=%#x, e=%d, ct=%d, pr=%d, w=%d, ow=%d, "
+            "fv=%d\n", sfsr.asi, sfsr.ft, sfsr.e, sfsr.ct, sfsr.pr, sfsr.w,
+            sfsr.ow, sfsr.fv);
+#elif defined (US3)
+        printf("DTLB SFSR: nf=%d, asi=%#x, tm=%d, ft=%#x, e=%d, ct=%d, pr=%d, "
+            "w=%d, ow=%d, fv=%d\n", sfsr.nf, sfsr.asi, sfsr.tm, sfsr.ft,
+            sfsr.e, sfsr.ct, sfsr.pr, sfsr.w, sfsr.ow, sfsr.fv);
+#endif
             
-        printf("DTLB SFAR: address=%p\n", sfar);
+        printf("DTLB SFAR: address=%p\n", (void *) sfar);
         
         dtlb_sfsr_write(0);