Commit 180b1e3b authored by Leonid Yegoshin's avatar Leonid Yegoshin Committed by Markos Chandras

MIPS: kernel: cpu-bugs64: Do not check R6 cores for existing 64-bit bugs

The current HW bugs checked in cpu-bugs64, do not apply to R6 cores
and they cause compilation problems due to removed <R6 instructions,
so do not check for them for the time being.
Reviewed-by: default avatarMaciej W. Rozycki <macro@linux-mips.org>
Signed-off-by: default avatarLeonid Yegoshin <Leonid.Yegoshin@imgtec.com>
Signed-off-by: default avatarMarkos Chandras <markos.chandras@imgtec.com>
parent 82e7ce81
...@@ -244,7 +244,7 @@ static inline void check_daddi(void) ...@@ -244,7 +244,7 @@ static inline void check_daddi(void)
panic(bug64hit, !DADDI_WAR ? daddiwar : nowar); panic(bug64hit, !DADDI_WAR ? daddiwar : nowar);
} }
int daddiu_bug = -1; int daddiu_bug = config_enabled(CONFIG_CPU_MIPSR6) ? 0 : -1;
static inline void check_daddiu(void) static inline void check_daddiu(void)
{ {
...@@ -314,11 +314,14 @@ static inline void check_daddiu(void) ...@@ -314,11 +314,14 @@ static inline void check_daddiu(void)
void __init check_bugs64_early(void) void __init check_bugs64_early(void)
{ {
check_mult_sh(); if (!config_enabled(CONFIG_CPU_MIPSR6)) {
check_daddiu(); check_mult_sh();
check_daddiu();
}
} }
void __init check_bugs64(void) void __init check_bugs64(void)
{ {
check_daddi(); if (!config_enabled(CONFIG_CPU_MIPSR6))
check_daddi();
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment