x86/bugs: Fix return type of spectre_bhi_state()

jira LE-2015
cve CVE-2024-2201
Rebuild_History Non-Buildable kernel-5.14.0-427.42.1.el9_4
commit-author Daniel Sneddon <daniel.sneddon@linux.intel.com>
commit 04f4230
Empty-Commit: Cherry-Pick Conflicts during history rebuild.
Will be included in final tarball splat. Ref for failed cherry-pick at:
ciq/ciq_backports/kernel-5.14.0-427.42.1.el9_4/04f4230e.failed

The definition of spectre_bhi_state() incorrectly returns a const char
* const. This causes the a compiler warning when building with W=1:

 warning: type qualifiers ignored on function return type [-Wignored-qualifiers]
 2812 | static const char * const spectre_bhi_state(void)

Remove the const qualifier from the pointer.

Fixes: ec9404e ("x86/bhi: Add BHI mitigation knob")
	Reported-by: Sean Christopherson <seanjc@google.com>
	Signed-off-by: Daniel Sneddon <daniel.sneddon@linux.intel.com>
	Signed-off-by: Ingo Molnar <mingo@kernel.org>
	Cc: Linus Torvalds <torvalds@linux-foundation.org>
Link: https://lore.kernel.org/r/20240409230806.1545822-1-daniel.sneddon@linux.intel.com
(cherry picked from commit 04f4230)
	Signed-off-by: Jonathan Maple <jmaple@ciq.com>

# Conflicts:
#	arch/x86/kernel/cpu/bugs.c

Author: PlaidCat

ciq/ciq_backports/kernel-5.14.0-427.42.1.el9_4/04f4230e.failed

@@ -0,0 +1,62 @@
+x86/bugs: Fix return type of spectre_bhi_state()
+
+jira LE-2015
+cve CVE-2024-2201
+Rebuild_History Non-Buildable kernel-5.14.0-427.42.1.el9_4
+commit-author Daniel Sneddon <daniel.sneddon@linux.intel.com>
+commit 04f4230e2f86a4e961ea5466eda3db8c1762004d
+Empty-Commit: Cherry-Pick Conflicts during history rebuild.
+Will be included in final tarball splat. Ref for failed cherry-pick at:
+ciq/ciq_backports/kernel-5.14.0-427.42.1.el9_4/04f4230e.failed
+
+The definition of spectre_bhi_state() incorrectly returns a const char
+* const. This causes the a compiler warning when building with W=1:
+
+ warning: type qualifiers ignored on function return type [-Wignored-qualifiers]
+ 2812 | static const char * const spectre_bhi_state(void)
+
+Remove the const qualifier from the pointer.
+
+Fixes: ec9404e40e8f ("x86/bhi: Add BHI mitigation knob")
+	Reported-by: Sean Christopherson <seanjc@google.com>
+	Signed-off-by: Daniel Sneddon <daniel.sneddon@linux.intel.com>
+	Signed-off-by: Ingo Molnar <mingo@kernel.org>
+	Cc: Linus Torvalds <torvalds@linux-foundation.org>
+Link: https://lore.kernel.org/r/20240409230806.1545822-1-daniel.sneddon@linux.intel.com
+(cherry picked from commit 04f4230e2f86a4e961ea5466eda3db8c1762004d)
+	Signed-off-by: Jonathan Maple <jmaple@ciq.com>
+
+# Conflicts:
+#	arch/x86/kernel/cpu/bugs.c
+diff --cc arch/x86/kernel/cpu/bugs.c
+index d1c0c8f6898b,27f5004a8e24..000000000000
+--- a/arch/x86/kernel/cpu/bugs.c
++++ b/arch/x86/kernel/cpu/bugs.c
+@@@ -2814,6 -2809,23 +2814,26 @@@ static char *pbrsb_eibrs_state(void
+  	}
+  }
+  
+++<<<<<<< HEAD
+++=======
++ static const char *spectre_bhi_state(void)
++ {
++ 	if (!boot_cpu_has_bug(X86_BUG_BHI))
++ 		return "; BHI: Not affected";
++ 	else if  (boot_cpu_has(X86_FEATURE_CLEAR_BHB_HW))
++ 		return "; BHI: BHI_DIS_S";
++ 	else if  (boot_cpu_has(X86_FEATURE_CLEAR_BHB_LOOP))
++ 		return "; BHI: SW loop, KVM: SW loop";
++ 	else if (boot_cpu_has(X86_FEATURE_RETPOLINE) &&
++ 		 !(x86_read_arch_cap_msr() & ARCH_CAP_RRSBA))
++ 		return "; BHI: Retpoline";
++ 	else if  (boot_cpu_has(X86_FEATURE_CLEAR_BHB_LOOP_ON_VMEXIT))
++ 		return "; BHI: Syscall hardening, KVM: SW loop";
++ 
++ 	return "; BHI: Vulnerable (Syscall hardening enabled)";
++ }
++ 
+++>>>>>>> 04f4230e2f86 (x86/bugs: Fix return type of spectre_bhi_state())
+  static ssize_t spectre_v2_show_state(char *buf)
+  {
+  	if (spectre_v2_enabled == SPECTRE_V2_LFENCE)
+* Unmerged path arch/x86/kernel/cpu/bugs.c