From nobody Sat Feb 7 18:21:06 2026 Received: from mail-pl1-f180.google.com (mail-pl1-f180.google.com [209.85.214.180]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 40E6031B111 for ; Tue, 30 Dec 2025 14:51:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.180 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767106277; cv=none; b=kIAwF2IUUSBHVV4cLOMQr+NGqZvMYKsE3qhCm0W7G5Ff0x5JbGr27IhOuZCit+G6qlF9w0lgoglqaTZ3NBdxEqpjncj+ZP/cYwnXXiNBYZUHnVo0YV+yOf18HSOgrhwjHoE9zlonOSB4hdMDcEjl77N4jhhBcFnxJnuARVhxI5g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767106277; c=relaxed/simple; bh=Q/yYXm0G3YL70J74hMdrWYHiYE7HMiCZrgDZEzA83Tk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=loF0l6KKsh5b5jJJZ0WlcJC2tdLw/7ARrXP86u5bVR8oZDxHpNsuzahYQqTQmnmPXmpxSAp5apJ8brWeBjsmAoAUKRu29vN3j1WKUPyX8kRyi8dvI+24CIJoaa0pzguKnIeRFjWXKF/PKwAu/VylK9cWlQkK3kqbYz6qBeC8nJ4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=bPEXrPvQ; arc=none smtp.client-ip=209.85.214.180 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="bPEXrPvQ" Received: by mail-pl1-f180.google.com with SMTP id d9443c01a7336-2a0bb2f093aso100937915ad.3 for ; Tue, 30 Dec 2025 06:51:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1767106274; x=1767711074; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=VKWUhpb9A+qYTHQbroFo6Yk396vrwSG6LpfcLMrzWnI=; b=bPEXrPvQF0coJiei+lJ60LfTbrYdySkzgqj2ocGkZSesalQSOTJig/OhuT6EukNByB rm71IMFJFh+762xVmRP1boR5VcqpApgX4LHE41JuFAPKBDDaes4QFqjBXeFsJgESYXJN Is0C7Cxrm+MqjuTq0QQfQ3EYiyVTo64Mabv260IE7SiopQuwByUDoA4K/J++H1xyApKh d7p6Vu7XQglOSjgcdmiQPh8/R802LGYdKTwovy6q2NUjroq+8p19t3UGhwLTQZt8W4vV YKnLDjyomP7wRRLayWOk43HRm6q6WGo1c7DbESdL7Ebwh099rfLeB1rwGti2+1kD6uxn EZ+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1767106274; x=1767711074; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=VKWUhpb9A+qYTHQbroFo6Yk396vrwSG6LpfcLMrzWnI=; b=CcKZrtNLgjEgM7h4FrFXthHZYlPG8tvS+76SU1A2Z8U/quWhnKsugEOwPSgg6WO100 dnZrldS9QoupGE9PGom8mA8vYSSXeiz1PNbUMrVbNJf+6086i7oytYufxjGFJMY9ouRz 2todioDvmw514K7pyAZ2AHhW0CIcSKSlw/dE42DV7ljtWSnislKFQkYShmLhAr0GXyOL xO/DuF4O35aw0VKA3m5x5tv/ivTFovA5HRlt6Kr6YwGa+u6CJhCJCP3su+dEy8pVGoj7 swQLWEeKKbr0meHkI6GXtSO3Sn9+kvK0qjRrJD0704Fa0+csy4UczJzupr+KDxWrp52j US+A== X-Forwarded-Encrypted: i=1; AJvYcCW97UgTh0Ipc+WUVcvoOF+XnkulGs80DM4xmEzCLfH5h0PBtQIxubLUzOXuDMSg1w8C2lCaWjZMemUNWNs=@vger.kernel.org X-Gm-Message-State: AOJu0YyskBTKPniNttJ9UkkoDRsmI5SVrTEuUu5zi1Z+e5KFV9DTuRM6 kZtRVOS3AZte+n+OX6nfpH6xkZJ8cOsE6DPengwKwGyvIovl6n2hq2UZ31wHOw== X-Gm-Gg: AY/fxX6chjeN2uPEba5IUt4OHlWNt04rXPLKN1H18R0shamG8/xtH5qowy4MRO7MTcM IBbySY9O4j+bAgdMVgdUxfdq9hW1tyknRbNha3hfX8GVzAaLIHSAf2DmaRQOr4EQivUdksxIL6S ymKZgQrNEPYLxxML+PpkdT0fT+fj1HViLaEuSHEMN+e7u4pJMS/HU6Xr5IFDfDI0LGCTraVix2K KK5SMuuOOvLNMnGVTW1ObTmnPo48lsDuNMMdArgxdXvfTrIMfrmWliAqDkZ4t0HD8rkrZVWCgZD +UTeN9lR/t2gL9ShAUyyqcDKiuKanLDwCVnvW5ELouyTBlxyJ5LXQXUtyvjiOJ3uVWJ87ATZUrT u++HTq681j8KrcvWXyfANpFxqHw8rb5zFEXKzLkv1sKMJajj04LO5PGumxTaaMmG8r/d7rgNahq w44zIYVgMcOS6+X/nlgZ8= X-Google-Smtp-Source: AGHT+IG0VbiBPFJk+NgXM9TTIabakFUAvQgY7BPNIEnncnf0aTtCX/29ck1/GOWjzXo+aJfmf3MVig== X-Received: by 2002:a17:903:19f0:b0:2a0:a92c:2cb6 with SMTP id d9443c01a7336-2a2f2732647mr356743915ad.36.1767106274117; Tue, 30 Dec 2025 06:51:14 -0800 (PST) Received: from archlinux ([2405:201:1b:225c:eb9d:1fc0:f95c:bd90]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2a2f3d5d86esm301257245ad.74.2025.12.30.06.51.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Dec 2025 06:51:13 -0800 (PST) From: Krishna Chomal To: ilpo.jarvinen@linux.intel.com, hansg@kernel.org, linux@roeck-us.net Cc: platform-driver-x86@vger.kernel.org, linux-hwmon@vger.kernel.org, linux-kernel@vger.kernel.org, Krishna Chomal Subject: [PATCH v2 1/2] platform/x86: hp-wmi: add manual fan control for Victus S models Date: Tue, 30 Dec 2025 20:20:52 +0530 Message-ID: <20251230145053.516196-2-krishna.chomal108@gmail.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20251230145053.516196-1-krishna.chomal108@gmail.com> References: <20251225142310.204831-1-krishna.chomal108@gmail.com> <20251230145053.516196-1-krishna.chomal108@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add manual fan speed control and PWM reporting for HP Victus S-series laptops. While HPWMI_FAN_SPEED_SET_QUERY was previously added to reset max fan mode, it is actually capable of individual fan control. This patch implements hp_wmi_fan_speed_set() to allow manual control and hides PWM inputs for non-Victus devices as the query is Victus specific. The existing hp_wmi_fan_speed_max_get() query is unreliable on Victus S firmware, often incorrectly reporting "Auto" mode even when "Max" is active. To resolve this synchronization issue, move state tracking to a per-device private context and apply "Auto" mode during driver initialization to ensure a consistent starting point. Refactor hp_wmi_apply_fan_settings() to use an intermediate ret variable. This prepares the switch block for keep-alive logic being added in a later patch, avoiding the need for duplicated mode check. Tested on: HP Omen 16-wf1xxx (board ID 8C78) Signed-off-by: Krishna Chomal --- Changes in v2: - Added limits.h and minmax.h headers - Re-written pwm-to-rpm (and vice-versa) conversion from macros to static inline functions - Removed redundant NULL checking of drvdata - Made integer promotion explicit by casting intermediate result to unsigned int when calculating the GPU fan speed - Renamed "enforce_ctx" to "apply_fan_settings" for clarity - Removed unnecessary comments - Renamed "ctx" to "priv" as it is more consistent for drvdata - Added new struct victus_s_fan_table to avoid complex type casting --- drivers/platform/x86/hp/hp-wmi.c | 263 +++++++++++++++++++++++++------ 1 file changed, 218 insertions(+), 45 deletions(-) diff --git a/drivers/platform/x86/hp/hp-wmi.c b/drivers/platform/x86/hp/hp-= wmi.c index f4ea1ea05997..ef419575174c 100644 --- a/drivers/platform/x86/hp/hp-wmi.c +++ b/drivers/platform/x86/hp/hp-wmi.c @@ -30,6 +30,10 @@ #include #include #include +#include +#include +#include +#include =20 MODULE_AUTHOR("Matthew Garrett "); MODULE_DESCRIPTION("HP laptop WMI driver"); @@ -190,7 +194,8 @@ enum hp_wmi_gm_commandtype { HPWMI_SET_GPU_THERMAL_MODES_QUERY =3D 0x22, HPWMI_SET_POWER_LIMITS_QUERY =3D 0x29, HPWMI_VICTUS_S_FAN_SPEED_GET_QUERY =3D 0x2D, - HPWMI_FAN_SPEED_SET_QUERY =3D 0x2E, + HPWMI_VICTUS_S_FAN_SPEED_SET_QUERY =3D 0x2E, + HPWMI_VICTUS_S_GET_FAN_TABLE_QUERY =3D 0x2F, }; =20 enum hp_wmi_command { @@ -348,6 +353,51 @@ static const char * const tablet_chassis_types[] =3D { =20 #define DEVICE_MODE_TABLET 0x06 =20 +#define CPU_FAN 0 +#define GPU_FAN 1 + +enum pwm_modes { + PWM_MODE_MAX =3D 0, + PWM_MODE_MANUAL =3D 1, + PWM_MODE_AUTO =3D 2, +}; + +struct hp_wmi_hwmon_priv { + u8 min_rpm; + u8 max_rpm; + u8 gpu_delta; + u8 mode; + u8 pwm; +}; + +struct victus_s_fan_table_header { + u8 unknown; + u8 num_entries; +} __packed; + +struct victus_s_fan_table_entry { + u8 cpu_rpm; + u8 gpu_rpm; + u8 unknown; +} __packed; + +struct victus_s_fan_table { + struct victus_s_fan_table_header header; + struct victus_s_fan_table_entry entries[]; +} __packed; + +static inline u8 rpm_to_pwm(u8 rpm, struct hp_wmi_hwmon_priv *priv) +{ + return fixp_linear_interpolate(0, 0, priv->max_rpm, U8_MAX, + clamp_val(rpm, 0, priv->max_rpm)); +} + +static inline u8 pwm_to_rpm(u8 pwm, struct hp_wmi_hwmon_priv *priv) +{ + return fixp_linear_interpolate(0, 0, U8_MAX, priv->max_rpm, + clamp_val(pwm, 0, U8_MAX)); +} + /* map output size to the corresponding WMI method id */ static inline int encode_outsize_for_pvsz(int outsize) { @@ -637,41 +687,53 @@ static int hp_wmi_fan_speed_max_set(int enabled) return enabled; } =20 -static int hp_wmi_fan_speed_reset(void) +static int hp_wmi_fan_speed_set(struct hp_wmi_hwmon_priv *priv, u8 speed) { - u8 fan_speed[2] =3D { HP_FAN_SPEED_AUTOMATIC, HP_FAN_SPEED_AUTOMATIC }; + u8 fan_speed[2]; int ret; =20 - ret =3D hp_wmi_perform_query(HPWMI_FAN_SPEED_SET_QUERY, HPWMI_GM, - &fan_speed, sizeof(fan_speed), 0); - - return ret; -} + fan_speed[CPU_FAN] =3D speed; + fan_speed[GPU_FAN] =3D speed; =20 -static int hp_wmi_fan_speed_max_reset(void) -{ - int ret; + /* + * GPU fan speed is always a little higher than CPU fan speed, we fetch + * this delta value from the fan table during hwmon init. + * Exception: Speed is set to HP_FAN_SPEED_AUTOMATIC, to revert to + * automatic mode. + */ + if (speed !=3D HP_FAN_SPEED_AUTOMATIC) + fan_speed[GPU_FAN] =3D clamp_val((unsigned int)speed + + (unsigned int)priv->gpu_delta, + 0, U8_MAX); =20 + ret =3D hp_wmi_get_fan_count_userdefine_trigger(); + if (ret < 0) + return ret; + /* Max fans need to be explicitly disabled */ ret =3D hp_wmi_fan_speed_max_set(0); - if (ret) + if (ret < 0) return ret; + ret =3D hp_wmi_perform_query(HPWMI_VICTUS_S_FAN_SPEED_SET_QUERY, HPWMI_GM, + &fan_speed, sizeof(fan_speed), 0); =20 - /* Disabling max fan speed on Victus s1xxx laptops needs a 2nd step: */ - ret =3D hp_wmi_fan_speed_reset(); return ret; } =20 -static int hp_wmi_fan_speed_max_get(void) +static int hp_wmi_fan_speed_reset(struct hp_wmi_hwmon_priv *priv) { - int val =3D 0, ret; + return hp_wmi_fan_speed_set(priv, HP_FAN_SPEED_AUTOMATIC); +} =20 - ret =3D hp_wmi_perform_query(HPWMI_FAN_SPEED_MAX_GET_QUERY, HPWMI_GM, - &val, zero_if_sup(val), sizeof(val)); +static int hp_wmi_fan_speed_max_reset(struct hp_wmi_hwmon_priv *priv) +{ + int ret; =20 + ret =3D hp_wmi_fan_speed_max_set(0); if (ret) - return ret < 0 ? ret : -EINVAL; + return ret; =20 - return val; + /* Disabling max fan speed on Victus s1xxx laptops needs a 2nd step: */ + return hp_wmi_fan_speed_reset(priv); } =20 static int __init hp_wmi_bios_2008_later(void) @@ -2108,12 +2170,45 @@ static struct platform_driver hp_wmi_driver __refda= ta =3D { .remove =3D __exit_p(hp_wmi_bios_remove), }; =20 +static int hp_wmi_apply_fan_settings(struct hp_wmi_hwmon_priv *priv) +{ + int ret; + + switch (priv->mode) { + case PWM_MODE_MAX: + if (is_victus_s_thermal_profile()) + hp_wmi_get_fan_count_userdefine_trigger(); + ret =3D hp_wmi_fan_speed_max_set(1); + return ret; + case PWM_MODE_MANUAL: + if (!is_victus_s_thermal_profile()) + return -EOPNOTSUPP; + ret =3D hp_wmi_fan_speed_set(priv, pwm_to_rpm(priv->pwm, priv)); + return ret; + case PWM_MODE_AUTO: + if (is_victus_s_thermal_profile()) { + hp_wmi_get_fan_count_userdefine_trigger(); + ret =3D hp_wmi_fan_speed_max_reset(priv); + } else { + ret =3D hp_wmi_fan_speed_max_set(0); + } + return ret; + default: + /* shouldn't happen */ + return -EINVAL; + } + + return 0; +} + static umode_t hp_wmi_hwmon_is_visible(const void *data, enum hwmon_sensor_types type, u32 attr, int channel) { switch (type) { case hwmon_pwm: + if (attr =3D=3D hwmon_pwm_input && !is_victus_s_thermal_profile()) + return 0; return 0644; case hwmon_fan: if (is_victus_s_thermal_profile()) { @@ -2134,8 +2229,10 @@ static umode_t hp_wmi_hwmon_is_visible(const void *d= ata, static int hp_wmi_hwmon_read(struct device *dev, enum hwmon_sensor_types t= ype, u32 attr, int channel, long *val) { - int ret; + struct hp_wmi_hwmon_priv *priv; + int current_rpm, ret; =20 + priv =3D dev_get_drvdata(dev); switch (type) { case hwmon_fan: if (is_victus_s_thermal_profile()) @@ -2147,16 +2244,21 @@ static int hp_wmi_hwmon_read(struct device *dev, en= um hwmon_sensor_types type, *val =3D ret; return 0; case hwmon_pwm: - switch (hp_wmi_fan_speed_max_get()) { - case 0: - /* 0 is automatic fan, which is 2 for hwmon */ - *val =3D 2; + if (attr =3D=3D hwmon_pwm_input) { + if (!is_victus_s_thermal_profile()) + return -EOPNOTSUPP; + ret =3D hp_wmi_get_fan_speed_victus_s(channel); + if (ret < 0) + return ret; + current_rpm =3D ret; + *val =3D rpm_to_pwm(current_rpm / 100, priv); return 0; - case 1: - /* 1 is max fan, which is 0 - * (no fan speed control) for hwmon - */ - *val =3D 0; + } + switch (priv->mode) { + case PWM_MODE_MAX: + case PWM_MODE_MANUAL: + case PWM_MODE_AUTO: + *val =3D priv->mode; return 0; default: /* shouldn't happen */ @@ -2170,23 +2272,47 @@ static int hp_wmi_hwmon_read(struct device *dev, en= um hwmon_sensor_types type, static int hp_wmi_hwmon_write(struct device *dev, enum hwmon_sensor_types = type, u32 attr, int channel, long val) { + struct hp_wmi_hwmon_priv *priv; + int current_rpm, ret; + + priv =3D dev_get_drvdata(dev); switch (type) { case hwmon_pwm: + if (attr =3D=3D hwmon_pwm_input) { + if (!is_victus_s_thermal_profile()) + return -EOPNOTSUPP; + /* pwm input is invalid when not in manual mode */ + if (priv->mode !=3D PWM_MODE_MANUAL) + return -EINVAL; + /* ensure pwm input is within valid fan speeds */ + priv->pwm =3D rpm_to_pwm(clamp_val(pwm_to_rpm(val, priv), + priv->min_rpm, + priv->max_rpm), + priv); + return hp_wmi_apply_fan_settings(priv); + } switch (val) { - case 0: - if (is_victus_s_thermal_profile()) - hp_wmi_get_fan_count_userdefine_trigger(); - /* 0 is no fan speed control (max), which is 1 for us */ - return hp_wmi_fan_speed_max_set(1); - case 2: - /* 2 is automatic speed control, which is 0 for us */ - if (is_victus_s_thermal_profile()) { - hp_wmi_get_fan_count_userdefine_trigger(); - return hp_wmi_fan_speed_max_reset(); - } else - return hp_wmi_fan_speed_max_set(0); + case PWM_MODE_MAX: + priv->mode =3D PWM_MODE_MAX; + return hp_wmi_apply_fan_settings(priv); + case PWM_MODE_MANUAL: + if (!is_victus_s_thermal_profile()) + return -EOPNOTSUPP; + /* + * When switching to manual mode, set fan speed to + * current RPM values to ensure a smooth transition. + */ + ret =3D hp_wmi_get_fan_speed_victus_s(channel); + if (ret < 0) + return ret; + current_rpm =3D ret; + priv->pwm =3D rpm_to_pwm(current_rpm / 100, priv); + priv->mode =3D PWM_MODE_MANUAL; + return hp_wmi_apply_fan_settings(priv); + case PWM_MODE_AUTO: + priv->mode =3D PWM_MODE_AUTO; + return hp_wmi_apply_fan_settings(priv); default: - /* we don't support manual fan speed control */ return -EINVAL; } default: @@ -2196,7 +2322,7 @@ static int hp_wmi_hwmon_write(struct device *dev, enu= m hwmon_sensor_types type, =20 static const struct hwmon_channel_info * const info[] =3D { HWMON_CHANNEL_INFO(fan, HWMON_F_INPUT, HWMON_F_INPUT), - HWMON_CHANNEL_INFO(pwm, HWMON_PWM_ENABLE), + HWMON_CHANNEL_INFO(pwm, HWMON_PWM_ENABLE | HWMON_PWM_INPUT), NULL }; =20 @@ -2211,12 +2337,57 @@ static const struct hwmon_chip_info chip_info =3D { .info =3D info, }; =20 +static int hp_wmi_setup_fan_settings(struct hp_wmi_hwmon_priv *priv) +{ + u8 fan_data[128] =3D { 0 }; + struct victus_s_fan_table *fan_table; + u8 min_rpm, max_rpm, gpu_delta; + int ret; + + /* Default behaviour on hwmon init is automatic mode */ + priv->mode =3D PWM_MODE_AUTO; + + /* Bypass all non-Victus S devices */ + if (!is_victus_s_thermal_profile()) + return 0; + + ret =3D hp_wmi_perform_query(HPWMI_VICTUS_S_GET_FAN_TABLE_QUERY, + HPWMI_GM, &fan_data, 4, sizeof(fan_data)); + if (ret) + return ret; + + fan_table =3D (struct victus_s_fan_table *)fan_data; + if (fan_table->header.num_entries =3D=3D 0 || + sizeof(struct victus_s_fan_table_header) + + sizeof(struct victus_s_fan_table_entry) * fan_table->header.num_entries > + sizeof(fan_data)) + return -EINVAL; + + min_rpm =3D fan_table->entries[0].cpu_rpm; + max_rpm =3D fan_table->entries[fan_table->header.num_entries - 1].cpu_rpm; + gpu_delta =3D fan_table->entries[0].gpu_rpm - fan_table->entries[0].cpu_r= pm; + priv->min_rpm =3D min_rpm; + priv->max_rpm =3D max_rpm; + priv->gpu_delta =3D gpu_delta; + + return 0; +} + static int hp_wmi_hwmon_init(void) { struct device *dev =3D &hp_wmi_platform_dev->dev; + struct hp_wmi_hwmon_priv *priv; struct device *hwmon; + int ret; =20 - hwmon =3D devm_hwmon_device_register_with_info(dev, "hp", &hp_wmi_driver, + priv =3D devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); + if (!priv) + return -ENOMEM; + + ret =3D hp_wmi_setup_fan_settings(priv); + if (ret) + return ret; + hwmon =3D devm_hwmon_device_register_with_info(dev, "hp", priv, &chip_info, NULL); =20 if (IS_ERR(hwmon)) { @@ -2224,6 +2395,8 @@ static int hp_wmi_hwmon_init(void) return PTR_ERR(hwmon); } =20 + hp_wmi_apply_fan_settings(priv); + return 0; } =20 --=20 2.52.0 From nobody Sat Feb 7 18:21:06 2026 Received: from mail-pl1-f180.google.com (mail-pl1-f180.google.com [209.85.214.180]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 62811272816 for ; Tue, 30 Dec 2025 14:51:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.180 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767106283; cv=none; b=VyJWxVyTbfFi6JUWjMhHX7EJXSYf/qc1Et4yRMBav2VDmIu7YZEdfs7ZLgjdNMN/o3j0PLukaBYIY71RuMI+APFyjX4Lk4JDugupMYJVzRvGU06aKpmIucp9631Eb3+rS7NGqH+Z5+lj14/O7XNd57TH8Wc7AmDl9E1kkKULYV0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767106283; c=relaxed/simple; bh=PafXgWDMvXLR2Nstor1AR1m6gZWJgpmSJIc0jQ0emsk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=izw2NHss9IHOcjOMxPjk/9nyu10PCuyPZfRP8Msslj3KVlHrcTn8gLe5Kvy1CiX8a4E6d/I6w7BKoFTZdblHQRrASRQMwhdTgKg8tJ8QJw86OHzJLowSXYYjajCJwJ8d0nDffB068ZJaEBOo+st4F1KRxOUKQvPdeScU0VStlNQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=D4WjBufF; arc=none smtp.client-ip=209.85.214.180 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="D4WjBufF" Received: by mail-pl1-f180.google.com with SMTP id d9443c01a7336-2a09d981507so73961465ad.1 for ; Tue, 30 Dec 2025 06:51:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1767106278; x=1767711078; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=xbAQovtJoKutCpVbRAys9lPE9fj9fNigF3AvHChA6z4=; b=D4WjBufFKWJRbhhoytD4vdCGmMhu9+zkffluefb8iWHWhkbSyGlsihb5EiyDdZLxco xpDywUNzYvfX5v95YvClBJo7R6ZlYMgxXYGB0pFZUx0b0aEsh+ulu8UUWwJRA4xtD0jT Lx4HDNLFPkLXbTFTcmjvpSaq1t8pWgEXbOPErmyqkYKzx+bcd6nSbB+1LkoYScN4x77N TVjadq+1uD1ZT5XMcWYUH1jdSqqpah2eoVV08gWJWRErTD6fM6rpRBBr+sYCS2tCoDld BUx/ExVeAHPy1z1WxSyWZ4RTinpR9/n9B0gkbOpkfkgaO96qOD3wAVAdsIL0tkrpkMb7 B7jw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1767106278; x=1767711078; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=xbAQovtJoKutCpVbRAys9lPE9fj9fNigF3AvHChA6z4=; b=TS7y4keBdUF/EMwa7BpwCdr0vEoVkxJGvQNgSwm/ypvelSdmgkJTY+7+ZhrOll+EAK J9UKFI78l36pv/nurEViAYe1dpq3249jq+TdcbFkwo24L+J2DdUYfwKsyIvZmUHVQFSf RgT7QcINjPgU1nnBC9gfe6wG9lWMHBGGN/4C6eLHME9xL1+0sx55uLQM+yDGQnyEywAD 1xYRrBbZzq7zjJsjEHtgFzLrxmJzk6xlIFKcJx1nFvaqqZ6jhyP1nimq/s/oYhRR8jH6 IIjtwYNgIh9FKFna/5vSc51rBwsz8Ky1otFig4RNwu7svAXu1rPx87v6lWkUvQAcjNp3 SuFA== X-Forwarded-Encrypted: i=1; AJvYcCVT2Mdl0cWvLtdvfQc1P4NLACykSwpDItK5hyJ7wXCcLcxXhhY95sl3OaAJWbURodrFCuDxE5Y+cSBrDD0=@vger.kernel.org X-Gm-Message-State: AOJu0YxDz/g0mVkukqmFyPx5zfXsvn0ODso8gh6V8D5SokfmRT3VtCpP JN2A0P+4cUwxwr86wMt3+s2vg7dh7fA7C8EjYCoiofjAtgyNQHi0wA7Y X-Gm-Gg: AY/fxX7riwKZoTxYbM9rtqfP7XCGOHciExSAgxsUUDKe+owS3nhHZXINXqShSNHJmeq q7gPpeghwwCjKOVCbMnZKvgBq2I8AGROU/+I59mYrFKhttrSisMtBLm4BtIiaiPudZaLmDfEGO1 gsqq4eYRLOZ1NSEIJw5w47agfp3ANnNUWamWgdfulXfj2POPbsve5dXotDdYoUClompByDNYx31 U++2DufylhxRNOij6K5WeqfVx95ZnvZ/2aRfglNd+pAFi4PLnO2zEa7/hGJKeL7ODUjYqalTmXs X2WfZK2QZ/I4RfGuznSsHkyUhiBPz326nDImcgv0PYseNyA3qr7ahoezbONgu0qpb3iqAsGBVZh WUcy0GqAluEYUCyPVbqPnaBb9n2DupRf8G9ynykqckKHTmUvwwJJ4DsLds7jy4oJLDwF2ShqXt7 vhdVzKNEQndM2nlmnuv6i8OsYVJzh9fA== X-Google-Smtp-Source: AGHT+IEus/WFmxvaHScCzlZVMv3z622sVJr0P9J3GJWro2Nxl6f1Smit9+HrdVV6jt9rstkznaDlyg== X-Received: by 2002:a17:903:2450:b0:2a0:e5c3:d149 with SMTP id d9443c01a7336-2a2f0d40410mr353178025ad.23.1767106278186; Tue, 30 Dec 2025 06:51:18 -0800 (PST) Received: from archlinux ([2405:201:1b:225c:eb9d:1fc0:f95c:bd90]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2a2f3d5d86esm301257245ad.74.2025.12.30.06.51.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Dec 2025 06:51:17 -0800 (PST) From: Krishna Chomal To: ilpo.jarvinen@linux.intel.com, hansg@kernel.org, linux@roeck-us.net Cc: platform-driver-x86@vger.kernel.org, linux-hwmon@vger.kernel.org, linux-kernel@vger.kernel.org, Krishna Chomal Subject: [PATCH v2 2/2] platform/x86: hp-wmi: implement fan keep-alive Date: Tue, 30 Dec 2025 20:20:53 +0530 Message-ID: <20251230145053.516196-3-krishna.chomal108@gmail.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20251230145053.516196-1-krishna.chomal108@gmail.com> References: <20251225142310.204831-1-krishna.chomal108@gmail.com> <20251230145053.516196-1-krishna.chomal108@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The firmware on some HP laptops automatically reverts the fan speed control to "Auto" mode after a 120 second timeout window. To ensure that the user-selected fan profile (Max/Manual) persists, implement a keep-alive mechanism that periodically refreshes the fan mode trigger before the timeout occurs. - Introduce a delayed workqueue to trigger the fan mode refresh every 90 seconds, ensuring the system maintains the correct fan mode setting. - Integrate the refresh mechanism into hp_wmi_hwmon_enforce_ctx() to start, update or cancel the keep-alive process based on the current fan mode. This ensures that the driver stays in sync with the hardware. Tested on: HP Omen 16-wf1xxx (board ID 8C78) Signed-off-by: Krishna Chomal --- Changes in v2: - Explicitly specify time unit in KEEP_ALIVE_DELAY macro - Handle work rescheduling directly in switch/case --- drivers/platform/x86/hp/hp-wmi.c | 46 +++++++++++++++++++++++++++++--- 1 file changed, 43 insertions(+), 3 deletions(-) diff --git a/drivers/platform/x86/hp/hp-wmi.c b/drivers/platform/x86/hp/hp-= wmi.c index ef419575174c..cf9327e1f40e 100644 --- a/drivers/platform/x86/hp/hp-wmi.c +++ b/drivers/platform/x86/hp/hp-wmi.c @@ -34,6 +34,7 @@ #include #include #include +#include =20 MODULE_AUTHOR("Matthew Garrett "); MODULE_DESCRIPTION("HP laptop WMI driver"); @@ -368,6 +369,7 @@ struct hp_wmi_hwmon_priv { u8 gpu_delta; u8 mode; u8 pwm; + struct delayed_work keep_alive_dwork; }; =20 struct victus_s_fan_table_header { @@ -386,6 +388,12 @@ struct victus_s_fan_table { struct victus_s_fan_table_entry entries[]; } __packed; =20 +/* + * 90s delay to prevent the firmware from resetting fan mode after fixed + * 120s timeout + */ +#define KEEP_ALIVE_DELAY_SECS 90 + static inline u8 rpm_to_pwm(u8 rpm, struct hp_wmi_hwmon_priv *priv) { return fixp_linear_interpolate(0, 0, priv->max_rpm, U8_MAX, @@ -2093,6 +2101,7 @@ static int __init hp_wmi_bios_setup(struct platform_d= evice *device) static void __exit hp_wmi_bios_remove(struct platform_device *device) { int i; + struct hp_wmi_hwmon_priv *ctx; =20 for (i =3D 0; i < rfkill2_count; i++) { rfkill_unregister(rfkill2[i].rfkill); @@ -2111,6 +2120,10 @@ static void __exit hp_wmi_bios_remove(struct platfor= m_device *device) rfkill_unregister(wwan_rfkill); rfkill_destroy(wwan_rfkill); } + + ctx =3D platform_get_drvdata(device); + if (ctx) + cancel_delayed_work_sync(&ctx->keep_alive_dwork); } =20 static int hp_wmi_resume_handler(struct device *device) @@ -2179,12 +2192,20 @@ static int hp_wmi_apply_fan_settings(struct hp_wmi_= hwmon_priv *priv) if (is_victus_s_thermal_profile()) hp_wmi_get_fan_count_userdefine_trigger(); ret =3D hp_wmi_fan_speed_max_set(1); - return ret; + if (ret < 0) + return ret; + schedule_delayed_work(&priv->keep_alive_dwork, + secs_to_jiffies(KEEP_ALIVE_DELAY_SECS)); + return 0; case PWM_MODE_MANUAL: if (!is_victus_s_thermal_profile()) return -EOPNOTSUPP; ret =3D hp_wmi_fan_speed_set(priv, pwm_to_rpm(priv->pwm, priv)); - return ret; + if (ret < 0) + return ret; + schedule_delayed_work(&priv->keep_alive_dwork, + secs_to_jiffies(KEEP_ALIVE_DELAY_SECS)); + return 0; case PWM_MODE_AUTO: if (is_victus_s_thermal_profile()) { hp_wmi_get_fan_count_userdefine_trigger(); @@ -2192,7 +2213,10 @@ static int hp_wmi_apply_fan_settings(struct hp_wmi_h= wmon_priv *priv) } else { ret =3D hp_wmi_fan_speed_max_set(0); } - return ret; + if (ret < 0) + return ret; + cancel_delayed_work_sync(&priv->keep_alive_dwork); + return 0; default: /* shouldn't happen */ return -EINVAL; @@ -2337,6 +2361,20 @@ static const struct hwmon_chip_info chip_info =3D { .info =3D info, }; =20 +static void hp_wmi_hwmon_keep_alive_handler(struct work_struct *work) +{ + struct delayed_work *dwork; + struct hp_wmi_hwmon_priv *ctx; + + dwork =3D to_delayed_work(work); + ctx =3D container_of(dwork, struct hp_wmi_hwmon_priv, keep_alive_dwork); + /* + * Re-apply the current hwmon context settings. + * NOTE: hp_wmi_apply_fan_settings will handle the re-scheduling. + */ + hp_wmi_apply_fan_settings(ctx); +} + static int hp_wmi_setup_fan_settings(struct hp_wmi_hwmon_priv *priv) { u8 fan_data[128] =3D { 0 }; @@ -2395,6 +2433,8 @@ static int hp_wmi_hwmon_init(void) return PTR_ERR(hwmon); } =20 + INIT_DELAYED_WORK(&priv->keep_alive_dwork, hp_wmi_hwmon_keep_alive_handle= r); + platform_set_drvdata(hp_wmi_platform_dev, priv); hp_wmi_apply_fan_settings(priv); =20 return 0; --=20 2.52.0