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

Commit bf4aac07 authored by Maciej W. Rozycki's avatar Maciej W. Rozycki Committed by Ralf Baechle
Browse files

MIPS: c-r4k: Avoid duplicate CPU_74K/CPU_1074K checks 



Code in a switch statement in probe_pcache checks the CPU type twice
unnecessarily for processor implementations that have the alias removal
feature reported by the CP0 Config7.AR and Config7.IAR bits.  This change
rewrites the affected fragment avoiding the extraneous check and improving
readability.

Signed-off-by: default avatarMaciej W. Rozycki <macro@linux-mips.org>
Cc: Steven J. Hill <Steven.Hill@imgtec.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/7221/


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

arch/mips/mm/c-r4k.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -1230,19 +1230,19 @@ static void probe_pcache(void) 
	case CPU_R14000:

	case CPU_R14000:

		break;

		break;





	case CPU_74K:

	case CPU_1074K:

		alias_74k_erratum(c);

		/* Fall through. */

	case CPU_M14KC:

	case CPU_M14KC:

	case CPU_M14KEC:

	case CPU_M14KEC:

	case CPU_24K:

	case CPU_24K:

	case CPU_34K:

	case CPU_34K:

	case CPU_74K:

	case CPU_1004K:

	case CPU_1004K:

	case CPU_1074K:

	case CPU_INTERAPTIV:

	case CPU_INTERAPTIV:

	case CPU_P5600:

	case CPU_P5600:

	case CPU_PROAPTIV:

	case CPU_PROAPTIV:

	case CPU_M5150:

	case CPU_M5150:

		if ((c->cputype == CPU_74K) || (c->cputype == CPU_1074K))

			alias_74k_erratum(c);

		if (!(read_c0_config7() & MIPS_CONF7_IAR) &&

		if (!(read_c0_config7() & MIPS_CONF7_IAR) &&

		    (c->icache.waysize > PAGE_SIZE))

		    (c->icache.waysize > PAGE_SIZE))

			c->icache.flags |= MIPS_CACHE_ALIASES;

			c->icache.flags |= MIPS_CACHE_ALIASES;