MIPS: Fix FTLB detection for R6
authorJames Hogan <james.hogan@imgtec.com>
Thu, 17 Sep 2015 16:49:21 +0000 (17:49 +0100)
committerRalf Baechle <ralf@linux-mips.org>
Tue, 22 Sep 2015 19:11:39 +0000 (21:11 +0200)
commit43d104db596977a8fddc1e71245859a7fe85a658
tree83b2af66d43918817540497b78aeb8ffc29f80ce
parent2f6f31363cb7890784458d7805140687b4de5b59
MIPS: Fix FTLB detection for R6

R6 removed the Config4.MMUExtDef field, with the low 16 bits only
allowed to contain FTLB fields, and commit e87569cd6c57 ("MIPS:
cpu-probe: Fix VTLB/FTLB configuration for R6") updated the probing of
this field to assume an FTLB is always present for R6.

However the FTLB may still be absent. The presence of those fields is
actually specified by the MMU type in the Config.MT field, so use that
(the new cpu_has_ftlb) to determine whether the FTLB is actually
present.

Fixes: e87569cd6c57 ("MIPS: cpu-probe: Fix VTLB/FTLB configuration for R6")
Signed-off-by: James Hogan <james.hogan@imgtec.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Markos Chandras <markos.chandras@imgtec.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/11160/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
arch/mips/kernel/cpu-probe.c