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

Commit 0e56b385 authored by David Daney's avatar David Daney Committed by Ralf Baechle
Browse files

MIPS: Octeon: Probe for Octeon II CPUs. 



The OCTEON II ISA extends the original OCTEON ISA, so give it its own
__elf_platform string so optimized libraries can be selected in
userspace.

Signed-off-by: default avatarDavid Daney <ddaney@caviumnetworks.com>
Patchwork: http://patchwork.linux-mips.org/patch/1665/


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

arch/mips/kernel/cpu-probe.c

+7 −0
Original line number Diff line number Diff line
@@ -187,6 +187,7 @@ void __init check_wait(void) 
	case CPU_BCM6358:

	case CPU_CAVIUM_OCTEON:

	case CPU_CAVIUM_OCTEON_PLUS:

	case CPU_CAVIUM_OCTEON2:

	case CPU_JZRISC:

		cpu_wait = r4k_wait;

		break;
@@ -953,6 +954,12 @@ static inline void cpu_probe_cavium(struct cpuinfo_mips *c, unsigned int cpu) 
		if (cpu == 0)

			__elf_platform = "octeon";

		break;

	case PRID_IMP_CAVIUM_CN63XX:

		c->cputype = CPU_CAVIUM_OCTEON2;

		__cpu_name[cpu] = "Cavium Octeon II";

		if (cpu == 0)

			__elf_platform = "octeon2";

		break;

	default:

		printk(KERN_INFO "Unknown Octeon chip!\n");

		c->cputype = CPU_UNKNOWN;