MIPS: Get rid of CAVIUM_OCTEON_DCACHE_PREFETCH_WAR

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

CAVIUM_OCTEON_DCACHE_PREFETCH_WAR is a check for Octeon model CN6XXXX.
By using the version check we can remove the define.

Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>

Thomas Bogendoerfer 5 years ago 8e7291d6 ab574307

+2 -5

3 changed files

expand all

arch

mips

cavium-octeon

setup.c

include

asm

mach-cavium-octeon

war.h

uasm.c

+1 -1

arch/mips/cavium-octeon/setup.c

··· 1126 1126 1127 1127 void __init prom_free_prom_memory(void) 1128 1128 { 1129 - if (CAVIUM_OCTEON_DCACHE_PREFETCH_WAR) { 1129 + if (OCTEON_IS_MODEL(OCTEON_CN6XXX)) { 1130 1130 /* Check for presence of Core-14449 fix. */ 1131 1131 u32 insn; 1132 1132 u32 *foo;

-3

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

··· 9 9 #ifndef __ASM_MIPS_MACH_CAVIUM_OCTEON_WAR_H 10 10 #define __ASM_MIPS_MACH_CAVIUM_OCTEON_WAR_H 11 11 12 - #define CAVIUM_OCTEON_DCACHE_PREFETCH_WAR \ 13 - OCTEON_IS_MODEL(OCTEON_CN6XXX) 14 - 15 12 #endif /* __ASM_MIPS_MACH_CAVIUM_OCTEON_WAR_H */

+1 -1

arch/mips/mm/uasm.c

··· 394 394 void uasm_i_pref(u32 **buf, unsigned int a, signed int b, 395 395 unsigned int c) 396 396 { 397 - if (CAVIUM_OCTEON_DCACHE_PREFETCH_WAR && a <= 24 && a != 5) 397 + if (OCTEON_IS_MODEL(OCTEON_CN6XXX) && a <= 24 && a != 5) 398 398 /* 399 399 * As per erratum Core-14449, replace prefetches 0-4, 400 400 * 6-24 with 'pref 28'.