[PATCH v2 4/5] x86/cpuid: remove 'warn' parameter from filter_cpuid_features

Maxim Levitsky
2022-07-18T14:12:07Z

This parameter suppresses the warning if issue is found when
this function called from early boot cpu identification code, which doesn't
seem to be useful, except that it actually completely hides the warning,
because next time this code is called for each CPU and when the warning
is printed, the issue is already fixed, and so no warning is printed at all.

Tested by using a broken CPUID with missing leaf and observing no warning printed,
and with the patch a warning is printed once.

Signed-off-by: Maxim Levitsky <mlevitsk@redhat.com>
---
arch/x86/include/asm/cpufeature.h | 2 +-
arch/x86/kernel/cpu/common.c | 4 ++--
arch/x86/kernel/cpu/cpuid-deps.c | 4 +---
3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/arch/x86/include/asm/cpufeature.h b/arch/x86/include/asm/cpufeature.h
index 3eb5fe0d654e63..86d7fbb3f2b592 100644
--- a/arch/x86/include/asm/cpufeature.h
+++ b/arch/x86/include/asm/cpufeature.h
@@ -147,7 +147,7 @@ extern const char * const x86_bug_flags[NBUGINTS*32];

extern void setup_clear_cpu_cap(unsigned int bit);
extern void clear_cpu_cap(struct cpuinfo_x86 *c, unsigned int bit);
-extern void filter_cpuid_features(struct cpuinfo_x86 *c, bool warn);
+extern void filter_cpuid_features(struct cpuinfo_x86 *c);

#define setup_force_cpu_cap(bit) do { \
set_cpu_cap(&boot_cpu_data, bit); \
diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
index beaea42c1b47e1..1a2f4e83e2f312 100644
--- a/arch/x86/kernel/cpu/common.c
+++ b/arch/x86/kernel/cpu/common.c
@@ -1485,7 +1485,7 @@ static void __init early_identify_cpu(struct cpuinfo_x86 *c)
this_cpu->c_early_init(c);

c->cpu_index = 0;
- filter_cpuid_features(c, false);
+ filter_cpuid_features(c);

if (this_cpu->c_bsp_init)
this_cpu->c_bsp_init(c);
@@ -1773,7 +1773,7 @@ static void identify_cpu(struct cpuinfo_x86 *c)
*/

/* Filter out anything that depends on CPUID levels we don't have */
- filter_cpuid_features(c, true);
+ filter_cpuid_features(c);

/* If the model name is still unset, do table lookup. */
if (!c->x86_model_id[0]) {
diff --git a/arch/x86/kernel/cpu/cpuid-deps.c b/arch/x86/kernel/cpu/cpuid-deps.c
index 306f285844aedc..e1b5f5c02c0106 100644
--- a/arch/x86/kernel/cpu/cpuid-deps.c
+++ b/arch/x86/kernel/cpu/cpuid-deps.c
@@ -150,7 +150,7 @@ cpuid_dependent_features[] = {
{ 0, 0 }
};

-void filter_cpuid_features(struct cpuinfo_x86 *c, bool warn)
+void filter_cpuid_features(struct cpuinfo_x86 *c)
{
const struct cpuid_dependent_feature *df;

@@ -171,8 +171,6 @@ void filter_cpuid_features(struct cpuinfo_x86 *c, bool warn)
continue;

clear_cpu_cap(c, df->feature);
- if (!warn)
- continue;

pr_warn("CPU: CPU feature " X86_CAP_FMT " disabled, no CPUID level 0x%x\n",
x86_cap_flag(df->feature), df->level);
--
2.34.3