Skip to content

Commit

Permalink
MIPS: Sibyte: Apply M3 workaround only on affected chip types and ver…
Browse files Browse the repository at this point in the history
…sions.

Previously it was unconditionally used on all Sibyte family SOCs.  The
M3 bug has to be handled in the TLB exception handler which is extremly
performance sensitive, so this modification is expected to deliver around
2-3% performance improvment.  This is important as required changes to the
M3 workaround will make it more costly.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  • Loading branch information
ralfbaechle committed Apr 12, 2010
1 parent 9538ca6 commit 8d9df29
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 1 deletion.
6 changes: 5 additions & 1 deletion arch/mips/include/asm/mach-sibyte/war.h
Expand Up @@ -16,7 +16,11 @@
#if defined(CONFIG_SB1_PASS_1_WORKAROUNDS) || \
defined(CONFIG_SB1_PASS_2_WORKAROUNDS)

#define BCM1250_M3_WAR 1
#ifndef __ASSEMBLY__
extern int sb1250_m3_workaround_needed(void);
#endif

#define BCM1250_M3_WAR sb1250_m3_workaround_needed()
#define SIBYTE_1956_WAR 1

#else
Expand Down
15 changes: 15 additions & 0 deletions arch/mips/sibyte/sb1250/setup.c
Expand Up @@ -87,6 +87,21 @@ static int __init setup_bcm1250(void)
return ret;
}

int sb1250_m3_workaround_needed(void)
{
switch (soc_type) {
case K_SYS_SOC_TYPE_BCM1250:
case K_SYS_SOC_TYPE_BCM1250_ALT:
case K_SYS_SOC_TYPE_BCM1250_ALT2:
case K_SYS_SOC_TYPE_BCM1125:
case K_SYS_SOC_TYPE_BCM1125H:
return soc_pass < K_SYS_REVISION_BCM1250_C0;

default:
return 0;
}
}

static int __init setup_bcm112x(void)
{
int ret = 0;
Expand Down

0 comments on commit 8d9df29

Please sign in to comment.