Unverified Commit 8041edb5 authored by Paul Cercueil's avatar Paul Cercueil Committed by Paul Burton
Browse files

MIPS: Fix Ingenic SoCs sometimes reporting wrong ISA



The config0 register in the Xburst CPUs with a processor ID of
PRID_COMP_INGENIC_D0 report themselves as MIPS32r2 compatible,
but they don't actually support this ISA.

Signed-off-by: default avatarPaul Cercueil <paul@crapouillou.net>
Signed-off-by: default avatarPaul Burton <paul.burton@mips.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: James Hogan <jhogan@kernel.org>
Cc: od@zcrc.me
Cc: linux-mips@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
parent 1b1f01b6
Loading
Loading
Loading
Loading
+8 −0
Original line number Diff line number Diff line
@@ -1973,6 +1973,14 @@ static inline void cpu_probe_ingenic(struct cpuinfo_mips *c, unsigned int cpu)
		panic("Unknown Ingenic Processor ID!");
		break;
	}

	/*
	 * The config0 register in the Xburst CPUs with a processor ID of
	 * PRID_COMP_INGENIC_D0 report themselves as MIPS32r2 compatible,
	 * but they don't actually support this ISA.
	 */
	if ((c->processor_id & PRID_COMP_MASK) == PRID_COMP_INGENIC_D0)
		c->isa_level &= ~MIPS_CPU_ISA_M32R2;
}

static inline void cpu_probe_netlogic(struct cpuinfo_mips *c, int cpu)