Changeset 371bd7d in mainline for kernel/arch/sparc64/src/mm

Timestamp:

2010-03-27T09:22:17Z (16 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

36a75a2

Parents:

cd82bb1 (diff), eaf22d4 (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.

Location:

kernel/arch/sparc64/src/mm

Files:

• page.c (modified) (1 diff)
• sun4u/as.c (moved) (moved from kernel/arch/sparc64/src/mm/as.c )
• sun4u/frame.c (moved) (moved from kernel/arch/sparc64/src/mm/frame.c ) (1 diff)
• sun4u/tlb.c (moved) (moved from kernel/arch/sparc64/src/mm/tlb.c ) (5 diffs)
• sun4u/tsb.c (moved) (moved from kernel/arch/sparc64/src/mm/tsb.c ) (1 diff)
• sun4v/as.c (added)
• sun4v/frame.c (added)
• sun4v/tlb.c (added)
• sun4v/tsb.c (added)

kernel/arch/sparc64/src/mm/page.c

@@ -33 +33 @@
  */
 
+#include <mm/page.h>
 #include <arch/mm/page.h>
 #include <arch/mm/tlb.h>

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

@@ -36 +36 @@
 #include <mm/frame.h>
 #include <arch/boot/boot.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <config.h>
 #include <align.h>

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

@@ -44 +44 @@
 #include <arch.h>
 #include <print.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <config.h>
 #include <arch/trap/trap.h>
@@ -50 +50 @@
 #include <panic.h>
 #include <arch/asm.h>
+#include <genarch/mm/page_ht.h>
 
 #ifdef CONFIG_TSB
@@ -63 +64 @@
     tlb_tag_access_reg_t, const char *);
 
-char *context_encoding[] = {
+const char *context_encoding[] = {
         "Primary",
         "Secondary",
@@ -475 +476 @@
 }
 
-void dump_sfsr_and_sfar(void)
+void describe_dmmu_fault(void)
 {
         tlb_sfsr_reg_t sfsr;
@@ -498 +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. */

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

@@ -38 +38 @@
 #include <arch/barrier.h>
 #include <mm/as.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <macros.h>
 #include <debug.h>