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

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

MIPS: dump_tlb: Refactor TLB matching 



Refactor the TLB matching code in dump_tlb() slightly so that the
conditions which can cause a TLB entry to be skipped can be more easily
extended. This should prevent the match condition getting unwieldy once
it is updated to take further conditions into account.

Signed-off-by: default avatarJames Hogan <james.hogan@imgtec.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/10081/


Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 137877e4

arch/mips/lib/dump_tlb.c

+35 −30
Original line number Diff line number Diff line
@@ -46,6 +46,11 @@ static void dump_tlb(int first, int last) 
	unsigned long s_entryhi, entryhi, asid;

	unsigned long long entrylo0, entrylo1;

	unsigned int s_index, s_pagemask, pagemask, c0, c1, i;

#ifdef CONFIG_32BIT

	int width = 8;

#else

	int width = 11;

#endif



	s_pagemask = read_c0_pagemask();

	s_entryhi = read_c0_entryhi();
@@ -62,14 +67,15 @@ static void dump_tlb(int first, int last) 
		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

		/*

		 * Prior to tlbinv, unused entries have a virtual address of

		 * CKSEG0.

		 */

		if ((entryhi & ~0x1ffffUL) == CKSEG0)

			continue;

		if ((entryhi & 0xff) != asid)

			continue;



		/*

		 * Only print entries in use

		 */
@@ -94,7 +100,6 @@ static void dump_tlb(int first, int last) 
		       (entrylo1 & 2) ? 1 : 0,

		       (entrylo1 & 1) ? 1 : 0);

	}

	}

	printk("\n");



	write_c0_entryhi(s_entryhi);