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

Commit 30577391 authored by Joshua Kinard's avatar Joshua Kinard Committed by Ralf Baechle
Browse files

MIPS: Add R16000 detection 



This allows the kernel to correctly detect an R16000 MIPS CPU on systems that
have those.  Otherwise, such systems will detect the CPU as an R14000, due to
similarities in the CPU PRId value.

Signed-off-by: default avatarJoshua Kinard <kumba@gentoo.org>
Cc: Linux MIPS List <linux-mips@linux-mips.org>
Patchwork: https://patchwork.linux-mips.org/patch/9092/


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

arch/mips/include/asm/cpu-type.h

+1 −0
Original line number Diff line number Diff line
@@ -157,6 +157,7 @@ static inline int __pure __get_cpu_type(const int cpu_type) 
	case CPU_R10000:

	case CPU_R12000:

	case CPU_R14000:

	case CPU_R16000:

#endif

#ifdef CONFIG_SYS_HAS_CPU_RM7000

	case CPU_RM7000:

arch/mips/include/asm/cpu.h

+3 −3
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ 
#define PRID_IMP_R4300		0x0b00

#define PRID_IMP_VR41XX		0x0c00

#define PRID_IMP_R12000		0x0e00

#define PRID_IMP_R14000		0x0f00

#define PRID_IMP_R14000		0x0f00		/* R14K && R16K */

#define PRID_IMP_R8000		0x1000

#define PRID_IMP_PR4450		0x1200

#define PRID_IMP_R4600		0x2000
@@ -284,8 +284,8 @@ enum cpu_type_enum { 
	CPU_R4000PC, CPU_R4000SC, CPU_R4000MC, CPU_R4200, CPU_R4300, CPU_R4310,

	CPU_R4400PC, CPU_R4400SC, CPU_R4400MC, CPU_R4600, CPU_R4640, CPU_R4650,

	CPU_R4700, CPU_R5000, CPU_R5500, CPU_NEVADA, CPU_R5432, CPU_R10000,

	CPU_R12000, CPU_R14000, CPU_VR41XX, CPU_VR4111, CPU_VR4121, CPU_VR4122,

	CPU_VR4131, CPU_VR4133, CPU_VR4181, CPU_VR4181A, CPU_RM7000,

	CPU_R12000, CPU_R14000, CPU_R16000, CPU_VR41XX, CPU_VR4111, CPU_VR4121,

	CPU_VR4122, CPU_VR4131, CPU_VR4133, CPU_VR4181, CPU_VR4181A, CPU_RM7000,

	CPU_SR71000, CPU_TX49XX,



	/*

arch/mips/kernel/cpu-probe.c

+7 −2
Original line number Diff line number Diff line
@@ -852,8 +852,13 @@ static inline void cpu_probe_legacy(struct cpuinfo_mips *c, unsigned int cpu) 
		c->tlbsize = 64;

		break;

	case PRID_IMP_R14000:

		if (((c->processor_id >> 4) & 0x0f) > 2) {

			c->cputype = CPU_R16000;

			__cpu_name[cpu] = "R16000";

		} else {

			c->cputype = CPU_R14000;

			__cpu_name[cpu] = "R14000";

		}

		set_isa(c, MIPS_CPU_ISA_IV);

		c->options = MIPS_CPU_TLB | MIPS_CPU_4K_CACHE | MIPS_CPU_4KEX |

			     MIPS_CPU_FPU | MIPS_CPU_32FPR |

arch/mips/kernel/perf_event_mipsxx.c

+1 −0
Original line number Diff line number Diff line
@@ -777,6 +777,7 @@ static int n_counters(void) 


	case CPU_R12000:

	case CPU_R14000:

	case CPU_R16000:

		counters = 4;

		break;

arch/mips/mm/c-r4k.c

+7 −3
Original line number Diff line number Diff line
@@ -430,6 +430,7 @@ static inline void local_r4k___flush_cache_all(void * args) 
	case CPU_R10000:

	case CPU_R12000:

	case CPU_R14000:

	case CPU_R16000:

		/*

		 * These caches are inclusive caches, that is, if something

		 * is not cached in the S-cache, we know it also won't be
@@ -506,7 +507,7 @@ static inline void local_r4k_flush_cache_mm(void * args) 


	/*

	 * Kludge alert.  For obscure reasons R4000SC and R4400SC go nuts if we

	 * only flush the primary caches but R10000 and R12000 behave sane ...

	 * only flush the primary caches but R1x000 behave sane ...

	 * R4000SC and R4400SC indexed S-cache ops also invalidate primary

	 * caches, so we can bail out early.

	 */
@@ -1012,6 +1013,7 @@ static void probe_pcache(void) 
	case CPU_R10000:

	case CPU_R12000:

	case CPU_R14000:

	case CPU_R16000:

		icache_size = 1 << (12 + ((config & R10K_CONF_IC) >> 29));

		c->icache.linesz = 64;

		c->icache.ways = 2;
@@ -1223,8 +1225,8 @@ static void probe_pcache(void) 
		dcache_size / (c->dcache.linesz * c->dcache.ways) : 0;



	/*

	 * R10000 and R12000 P-caches are odd in a positive way.  They're 32kB

	 * 2-way virtually indexed so normally would suffer from aliases.  So

	 * R1x000 P-caches are odd in a positive way.  They're 32kB 2-way

	 * virtually indexed so normally would suffer from aliases.  So

	 * normally they'd suffer from aliases but magic in the hardware deals

	 * with that for us so we don't need to take care ourselves.

	 */
@@ -1240,6 +1242,7 @@ static void probe_pcache(void) 
	case CPU_R10000:

	case CPU_R12000:

	case CPU_R14000:

	case CPU_R16000:

		break;



	case CPU_74K:
@@ -1438,6 +1441,7 @@ static void setup_scache(void) 
	case CPU_R10000:

	case CPU_R12000:

	case CPU_R14000:

	case CPU_R16000:

		scache_size = 0x80000 << ((config & R10K_CONF_SS) >> 16);

		c->scache.linesz = 64 << ((config >> 13) & 1);

		c->scache.ways = 2;