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

Commit 859aeb1b authored by Paul Burton's avatar Paul Burton Committed by Ralf Baechle
Browse files

MIPS: Probe the I6500 CPU 



Introduce the I6500 PRID & probe it just the same way as I6400. The MIPS
I6500 is the latest in Imagination Technologies' I-Class range of CPUs,
with a focus on scalability & heterogeneity. It introduces the notion of
multiple clusters to the MIPS Coherent Processing System, allowing for a
far higher total number of cores & threads in a system when compared
with its predecessors. Clusters don't need to be identical, and may
contain differing numbers of cores & IOCUs, or cores with differing
properties.

This patch alone adds the basic support for booting Linux on an I6500
CPU without support for any of its new functionality, for which support
will be introduced in further patches.

Signed-off-by: default avatarPaul Burton <paul.burton@imgtec.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/16190/


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

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

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


#ifdef CONFIG_SYS_HAS_CPU_MIPS64_R6

	case CPU_I6400:

	case CPU_I6500:

	case CPU_P6600:

#endif

arch/mips/include/asm/cpu.h

+2 −1
Original line number Diff line number Diff line
@@ -124,6 +124,7 @@ 
#define PRID_IMP_P5600		0xa800

#define PRID_IMP_I6400		0xa900

#define PRID_IMP_M6250		0xab00

#define PRID_IMP_I6500		0xb000



/*

 * These are the PRID's for when 23:16 == PRID_COMP_SIBYTE
@@ -322,7 +323,7 @@ enum cpu_type_enum { 
	 */

	CPU_5KC, CPU_5KE, CPU_20KC, CPU_25KF, CPU_SB1, CPU_SB1A, CPU_LOONGSON2,

	CPU_LOONGSON3, CPU_CAVIUM_OCTEON, CPU_CAVIUM_OCTEON_PLUS,

	CPU_CAVIUM_OCTEON2, CPU_CAVIUM_OCTEON3, CPU_XLR, CPU_XLP,

	CPU_CAVIUM_OCTEON2, CPU_CAVIUM_OCTEON3, CPU_XLR, CPU_XLP, CPU_I6500,



	CPU_QEMU_GENERIC,

arch/mips/kernel/cpu-probe.c

+5 −0
Original line number Diff line number Diff line
@@ -564,6 +564,7 @@ static int set_ftlb_enable(struct cpuinfo_mips *c, enum ftlb_flags flags) 
		back_to_back_c0_hazard();

		break;

	case CPU_I6400:

	case CPU_I6500:

		/* There's no way to disable the FTLB */

		if (!(flags & FTLB_EN))

			return 1;
@@ -1635,6 +1636,10 @@ static inline void cpu_probe_mips(struct cpuinfo_mips *c, unsigned int cpu) 
		c->cputype = CPU_I6400;

		__cpu_name[cpu] = "MIPS I6400";

		break;

	case PRID_IMP_I6500:

		c->cputype = CPU_I6500;

		__cpu_name[cpu] = "MIPS I6500";

		break;

	case PRID_IMP_M5150:

		c->cputype = CPU_M5150;

		__cpu_name[cpu] = "MIPS M5150";

arch/mips/mm/c-r4k.c

+2 −0
Original line number Diff line number Diff line
@@ -1453,6 +1453,7 @@ static void probe_pcache(void) 
	case CPU_20KC:

	case CPU_25KF:

	case CPU_I6400:

	case CPU_I6500:

	case CPU_SB1:

	case CPU_SB1A:

	case CPU_XLR:
@@ -1512,6 +1513,7 @@ static void probe_pcache(void) 


	case CPU_ALCHEMY:

	case CPU_I6400:

	case CPU_I6500:

		c->icache.flags |= MIPS_CACHE_IC_F_DC;

		break;