MIPS: dump_tlb: Make use of EntryLo bit definitions

Make use of recently added EntryLo bit definitions in mipsregs.h when
dumping TLB contents.

Signed-off-by: James Hogan <james.hogan@imgtec.com>
Cc: Maciej W. Rozycki <macro@linux-mips.org>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/10075/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

diff --git a/arch/mips/lib/dump_tlb.c b/arch/mips/lib/dump_tlb.c
index 17d05caa776dc1eba9cafb75532ace907fdce967..f02cc554d72005c5ea30823f9200a3f11d3f4a0c 100644 (file)
--- a/arch/mips/lib/dump_tlb.c
+++ b/arch/mips/lib/dump_tlb.c
@@ -81,8 +81,8 @@ static void dump_tlb(int first, int last)
                 */
                printk("Index: %2d pgmask=%s ", i, msk2str(pagemask));
 
-               c0 = (entrylo0 >> 3) & 7;
-               c1 = (entrylo1 >> 3) & 7;
+               c0 = (entrylo0 & MIPS_ENTRYLO_C) >> MIPS_ENTRYLO_C_SHIFT;
+               c1 = (entrylo1 & MIPS_ENTRYLO_C) >> MIPS_ENTRYLO_C_SHIFT;
 
                printk("va=%0*lx asid=%02lx\n",
                       width, (entryhi & ~0x1fffUL),
@@ -90,15 +90,15 @@ static void dump_tlb(int first, int last)
                printk("\t[pa=%0*llx c=%d d=%d v=%d g=%d] ",
                       width,
                       (entrylo0 << 6) & PAGE_MASK, c0,
-                      (entrylo0 & 4) ? 1 : 0,
-                      (entrylo0 & 2) ? 1 : 0,
-                      (entrylo0 & 1) ? 1 : 0);
+                      (entrylo0 & MIPS_ENTRYLO_D) ? 1 : 0,
+                      (entrylo0 & MIPS_ENTRYLO_V) ? 1 : 0,
+                      (entrylo0 & MIPS_ENTRYLO_G) ? 1 : 0);
                printk("[pa=%0*llx c=%d d=%d v=%d g=%d]\n",
                       width,
                       (entrylo1 << 6) & PAGE_MASK, c1,
-                      (entrylo1 & 4) ? 1 : 0,
-                      (entrylo1 & 2) ? 1 : 0,
-                      (entrylo1 & 1) ? 1 : 0);
+                      (entrylo1 & MIPS_ENTRYLO_D) ? 1 : 0,
+                      (entrylo1 & MIPS_ENTRYLO_V) ? 1 : 0,
+                      (entrylo1 & MIPS_ENTRYLO_G) ? 1 : 0);
        }
        printk("\n");
 

diff --git a/arch/mips/lib/r3k_dump_tlb.c b/arch/mips/lib/r3k_dump_tlb.c
index 975a1385511617b2507aab6fb8f53a87faa7c6e2..e210f04b2bc30e8891ed433cc22d83c34f56c8c6 100644 (file)
--- a/arch/mips/lib/r3k_dump_tlb.c
+++ b/arch/mips/lib/r3k_dump_tlb.c
@@ -47,10 +47,10 @@ static void dump_tlb(int first, int last)
                               entryhi & PAGE_MASK,
                               entryhi & ASID_MASK,
                               entrylo0 & PAGE_MASK,
-                              (entrylo0 & (1 << 11)) ? 1 : 0,
-                              (entrylo0 & (1 << 10)) ? 1 : 0,
-                              (entrylo0 & (1 << 9)) ? 1 : 0,
-                              (entrylo0 & (1 << 8)) ? 1 : 0);
+                              (entrylo0 & R3K_ENTRYLO_N) ? 1 : 0,
+                              (entrylo0 & R3K_ENTRYLO_D) ? 1 : 0,
+                              (entrylo0 & R3K_ENTRYLO_V) ? 1 : 0,
+                              (entrylo0 & R3K_ENTRYLO_G) ? 1 : 0);
                }
        }
        printk("\n");