Re: [PATCH v2] MIPS: Limit check_bugs32() to affected platform

[Tiezhu Yang]

On 04/11/2020 12:25 AM, Florian Fainelli wrote:
> On 4/9/2020 8:20 PM, Tiezhu Yang wrote:
> > In the current code, check_bugs32() only handles MIPS32 CPU type CPU_34K,
> > it is better to build and call it on the affected platform.
> >
> > Move check_bugs32() to the new added 34k-bugs32.c to indicate the fact that
> > the code is specific to the 34k CPU, and also add CONFIG_CPU_34K_BUGS32 to
> > control whether or not check the bugs.
> >
> > Signed-off-by: Tiezhu Yang <yangtiezhu@xxxxxxxxxxx>
> This is not a whole lot of code, so moving this to a separate
> translation unit seems a bit heavy handed, also file renames, albeit
> tracked properly by git are always a challenge when doing back ports.

Hi Florian,

There exists the following three ways to do it, I'm fine either way,
maybe the first way looks better. Let us wait for the MIPS maintainer
to say what he prefer.

Hi Thomas,

What is your opinion?

1 just use CONFIG_CPU_MIPS32_R2

diff --git a/arch/mips/include/asm/bugs.h b/arch/mips/include/asm/bugs.h
index d72dc6e..743604f 100644
--- a/arch/mips/include/asm/bugs.h
+++ b/arch/mips/include/asm/bugs.h
@@ -35,7 +35,9 @@ static inline void check_bugs(void)
        unsigned int cpu = smp_processor_id();

        cpu_data[cpu].udelay_val = loops_per_jiffy;
-       check_bugs32();
+
+       if (IS_ENABLED(CONFIG_CPU_MIPS32_R2))
+               check_bugs32();

        if (IS_ENABLED(CONFIG_CPU_R4X00_BUGS64))
                check_bugs64();
diff --git a/arch/mips/kernel/cpu-probe.c b/arch/mips/kernel/cpu-probe.c
index 6ab6b03..383500b 100644
--- a/arch/mips/kernel/cpu-probe.c
+++ b/arch/mips/kernel/cpu-probe.c
@@ -461,7 +461,8 @@ static inline void cpu_set_mt_per_tc_perf(struct 
cpuinfo_mips *c)
                c->options |= MIPS_CPU_MT_PER_TC_PERF_COUNTERS;
 }

-static inline void check_errata(void)
+#ifdef CONFIG_CPU_MIPS32_R2
+static inline void check_errata32(void)
 {
        struct cpuinfo_mips *c = &current_cpu_data;

@@ -482,8 +483,9 @@ static inline void check_errata(void)

 void __init check_bugs32(void)
 {
-       check_errata();
+       check_errata32();
 }
+#endif /* CONFIG_CPU_MIPS32_R2 */

 /*
  * Probe whether cpu has config register by trying to play with


2 add CONFIG_CPU_34K_BUGS32

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 797d7f1..e936e3c 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -2605,6 +2605,10 @@ config CPU_R4X00_BUGS64
        bool
        default y if SYS_HAS_CPU_R4X00 && 64BIT && (TARGET_ISA_REV < 1)

+config CPU_34K_BUGS32
+       bool
+       default y if CPU_MIPS32_R2
+
 config MIPS_ASID_SHIFT
        int
        default 6 if CPU_R3000 || CPU_TX39XX
diff --git a/arch/mips/include/asm/bugs.h b/arch/mips/include/asm/bugs.h
index d72dc6e..bbf843a 100644
--- a/arch/mips/include/asm/bugs.h
+++ b/arch/mips/include/asm/bugs.h
@@ -35,7 +35,9 @@ static inline void check_bugs(void)
        unsigned int cpu = smp_processor_id();

        cpu_data[cpu].udelay_val = loops_per_jiffy;
-       check_bugs32();
+
+       if (IS_ENABLED(CONFIG_CPU_34K_BUGS32))
+               check_bugs32();

        if (IS_ENABLED(CONFIG_CPU_R4X00_BUGS64))
                check_bugs64();
diff --git a/arch/mips/kernel/cpu-probe.c b/arch/mips/kernel/cpu-probe.c
index 6ab6b03..670bc7c 100644
--- a/arch/mips/kernel/cpu-probe.c
+++ b/arch/mips/kernel/cpu-probe.c
@@ -461,7 +461,8 @@ static inline void cpu_set_mt_per_tc_perf(struct 
cpuinfo_mips *c)
                c->options |= MIPS_CPU_MT_PER_TC_PERF_COUNTERS;
 }

-static inline void check_errata(void)
+#ifdef CONFIG_CPU_34K_BUGS32
+static inline void check_errata32(void)
 {
        struct cpuinfo_mips *c = &current_cpu_data;

@@ -482,8 +483,9 @@ static inline void check_errata(void)

 void __init check_bugs32(void)
 {
-       check_errata();
+       check_errata32();
 }
+#endif /* CONFIG_CPU_34K_BUGS32 */

 /*
  * Probe whether cpu has config register by trying to play with


3 add new 34k-bugs32.c and CONFIG_CPU_34K_BUGS32

just as this v2 patch:
https://lore.kernel.org/patchwork/patch/1222273/

Thanks,

Tiezhu Yang