2 files changed, 11 insertions, 8 deletions

diff --git a/arch/mips/lib/dump_tlb.c b/arch/mips/lib/dump_tlb.c
index 92a37319efbe..3283aa7423e4 100644
--- a/arch/mips/lib/dump_tlb.c
+++ b/arch/mips/lib/dump_tlb.c
@@ -73,6 +73,8 @@ static void dump_tlb(int first, int last)
         unsigned long s_entryhi, entryhi, asid;
         unsigned long long entrylo0, entrylo1, pa;
         unsigned int s_index, s_pagemask, pagemask, c0, c1, i;
+        unsigned long asidmask = cpu_asid_mask(&current_cpu_data);
+        int asidwidth = DIV_ROUND_UP(ilog2(asidmask) + 1, 4);
 #ifdef CONFIG_32BIT
         bool xpa = cpu_has_xpa && (read_c0_pagegrain() & PG_ELPA);
         int pwidth = xpa ? 11 : 8;
@@ -86,7 +88,7 @@ static void dump_tlb(int first, int last)
         s_pagemask = read_c0_pagemask();
         s_entryhi = read_c0_entryhi();
         s_index = read_c0_index();
-        asid = s_entryhi & 0xff;
+        asid = s_entryhi & asidmask;
 
         for (i = first; i <= last; i++) {
                 write_c0_index(i);
@@ -115,7 +117,7 @@ static void dump_tlb(int first, int last)
                  * due to duplicate TLB entry.
                  */
                 if (!((entrylo0 | entrylo1) & ENTRYLO_G) &&
-                    (entryhi & 0xff) != asid)
+                    (entryhi & asidmask) != asid)
                         continue;
 
                 /*
@@ -126,9 +128,9 @@ static void dump_tlb(int first, int last)
                 c0 = (entrylo0 & ENTRYLO_C) >> ENTRYLO_C_SHIFT;
                 c1 = (entrylo1 & ENTRYLO_C) >> ENTRYLO_C_SHIFT;
 
-                printk("va=%0*lx asid=%02lx\n",
+                printk("va=%0*lx asid=%0*lx\n",
                        vwidth, (entryhi & ~0x1fffUL),
-                       entryhi & 0xff);
+                       asidwidth, entryhi & asidmask);
                 /* RI/XI are in awkward places, so mask them off separately */
                 pa = entrylo0 & ~(MIPS_ENTRYLO_RI | MIPS_ENTRYLO_XI);
                 if (xpa)
diff --git a/arch/mips/lib/r3k_dump_tlb.c b/arch/mips/lib/r3k_dump_tlb.c
index cfcbb5218b59..744f4a7bc49d 100644
--- a/arch/mips/lib/r3k_dump_tlb.c
+++ b/arch/mips/lib/r3k_dump_tlb.c
@@ -29,9 +29,10 @@ static void dump_tlb(int first, int last)
 {
         int     i;
         unsigned int asid;
-        unsigned long entryhi, entrylo0;
+        unsigned long entryhi, entrylo0, asid_mask;
 
-        asid = read_c0_entryhi() & ASID_MASK;
+        asid_mask = cpu_asid_mask(&current_cpu_data);
+        asid = read_c0_entryhi() & asid_mask;
 
         for (i = first; i <= last; i++) {
                 write_c0_index(i<<8);
@@ -46,7 +47,7 @@ static void dump_tlb(int first, int last)
                 /* Unused entries have a virtual address of KSEG0.  */
                 if ((entryhi & PAGE_MASK) != KSEG0 &&
                     (entrylo0 & R3K_ENTRYLO_G ||
-                     (entryhi & ASID_MASK) == asid)) {
+                     (entryhi & asid_mask) == asid)) {
                         /*
                          * Only print entries in use
                          */
@@ -55,7 +56,7 @@ static void dump_tlb(int first, int last)
                         printk("va=%08lx asid=%08lx"
                                "  [pa=%06lx n=%d d=%d v=%d g=%d]",
                                entryhi & PAGE_MASK,
-                               entryhi & ASID_MASK,
+                               entryhi & asid_mask,
                                entrylo0 & PAGE_MASK,
                                (entrylo0 & R3K_ENTRYLO_N) ? 1 : 0,
                                (entrylo0 & R3K_ENTRYLO_D) ? 1 : 0,