[PATCH v2 1/1] platform/x86: hp-wmi: fix platform profile issues on generic HP laptops

[Marco Scardovi]

On generic (non-Omen/non-Victus) HP laptops supported by the
hp-wmi driver, the platform_profile sysfs operations could fail,
leading to 'platform_profile: Failed to get profile for handler hp-wmi'
errors and preventing userspace power profile management from working
correctly.

The driver was blindly registering all 4 profiles (quiet, cool,
balanced, performance) without checking which ones were actually
supported by the BIOS. Furthermore, when userspace switched profiles,
hp_wmi_platform_profile_get() was called, which queried the BIOS
using thermal_profile_get(). If the BIOS query returned an error or
returned a value not in the recognized cases, the get call failed,
throwing an error.

Fix this by dynamically probing which thermal profiles are supported
by the BIOS during driver registration. This is done by temporarily
setting each profile and checking the return code, then restoring the
original profile. Restructure the probe function to explicitly populate
choices for each laptop type, avoiding confusing fall-through behavior.

There are no expected negative side effects, as the active profile is
restored to its original state during probe time, and only validated
profiles are exposed.

Closes: https://bugzilla.kernel.org/show_bug.cgi?id=220008
Closes: https://bugzilla.kernel.org/show_bug.cgi?id=221569
Closes: https://lore.kernel.org/platform-driver-x86/a3b137df-1b21-4460-b003-58c5ca2d59d4@xxxxxx/
Fixes: 4296f679ca50 ("platform/x86: hp-wmi: add platform profile support")
Assisted-by: Antigravity:gemini-3.5-flash
Signed-off-by: Marco Scardovi <scardracs@xxxxxxxxxxx>
---
 drivers/platform/x86/hp/hp-wmi.c | 37 ++++++++++++++++++++++++++------
 1 file changed, 30 insertions(+), 7 deletions(-)

diff --git a/drivers/platform/x86/hp/hp-wmi.c b/drivers/platform/x86/hp/hp-wmi.c
index 8ba286ed8721..82fdfaa169ec 100644
--- a/drivers/platform/x86/hp/hp-wmi.c
+++ b/drivers/platform/x86/hp/hp-wmi.c
@@ -2011,19 +2011,42 @@ static int hp_wmi_platform_profile_probe(void *drvdata, unsigned long *choices)
 {
 	if (is_omen_thermal_profile()) {
 		set_bit(PLATFORM_PROFILE_COOL, choices);
-	} else if (is_victus_thermal_profile()) {
+		set_bit(PLATFORM_PROFILE_BALANCED, choices);
+		set_bit(PLATFORM_PROFILE_PERFORMANCE, choices);
+		return 0;
+	}
+
+	if (is_victus_thermal_profile()) {
 		set_bit(PLATFORM_PROFILE_QUIET, choices);
-	} else if (is_victus_s_thermal_profile()) {
+		set_bit(PLATFORM_PROFILE_BALANCED, choices);
+		set_bit(PLATFORM_PROFILE_PERFORMANCE, choices);
+		return 0;
+	}
+
+	if (is_victus_s_thermal_profile()) {
 		/* Adding an equivalent to HP Omen software ECO mode: */
 		set_bit(PLATFORM_PROFILE_LOW_POWER, choices);
-	} else {
-		set_bit(PLATFORM_PROFILE_QUIET, choices);
-		set_bit(PLATFORM_PROFILE_COOL, choices);
+		set_bit(PLATFORM_PROFILE_BALANCED, choices);
+		set_bit(PLATFORM_PROFILE_PERFORMANCE, choices);
+		return 0;
 	}
 
-	set_bit(PLATFORM_PROFILE_BALANCED, choices);
-	set_bit(PLATFORM_PROFILE_PERFORMANCE, choices);
+	/* Generic HP laptops supported by hp-wmi: probe dynamically */
+	int current_tp = thermal_profile_get();
+	if (current_tp < 0)
+		return current_tp;
+
+	if (thermal_profile_set(HP_THERMAL_PROFILE_QUIET) == 0)
+		set_bit(PLATFORM_PROFILE_QUIET, choices);
+	if (thermal_profile_set(HP_THERMAL_PROFILE_COOL) == 0)
+		set_bit(PLATFORM_PROFILE_COOL, choices);
+	if (thermal_profile_set(HP_THERMAL_PROFILE_DEFAULT) == 0)
+		set_bit(PLATFORM_PROFILE_BALANCED, choices);
+	if (thermal_profile_set(HP_THERMAL_PROFILE_PERFORMANCE) == 0)
+		set_bit(PLATFORM_PROFILE_PERFORMANCE, choices);
 
+	/* Restore original thermal profile */
+	thermal_profile_set(current_tp);
 	return 0;
 }
 
-- 
2.54.0