Changeset e600ec4 in mainline

Timestamp:

2006-06-18T12:01:50Z (19 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

beec330

Parents:

fbf7b4c

Message:

verbose segment and BAT registers printout

Location:

arch/ppc32

Files:

• include/asm/regname.h (modified) (2 diffs)
• src/mm/memory_init.c (modified) (1 diff)
• src/mm/tlb.c (modified) (2 diffs)

arch/ppc32/include/asm/regname.h

@@ -27 +27 @@
  */
 
- /** @addtogroup ppc32  
+/** @addtogroup ppc32   
  * @{
  */
@@ -228 +228 @@
 #endif
 
- /** @}
- */
-
+/** @}
+ */

arch/ppc32/src/mm/memory_init.c

@@ -50 +50 @@
         
         for (i = 0; i < bootinfo.memmap.count; i++)
-                printf("base: %#x size: %#x\n", bootinfo.memmap.zones[i].start, bootinfo.memmap.zones[i].size);
+                printf("base: %.*p size: %#x\n", sizeof(bootinfo.memmap.zones[i].start) * 2, bootinfo.memmap.zones[i].start, bootinfo.memmap.zones[i].size);
 }
 

arch/ppc32/src/mm/tlb.c

@@ -376 +376 @@
 
 
+#define PRINT_BAT(name, ureg, lreg) \
+        asm volatile ( \
+                "mfspr %0," #ureg "\n" \
+                "mfspr %1," #lreg "\n" \
+                : "=r" (upper), "=r" (lower) \
+        ); \
+        mask = (upper & 0x1ffc) >> 2; \
+        if (upper & 3) { \
+                __u32 tmp = mask; \
+                length = 128; \
+                while (tmp) { \
+                        if ((tmp & 1) == 0) { \
+                                printf("ibat[0]: error in mask\n"); \
+                                break; \
+                        } \
+                        length <<= 1; \
+                        tmp >>= 1; \
+                } \
+        } else \
+                length = 0; \
+        printf(name ": page=%.*p frame=%.*p length=%d KB (mask=%#x)%s%s\n", sizeof(upper) * 2, upper & 0xffff0000, sizeof(lower) * 2, lower & 0xffff0000, length, mask, ((upper >> 1) & 1) ? " supervisor" : "", (upper & 1) ? " user" : "");
+
+
 void tlb_print(void)
 {
@@ -387 +410 @@
                         : "r" (sr << 28)
                 );
-                printf("vsid[%#x]=%#x\n", sr << 28, vsid);
-        }
+                printf("vsid[%d]: VSID=%.*p (ASID=%d)%s%s\n", sr, sizeof(vsid) * 2, vsid & 0xffffff, (vsid & 0xffffff) >> 4, ((vsid >> 30) & 1) ? " supervisor" : "", ((vsid >> 29) & 1) ? " user" : "");
+        }
+        
+        __u32 upper;
+        __u32 lower;
+        __u32 mask;
+        __u32 length;
+        
+        PRINT_BAT("ibat[0]", 528, 529);
+        PRINT_BAT("ibat[1]", 530, 531);
+        PRINT_BAT("ibat[2]", 532, 533);
+        PRINT_BAT("ibat[3]", 534, 535);
+        
+        PRINT_BAT("dbat[0]", 536, 537);
+        PRINT_BAT("dbat[1]", 538, 539);
+        PRINT_BAT("dbat[2]", 540, 541);
+        PRINT_BAT("dbat[3]", 542, 543);
 }