From: Antheas Kapenekakis <lkml@antheas.dev>
To: platform-driver-x86@vger.kernel.org
Cc: linux-hwmon@vger.kernel.org, linux-doc@vger.kernel.org,
linux-pm@vger.kernel.org, Guenter Roeck <linux@roeck-us.net>,
Jean Delvare <jdelvare@suse.com>,
Jonathan Corbet <corbet@lwn.net>,
Joaquin Ignacio Aramendia <samsagax@gmail.com>,
Derek J Clark <derekjohn.clark@gmail.com>,
Kevin Greenberg <kdgreenberg234@protonmail.com>,
Joshua Tam <csinaction@pm.me>,
Parth Menon <parthasarathymenon@gmail.com>,
Eileen <eileen@one-netbook.com>,
Antheas Kapenekakis <lkml@antheas.dev>
Subject: [PATCH v3 12/12] platform/x86: oxpec: Adhere to sysfs-class-hwmon and enable pwm on 2
Date: Sun, 9 Mar 2025 12:21:13 +0100 [thread overview]
Message-ID: <20250309112114.1177361-13-lkml@antheas.dev> (raw)
In-Reply-To: <20250309112114.1177361-1-lkml@antheas.dev>
Currently, the driver does not adhere to the sysfs-class-hwmon
specification: 0 is used for auto fan control and 1 is used for manual
control. However, it is expected that 0 sets the fan to full speed,
1 sets the fan to manual, and then 2 is used for automatic control.
Therefore, change the sysfs API to reflect this and enable pwm on 2.
As we are breaking the ABI for this driver, rename oxpec to oxp_ec,
reflecting the naming convention used by other drivers, to allow for
a smooth migration in current userspace programs.
Closes: https://lore.kernel.org/linux-hwmon/20241027174836.8588-1-derekjohn.clark@gmail.com/
Signed-off-by: Antheas Kapenekakis <lkml@antheas.dev>
---
drivers/platform/x86/oxpec.c | 37 ++++++++++++++++++++++++++++++++----
1 file changed, 33 insertions(+), 4 deletions(-)
diff --git a/drivers/platform/x86/oxpec.c b/drivers/platform/x86/oxpec.c
index a06a7c54aa08..0b13baf190fe 100644
--- a/drivers/platform/x86/oxpec.c
+++ b/drivers/platform/x86/oxpec.c
@@ -938,7 +938,27 @@ static int oxp_platform_read(struct device *dev, enum hwmon_sensor_types type,
case hwmon_pwm_input:
return oxp_pwm_input_read(val);
case hwmon_pwm_enable:
- return oxp_pwm_read(val);
+ ret = oxp_pwm_read(val);
+ if (ret)
+ return ret;
+
+ /* Check for auto and return 2 */
+ if (!*val) {
+ *val = 2;
+ return 0;
+ }
+
+ /* Return 0 if at full fan speed, 1 otherwise */
+ ret = oxp_pwm_fan_speed(val);
+ if (ret)
+ return ret;
+
+ if (*val == 255)
+ *val = 0;
+ else
+ *val = 1;
+
+ return 0;
default:
break;
}
@@ -952,15 +972,24 @@ static int oxp_platform_read(struct device *dev, enum hwmon_sensor_types type,
static int oxp_platform_write(struct device *dev, enum hwmon_sensor_types type,
u32 attr, int channel, long val)
{
+ int ret;
+
switch (type) {
case hwmon_pwm:
switch (attr) {
case hwmon_pwm_enable:
if (val == 1)
return oxp_pwm_enable();
- else if (val == 0)
+ else if (val == 2)
return oxp_pwm_disable();
- return -EINVAL;
+ else if (val != 0)
+ return -EINVAL;
+
+ /* Enable PWM and set to max speed */
+ ret = oxp_pwm_enable();
+ if (ret)
+ return ret;
+ return oxp_pwm_input_write(255);
case hwmon_pwm_input:
return oxp_pwm_input_write(val);
default:
@@ -1025,7 +1054,7 @@ static int oxp_platform_probe(struct platform_device *pdev)
struct device *dev = &pdev->dev;
struct device *hwdev;
- hwdev = devm_hwmon_device_register_with_info(dev, "oxpec", NULL,
+ hwdev = devm_hwmon_device_register_with_info(dev, "oxp_ec", NULL,
&oxp_ec_chip_info, NULL);
if (charge_behaviour_supported())
--
2.48.1
next prev parent reply other threads:[~2025-03-09 11:21 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-09 11:21 [PATCH v3 00/12] hwmon: (oxpsensors) Add devices, features, fix ABI and move to platform/x86 Antheas Kapenekakis
2025-03-09 11:21 ` [PATCH v3 01/12] hwmon: (oxp-sensors) Distinguish the X1 variants Antheas Kapenekakis
2025-03-09 15:24 ` Guenter Roeck
2025-03-10 23:04 ` Derek John Clark
2025-03-09 11:21 ` [PATCH v3 02/12] hwmon: (oxp-sensors) Add all OneXFly variants Antheas Kapenekakis
2025-03-09 15:24 ` Guenter Roeck
2025-03-10 23:03 ` Derek John Clark
2025-03-10 23:19 ` Antheas Kapenekakis
2025-03-09 11:21 ` [PATCH v3 03/12] platform/x86: oxpec: Move hwmon/oxp-sensors to platform/x86 Antheas Kapenekakis
2025-03-10 23:17 ` Derek John Clark
2025-03-10 23:30 ` Antheas Kapenekakis
2025-03-10 23:39 ` Guenter Roeck
2025-03-09 11:21 ` [PATCH v3 04/12] ABI: testing: add tt_toggle and tt_led entries Antheas Kapenekakis
2025-03-10 23:25 ` Derek John Clark
2025-03-10 23:37 ` Antheas Kapenekakis
2025-03-09 11:21 ` [PATCH v3 05/12] power: supply: add inhibit-charge-s0 to charge_behaviour Antheas Kapenekakis
2025-03-10 23:30 ` Derek John Clark
2025-03-09 11:21 ` [PATCH v3 06/12] platform/x86: oxpec: Add charge threshold and behaviour to OneXPlayer Antheas Kapenekakis
2025-03-10 23:50 ` Derek John Clark
2025-03-11 0:02 ` Antheas Kapenekakis
2025-03-11 14:09 ` kernel test robot
2025-03-09 11:21 ` [PATCH v3 07/12] platform/x86: oxpec: Rename ec group to tt_toggle Antheas Kapenekakis
2025-03-10 23:51 ` Derek John Clark
2025-03-09 11:21 ` [PATCH v3 08/12] platform/x86: oxpec: Add turbo led support to X1 devices Antheas Kapenekakis
2025-03-10 23:57 ` Derek John Clark
2025-03-09 11:21 ` [PATCH v3 09/12] platform/x86: oxpec: Move pwm_enable read to its own function Antheas Kapenekakis
2025-03-10 23:26 ` Derek John Clark
2025-03-09 11:21 ` [PATCH v3 10/12] platform/x86: oxpec: Move pwm value read/write to separate functions Antheas Kapenekakis
2025-03-10 23:58 ` Derek John Clark
2025-03-09 11:21 ` [PATCH v3 11/12] platform/x86: oxpec: Move fan speed read to separate function Antheas Kapenekakis
2025-03-10 23:58 ` Derek John Clark
2025-03-09 11:21 ` Antheas Kapenekakis [this message]
2025-03-11 0:02 ` [PATCH v3 12/12] platform/x86: oxpec: Adhere to sysfs-class-hwmon and enable pwm on 2 Derek John Clark
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250309112114.1177361-13-lkml@antheas.dev \
--to=lkml@antheas.dev \
--cc=corbet@lwn.net \
--cc=csinaction@pm.me \
--cc=derekjohn.clark@gmail.com \
--cc=eileen@one-netbook.com \
--cc=jdelvare@suse.com \
--cc=kdgreenberg234@protonmail.com \
--cc=linux-doc@vger.kernel.org \
--cc=linux-hwmon@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=parthasarathymenon@gmail.com \
--cc=platform-driver-x86@vger.kernel.org \
--cc=samsagax@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).