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

Timestamp:

2010-03-07T15:11:56Z (14 years ago)

Author:

Lukas Mejdrech <lukasmejdrech@…>

Branches:

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

Children:

aadf01e

Parents:

2e99277 (diff), 137691a (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, revision 308

File:

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

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

@@ -64 +64 @@
     tlb_tag_access_reg_t, const char *);
 
-char *context_encoding[] = {
+const char *context_encoding[] = {
         "Primary",
         "Secondary",
@@ -476 +476 @@
 }
 
-void dump_sfsr_and_sfar(void)
+void describe_dmmu_fault(void)
 {
         tlb_sfsr_reg_t sfsr;
@@ -499 +499 @@
 }
 
+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);
+        
+        dtlb_sfsr_write(0);
+}
+
 #if defined (US)
 /** Invalidate all unlocked ITLB and DTLB entries. */