On 12/18/2014 07:09 AM, Markos Chandras wrote:
From: Leonid Yegoshin <Leonid.Yegoshin@xxxxxxxxxx>
The EHB instruction is supported by MIPS R6 so add the relevant
option.
NAK.
In cpu-features.h we have the symbol cpu_has_mips_r2_exec_hazard. Use
that instead.
We need to move all those exceptions for different CPU revisions to the
CPU probing code so that cpu_has_mips_r2_exec_hazard reports the right
thing, and then always use cpu_has_mips_r2_exec_hazard.
Also you missed other EHB sites in tlbex.c, so this patch may not
correct even as is.
David Daney
Signed-off-by: Leonid Yegoshin <Leonid.Yegoshin@xxxxxxxxxx>
Signed-off-by: Markos Chandras <markos.chandras@xxxxxxxxxx>
---
arch/mips/mm/tlbex.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/mips/mm/tlbex.c b/arch/mips/mm/tlbex.c
index 14e5fae71a06..8a8a86a8942f 100644
--- a/arch/mips/mm/tlbex.c
+++ b/arch/mips/mm/tlbex.c
@@ -501,7 +501,7 @@ static void build_tlb_write_entry(u32 **p, struct uasm_label **l,
case tlb_indexed: tlbw = uasm_i_tlbwi; break;
}
- if (cpu_has_mips_r2) {
+ if (cpu_has_mips_r2 || cpu_has_mips_r6) {
/*
* The architecture spec says an ehb is required here,
* but a number of cores do not have the hazard and
