[PATCH 1/2] x86: intel_epb: Mention firmware in ENERGY_PERF_BIAS warning

[PATCH 1/2] x86: intel_epb: Mention firmware in ENERGY_PERF_BIAS warning

[Paul Menzel]

The warning

    ENERGY_PERF_BIAS: Set to 'normal', was 'performance'

is shown on all my Intel systems, and for a normal user it’s unclear
what to do about it. Change it to

    ENERGY_PERF_BIAS: Set to 'normal', was 'performance' (unchanged by firmware)

so it’s clear, that it might be possible to change the setting in the
system firmware.

Signed-off-by: Paul Menzel <pmenzel@molgen.mpg.de>
---
 arch/x86/kernel/cpu/intel_epb.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/x86/kernel/cpu/intel_epb.c b/arch/x86/kernel/cpu/intel_epb.c
index f4dd73396f28..3f8c0b59d08a 100644
--- a/arch/x86/kernel/cpu/intel_epb.c
+++ b/arch/x86/kernel/cpu/intel_epb.c
@@ -91,7 +91,7 @@ static void intel_epb_restore(void)
 		val = epb & EPB_MASK;
 		if (val == ENERGY_PERF_BIAS_PERFORMANCE) {
 			val = ENERGY_PERF_BIAS_NORMAL;
-			pr_warn_once("ENERGY_PERF_BIAS: Set to 'normal', was 'performance'\n");
+			pr_warn_once("ENERGY_PERF_BIAS: Set to 'normal', was 'performance' (unchanged by firmware)\n");
 		}
 	}
 	wrmsrl(MSR_IA32_ENERGY_PERF_BIAS, (epb & ~EPB_MASK) | val);
-- 
2.33.0

[PATCH 2/2] x86: intel_epb: Decrease ENERGY_PERF_BIAS warning to info log message

[Paul Menzel]

The warning

    ENERGY_PERF_BIAS: Set to 'normal', was 'performance' (unchanged by firmware)

is shown on all my Intel systems. As most users can not do anything
about it reduce the log level from warning to info.

Signed-off-by: Paul Menzel <pmenzel@molgen.mpg.de>
---
 arch/x86/kernel/cpu/intel_epb.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/x86/kernel/cpu/intel_epb.c b/arch/x86/kernel/cpu/intel_epb.c
index 3f8c0b59d08a..05acb2fd0298 100644
--- a/arch/x86/kernel/cpu/intel_epb.c
+++ b/arch/x86/kernel/cpu/intel_epb.c
@@ -91,7 +91,7 @@ static void intel_epb_restore(void)
 		val = epb & EPB_MASK;
 		if (val == ENERGY_PERF_BIAS_PERFORMANCE) {
 			val = ENERGY_PERF_BIAS_NORMAL;
-			pr_warn_once("ENERGY_PERF_BIAS: Set to 'normal', was 'performance' (unchanged by firmware)\n");
+			pr_info_once("ENERGY_PERF_BIAS: Set to 'normal', was 'performance' (unchanged by firmware)\n");
 		}
 	}
 	wrmsrl(MSR_IA32_ENERGY_PERF_BIAS, (epb & ~EPB_MASK) | val);
-- 
2.33.0