These changes are the raw update to linux-4.4.6-rt14. Kernel sources
[kvmfornfv.git] / kernel / arch / mips / lib / dump_tlb.c
index 32b9f21..92a3731 100644 (file)
@@ -7,11 +7,39 @@
 #include <linux/kernel.h>
 #include <linux/mm.h>
 
+#include <asm/hazards.h>
 #include <asm/mipsregs.h>
 #include <asm/page.h>
 #include <asm/pgtable.h>
 #include <asm/tlbdebug.h>
 
+void dump_tlb_regs(void)
+{
+       const int field = 2 * sizeof(unsigned long);
+
+       pr_info("Index    : %0x\n", read_c0_index());
+       pr_info("PageMask : %0x\n", read_c0_pagemask());
+       pr_info("EntryHi  : %0*lx\n", field, read_c0_entryhi());
+       pr_info("EntryLo0 : %0*lx\n", field, read_c0_entrylo0());
+       pr_info("EntryLo1 : %0*lx\n", field, read_c0_entrylo1());
+       pr_info("Wired    : %0x\n", read_c0_wired());
+       switch (current_cpu_type()) {
+       case CPU_R10000:
+       case CPU_R12000:
+       case CPU_R14000:
+       case CPU_R16000:
+               pr_info("FrameMask: %0x\n", read_c0_framemask());
+               break;
+       }
+       if (cpu_has_small_pages || cpu_has_rixi || cpu_has_xpa)
+               pr_info("PageGrain: %0x\n", read_c0_pagegrain());
+       if (cpu_has_htw) {
+               pr_info("PWField  : %0*lx\n", field, read_c0_pwfield());
+               pr_info("PWSize   : %0*lx\n", field, read_c0_pwsize());
+               pr_info("PWCtl    : %0x\n", read_c0_pwctl());
+       }
+}
+
 static inline const char *msk2str(unsigned int mask)
 {
        switch (mask) {
@@ -40,17 +68,20 @@ static inline const char *msk2str(unsigned int mask)
        return "";
 }
 
-#define BARRIER()                                      \
-       __asm__ __volatile__(                           \
-               ".set\tnoreorder\n\t"                   \
-               "nop;nop;nop;nop;nop;nop;nop\n\t"       \
-               ".set\treorder");
-
 static void dump_tlb(int first, int last)
 {
        unsigned long s_entryhi, entryhi, asid;
-       unsigned long long entrylo0, entrylo1;
+       unsigned long long entrylo0, entrylo1, pa;
        unsigned int s_index, s_pagemask, pagemask, c0, c1, i;
+#ifdef CONFIG_32BIT
+       bool xpa = cpu_has_xpa && (read_c0_pagegrain() & PG_ELPA);
+       int pwidth = xpa ? 11 : 8;
+       int vwidth = 8;
+#else
+       bool xpa = false;
+       int pwidth = 11;
+       int vwidth = 11;
+#endif
 
        s_pagemask = read_c0_pagemask();
        s_entryhi = read_c0_entryhi();
@@ -59,46 +90,74 @@ static void dump_tlb(int first, int last)
 
        for (i = first; i <= last; i++) {
                write_c0_index(i);
-               BARRIER();
+               mtc0_tlbr_hazard();
                tlb_read();
-               BARRIER();
+               tlb_read_hazard();
                pagemask = read_c0_pagemask();
                entryhi  = read_c0_entryhi();
                entrylo0 = read_c0_entrylo0();
                entrylo1 = read_c0_entrylo1();
 
-               /* Unused entries have a virtual address of CKSEG0.  */
-               if ((entryhi & ~0x1ffffUL) != CKSEG0
-                   && (entryhi & 0xff) == asid) {
-#ifdef CONFIG_32BIT
-                       int width = 8;
-#else
-                       int width = 11;
-#endif
-                       /*
-                        * Only print entries in use
-                        */
-                       printk("Index: %2d pgmask=%s ", i, msk2str(pagemask));
+               /* EHINV bit marks entire entry as invalid */
+               if (cpu_has_tlbinv && entryhi & MIPS_ENTRYHI_EHINV)
+                       continue;
+               /*
+                * Prior to tlbinv, unused entries have a virtual address of
+                * CKSEG0.
+                */
+               if ((entryhi & ~0x1ffffUL) == CKSEG0)
+                       continue;
+               /*
+                * ASID takes effect in absence of G (global) bit.
+                * We check both G bits, even though architecturally they should
+                * match one another, because some revisions of the SB1 core may
+                * leave only a single G bit set after a machine check exception
+                * due to duplicate TLB entry.
+                */
+               if (!((entrylo0 | entrylo1) & ENTRYLO_G) &&
+                   (entryhi & 0xff) != asid)
+                       continue;
+
+               /*
+                * Only print entries in use
+                */
+               printk("Index: %2d pgmask=%s ", i, msk2str(pagemask));
 
-                       c0 = (entrylo0 >> 3) & 7;
-                       c1 = (entrylo1 >> 3) & 7;
+               c0 = (entrylo0 & ENTRYLO_C) >> ENTRYLO_C_SHIFT;
+               c1 = (entrylo1 & ENTRYLO_C) >> ENTRYLO_C_SHIFT;
 
-                       printk("va=%0*lx asid=%02lx\n",
-                              width, (entryhi & ~0x1fffUL),
-                              entryhi & 0xff);
-                       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);
-                       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);
-               }
+               printk("va=%0*lx asid=%02lx\n",
+                      vwidth, (entryhi & ~0x1fffUL),
+                      entryhi & 0xff);
+               /* RI/XI are in awkward places, so mask them off separately */
+               pa = entrylo0 & ~(MIPS_ENTRYLO_RI | MIPS_ENTRYLO_XI);
+               if (xpa)
+                       pa |= (unsigned long long)readx_c0_entrylo0() << 30;
+               pa = (pa << 6) & PAGE_MASK;
+               printk("\t[");
+               if (cpu_has_rixi)
+                       printk("ri=%d xi=%d ",
+                              (entrylo0 & MIPS_ENTRYLO_RI) ? 1 : 0,
+                              (entrylo0 & MIPS_ENTRYLO_XI) ? 1 : 0);
+               printk("pa=%0*llx c=%d d=%d v=%d g=%d] [",
+                      pwidth, pa, c0,
+                      (entrylo0 & ENTRYLO_D) ? 1 : 0,
+                      (entrylo0 & ENTRYLO_V) ? 1 : 0,
+                      (entrylo0 & ENTRYLO_G) ? 1 : 0);
+               /* RI/XI are in awkward places, so mask them off separately */
+               pa = entrylo1 & ~(MIPS_ENTRYLO_RI | MIPS_ENTRYLO_XI);
+               if (xpa)
+                       pa |= (unsigned long long)readx_c0_entrylo1() << 30;
+               pa = (pa << 6) & PAGE_MASK;
+               if (cpu_has_rixi)
+                       printk("ri=%d xi=%d ",
+                              (entrylo1 & MIPS_ENTRYLO_RI) ? 1 : 0,
+                              (entrylo1 & MIPS_ENTRYLO_XI) ? 1 : 0);
+               printk("pa=%0*llx c=%d d=%d v=%d g=%d]\n",
+                      pwidth, pa, c1,
+                      (entrylo1 & ENTRYLO_D) ? 1 : 0,
+                      (entrylo1 & ENTRYLO_V) ? 1 : 0,
+                      (entrylo1 & ENTRYLO_G) ? 1 : 0);
        }
        printk("\n");