leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MIPS: OCTEON: Implement DCache errata workaround for all CN6XXX

Browse Source 
Make messages refer to all CN6XXX.

Signed-off-by: David Daney <david.daney@cavium.com>
Signed-off-by: Aleksey Makarov <aleksey.makarov@auriga.com>
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/8941/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
This commit is contained in:
David Daney 2015-01-15 16:11:13 +03:00 committed by Ralf Baechle
parent 664f1ae53d
commit e3d0ead59f
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
arch/mips/cavium-octeon/setup.c
View File

@ -1041,7 +1041,7 @@ EXPORT_SYMBOL(prom_putchar);
void prom_free_prom_memory(void) void prom_free_prom_memory(void)
{ {
if (OCTEON_IS_MODEL(OCTEON_CN63XX_PASS1_X)) { if (CAVIUM_OCTEON_DCACHE_PREFETCH_WAR) {
/* Check for presence of Core-14449 fix. */ /* Check for presence of Core-14449 fix. */
u32 insn; u32 insn;
u32 *foo; u32 *foo;
@ -1063,8 +1063,9 @@ void prom_free_prom_memory(void)
panic("No PREF instruction at Core-14449 probe point."); panic("No PREF instruction at Core-14449 probe point.");
if (((insn >> 16) & 0x1f) != 28) if (((insn >> 16) & 0x1f) != 28)
panic("Core-14449 WAR not in place (%04x).\n" panic("OCTEON II DCache prefetch workaround not in place (%04x).\n"
"Please build kernel with proper options (CONFIG_CAVIUM_CN63XXP1).", insn); "Please build kernel with proper options (CONFIG_CAVIUM_CN63XXP1).",
insn);
} }
} }

3
arch/mips/include/asm/mach-cavium-octeon/war.h
View File

@ -22,4 +22,7 @@
#define R10000_LLSC_WAR 0 #define R10000_LLSC_WAR 0
#define MIPS34K_MISSED_ITLB_WAR 0 #define MIPS34K_MISSED_ITLB_WAR 0
#define CAVIUM_OCTEON_DCACHE_PREFETCH_WAR \
OCTEON_IS_MODEL(OCTEON_CN6XXX)
#endif /* __ASM_MIPS_MACH_CAVIUM_OCTEON_WAR_H */ #endif /* __ASM_MIPS_MACH_CAVIUM_OCTEON_WAR_H */

2
arch/mips/mm/uasm.c
View File

@ -341,7 +341,7 @@ I_u3u1u2(_ldx)
void ISAFUNC(uasm_i_pref)(u32 **buf, unsigned int a, signed int b, void ISAFUNC(uasm_i_pref)(u32 **buf, unsigned int a, signed int b,
unsigned int c) unsigned int c)
{ {
if (OCTEON_IS_MODEL(OCTEON_CN63XX_PASS1_X) && a <= 24 && a != 5) if (CAVIUM_OCTEON_DCACHE_PREFETCH_WAR && a <= 24 && a != 5)
/* /*
* As per erratum Core-14449, replace prefetches 0-4, * As per erratum Core-14449, replace prefetches 0-4,
* 6-24 with 'pref 28'. * 6-24 with 'pref 28'.