MIPS: Detect MIPSr6 Virtual Processor support

[cascardo/linux.git] / arch / mips / kernel / cpu-probe.c

diff --git a/arch/mips/kernel/cpu-probe.c b/arch/mips/kernel/cpu-probe.c
index b725b71..e0cfa3b 100644 (file)
--- a/arch/mips/kernel/cpu-probe.c
+++ b/arch/mips/kernel/cpu-probe.c
@@ -796,6 +796,8 @@ static inline unsigned int decode_config5(struct cpuinfo_mips *c)
        if (config5 & MIPS_CONF5_MVH)
                c->options |= MIPS_CPU_XPA;
 #endif
+       if (cpu_has_mips_r6 && (config5 & MIPS_CONF5_VP))
+               c->options |= MIPS_CPU_VP;
 
        return config5 & MIPS_CONF_M;
 }
@@ -1481,6 +1483,8 @@ platform:
                set_elf_platform(cpu, "octeon2");
                break;
        case PRID_IMP_CAVIUM_CN70XX:
+       case PRID_IMP_CAVIUM_CN73XX:
+       case PRID_IMP_CAVIUM_CNF75XX:
        case PRID_IMP_CAVIUM_CN78XX:
                c->cputype = CPU_CAVIUM_OCTEON3;
                __cpu_name[cpu] = "Cavium Octeon III";