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

Commit 48269c78 authored May 19, 2015 by James Hogan Committed by Ralf Baechle Jun 21, 2015

MIPS: dump_tlb: Take global bit into account



The TLB only matches the ASID when the global bit isn't set, so
dump_tlb() shouldn't really be skipping global entries just because the
ASID doesn't match. Fix the condition to read the TLB entry's global bit
from EntryLo0. Note that after a TLB read the global bits in both
EntryLo registers reflect the same global bit in the TLB entry.

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/10079/


Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

parent d7f5499d

arch/mips/lib/dump_tlb.c

+9 −1

Original line number	Original line	Diff line number	Diff line
	@@ -73,7 +73,15 @@ static void dump_tlb(int first, int last)
	*/		*/
	if ((entryhi & ~0x1ffffUL) == CKSEG0)		if ((entryhi & ~0x1ffffUL) == CKSEG0)
	continue;		continue;
	if ((entryhi & 0xff) != asid)		/*
			* 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) & MIPS_ENTRYLO_G) &&
			(entryhi & 0xff) != asid)
	continue;		continue;

	/*		/*

arch/mips/lib/r3k_dump_tlb.c

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -35,8 +35,9 @@ static void dump_tlb(int first, int last)
	entrylo0 = read_c0_entrylo0();		entrylo0 = read_c0_entrylo0();

	/* Unused entries have a virtual address of KSEG0. */		/* Unused entries have a virtual address of KSEG0. */
	if ((entryhi & PAGE_MASK) != KSEG0		if ((entryhi & PAGE_MASK) != KSEG0 &&
	&& (entryhi & ASID_MASK) == asid) {		(entrylo0 & R3K_ENTRYLO_G \|\|
			(entryhi & ASID_MASK) == asid)) {
	/*		/*
	* Only print entries in use		* Only print entries in use
	*/		*/