Skip to content

Commit

Permalink
MIPS: kernel: cpu-bugs64: Do not check R6 cores for existing 64-bit bugs
Browse files Browse the repository at this point in the history
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: Maciej W. Rozycki <macro@linux-mips.org>
Signed-off-by: Leonid Yegoshin <Leonid.Yegoshin@imgtec.com>
Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
  • Loading branch information
Leonid Yegoshin authored and Markos Chandras committed Feb 17, 2015
1 parent 82e7ce8 commit 180b1e3
Showing 1 changed file with 7 additions and 4 deletions.
11 changes: 7 additions & 4 deletions arch/mips/kernel/cpu-bugs64.c
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ static inline void check_daddi(void)
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)
{
Expand Down Expand Up @@ -314,11 +314,14 @@ static inline void check_daddiu(void)

void __init check_bugs64_early(void)
{
check_mult_sh();
check_daddiu();
if (!config_enabled(CONFIG_CPU_MIPSR6)) {
check_mult_sh();
check_daddiu();
}
}

void __init check_bugs64(void)
{
check_daddi();
if (!config_enabled(CONFIG_CPU_MIPSR6))
check_daddi();
}

0 comments on commit 180b1e3

Please sign in to comment.