tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
MIPS: r4k-bugs64: Limit R4k bug checks to affected systems
Only build the checks for R4k errata workarounds if we expect that the
kernel might actually run on a system with an R4k CPU - ie.
CONFIG_SYS_HAS_CPU_R4X00=y & we're targeting a pre-MIPSr1 ISA revision.
Rename cpu-bugs64.c to r4k-bugs64.c to indicate the fact that the code
is specific to R4k CPUs.
Signed-off-by: Paul Burton <paul.burton@mips.com>
Cc: linux-mips@vger.kernel.org
+14
-12
+4
arch/mips/Kconfig
+4
arch/mips/Kconfig
+8
-10
arch/mips/include/asm/bugs.h
+8
-10
arch/mips/include/asm/bugs.h
···
26
26
27
27
static inline void check_bugs_early(void)
28
28
{
29
-
#ifdef CONFIG_64BIT
30
-
check_bugs64_early();
31
-
#endif
29
+
if (IS_ENABLED(CONFIG_CPU_R4X00_BUGS64))
30
+
check_bugs64_early();
32
31
}
33
32
34
33
static inline void check_bugs(void)
···
36
37
37
38
cpu_data[cpu].udelay_val = loops_per_jiffy;
38
39
check_bugs32();
39
-
#ifdef CONFIG_64BIT
40
-
check_bugs64();
41
-
#endif
40
+
41
+
if (IS_ENABLED(CONFIG_CPU_R4X00_BUGS64))
42
+
check_bugs64();
42
43
}
43
44
44
45
static inline int r4k_daddiu_bug(void)
45
46
{
46
-
#ifdef CONFIG_64BIT
47
+
if (!IS_ENABLED(CONFIG_CPU_R4X00_BUGS64))
48
+
return 0;
49
+
47
50
WARN_ON(daddiu_bug < 0);
48
51
return daddiu_bug != 0;
49
-
#else
50
-
return 0;
51
-
#endif
52
52
}
53
53
54
54
#endif /* _ASM_BUGS_H */
+1
-1
arch/mips/kernel/Makefile
+1
-1
arch/mips/kernel/Makefile
arch/mips/kernel/cpu-bugs64.c
arch/mips/kernel/r4k-bugs64.c
arch/mips/kernel/cpu-bugs64.c
arch/mips/kernel/r4k-bugs64.c