Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d7f5499d authored by James Hogan's avatar James Hogan Committed by Ralf Baechle
Browse files

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: default avatarJames 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: default avatarRalf Baechle <ralf@linux-mips.org>
parent d1ce483e

arch/mips/lib/dump_tlb.c

+8 −8
Original line number Diff line number Diff line
@@ -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");

arch/mips/lib/r3k_dump_tlb.c

+4 −4
Original line number Diff line number Diff line
@@ -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");