* [PATCH 01/10] hwmon: (oxp-sensors) Distinguish the X1 variants
2024-12-26 11:27 [PATCH 00/10] hwmon: (oxpsensors) Add 2024 OneXPlayer line-up, add charge limiting and turbo LED, fix ABI Antheas Kapenekakis
@ 2024-12-26 11:27 ` Antheas Kapenekakis
2024-12-26 11:27 ` [PATCH 02/10] hwmon: (oxp-sensors) Add all OneXFly variants Antheas Kapenekakis
` (9 subsequent siblings)
10 siblings, 0 replies; 18+ messages in thread
From: Antheas Kapenekakis @ 2024-12-26 11:27 UTC (permalink / raw)
To: linux-hwmon
Cc: linux-doc, linux-pm, Guenter Roeck, Jean Delvare, Jonathan Corbet,
Joaquin Ignacio Aramendia, Derek J Clark, Kevin Greenberg,
Joshua Tam, Parth Menon, Eileen, Antheas Kapenekakis
Currently, the oxp-sensors driver fuzzy matches the X1 variants. Luckily,
X1 and X1 mini share most hardware features so this works. However, they
are completely different product lines, and there is an expectation that
OneXPlayer will release more devices in the X1 line that may have
differences.
Therefore, distinguish the 3 devices that currently exist in the market.
These are the OneXPlayer X1 AMD and Intel variants, and the X1 mini which
only has an AMD variant. As far as registers go, all three support the
current driver functionality.
Signed-off-by: Antheas Kapenekakis <lkml@antheas.dev>
---
drivers/hwmon/oxp-sensors.c | 16 +++++++++++++++-
1 file changed, 15 insertions(+), 1 deletion(-)
diff --git a/drivers/hwmon/oxp-sensors.c b/drivers/hwmon/oxp-sensors.c
index 83730d931824..5cb0da3e5d54 100644
--- a/drivers/hwmon/oxp-sensors.c
+++ b/drivers/hwmon/oxp-sensors.c
@@ -205,7 +205,21 @@ static const struct dmi_system_id dmi_table[] = {
{
.matches = {
DMI_MATCH(DMI_BOARD_VENDOR, "ONE-NETBOOK"),
- DMI_MATCH(DMI_BOARD_NAME, "ONEXPLAYER X1"),
+ DMI_EXACT_MATCH(DMI_BOARD_NAME, "ONEXPLAYER X1 A"),
+ },
+ .driver_data = (void *)oxp_x1,
+ },
+ {
+ .matches = {
+ DMI_MATCH(DMI_BOARD_VENDOR, "ONE-NETBOOK"),
+ DMI_EXACT_MATCH(DMI_BOARD_NAME, "ONEXPLAYER X1 i"),
+ },
+ .driver_data = (void *)oxp_x1,
+ },
+ {
+ .matches = {
+ DMI_MATCH(DMI_BOARD_VENDOR, "ONE-NETBOOK"),
+ DMI_EXACT_MATCH(DMI_BOARD_NAME, "ONEXPLAYER X1 mini"),
},
.driver_data = (void *)oxp_x1,
},
--
2.47.1
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH 02/10] hwmon: (oxp-sensors) Add all OneXFly variants
2024-12-26 11:27 [PATCH 00/10] hwmon: (oxpsensors) Add 2024 OneXPlayer line-up, add charge limiting and turbo LED, fix ABI Antheas Kapenekakis
2024-12-26 11:27 ` [PATCH 01/10] hwmon: (oxp-sensors) Distinguish the X1 variants Antheas Kapenekakis
@ 2024-12-26 11:27 ` Antheas Kapenekakis
2024-12-26 11:27 ` [PATCH 03/10] ABI: testing: sysfs-class-power: add BypassS0 charge_type Antheas Kapenekakis
` (8 subsequent siblings)
10 siblings, 0 replies; 18+ messages in thread
From: Antheas Kapenekakis @ 2024-12-26 11:27 UTC (permalink / raw)
To: linux-hwmon
Cc: linux-doc, linux-pm, Guenter Roeck, Jean Delvare, Jonathan Corbet,
Joaquin Ignacio Aramendia, Derek J Clark, Kevin Greenberg,
Joshua Tam, Parth Menon, Eileen, Antheas Kapenekakis
Currently, the driver only has the F1 OneXFly variant, which was based
on the 7000 AMD platform. Add its special editions: F1 EVA-01, F1 OLED.
F1 OLED might have been a dev unit, but it is supported by OneXConsole
with the same features so add it. Then add the F1L variant which is
based on the 8000 AMD platform and the F1Pro and its special edition
EVA-02.
One might ask why not just fuzzy match. Well, EVA-02 is a variant of
F1Pro which is a Strix Point handheld, but does not have F1Pro in its
name. This makes it risky to fuzzy match, as special variants in the
future from different platforms might not have the same feature set
or registers.
By happenstance, all current devices use the same registers. For the
charge limitting feature on this series, only F1Pro/X1 (AMD) were
released with it, but OneXPlayer is providing bios updates for F1, F1L,
X1 Mini units that use the same register, so treat all of them the same.
Signed-off-by: Antheas Kapenekakis <lkml@antheas.dev>
---
drivers/hwmon/oxp-sensors.c | 35 +++++++++++++++++++++++++++++++++++
1 file changed, 35 insertions(+)
diff --git a/drivers/hwmon/oxp-sensors.c b/drivers/hwmon/oxp-sensors.c
index 5cb0da3e5d54..6aed7b3c8674 100644
--- a/drivers/hwmon/oxp-sensors.c
+++ b/drivers/hwmon/oxp-sensors.c
@@ -188,6 +188,41 @@ static const struct dmi_system_id dmi_table[] = {
},
.driver_data = (void *)oxp_fly,
},
+ {
+ .matches = {
+ DMI_MATCH(DMI_BOARD_VENDOR, "ONE-NETBOOK"),
+ DMI_EXACT_MATCH(DMI_BOARD_NAME, "ONEXPLAYER F1 EVA-01"),
+ },
+ .driver_data = (void *)oxp_fly,
+ },
+ {
+ .matches = {
+ DMI_MATCH(DMI_BOARD_VENDOR, "ONE-NETBOOK"),
+ DMI_EXACT_MATCH(DMI_BOARD_NAME, "ONEXPLAYER F1 OLED"),
+ },
+ .driver_data = (void *)oxp_fly,
+ },
+ {
+ .matches = {
+ DMI_MATCH(DMI_BOARD_VENDOR, "ONE-NETBOOK"),
+ DMI_EXACT_MATCH(DMI_BOARD_NAME, "ONEXPLAYER F1L"),
+ },
+ .driver_data = (void *)oxp_fly,
+ },
+ {
+ .matches = {
+ DMI_MATCH(DMI_BOARD_VENDOR, "ONE-NETBOOK"),
+ DMI_EXACT_MATCH(DMI_BOARD_NAME, "ONEXPLAYER F1Pro"),
+ },
+ .driver_data = (void *)oxp_fly,
+ },
+ {
+ .matches = {
+ DMI_MATCH(DMI_BOARD_VENDOR, "ONE-NETBOOK"),
+ DMI_EXACT_MATCH(DMI_BOARD_NAME, "ONEXPLAYER F1 EVA-02"),
+ },
+ .driver_data = (void *)oxp_fly,
+ },
{
.matches = {
DMI_MATCH(DMI_BOARD_VENDOR, "ONE-NETBOOK"),
--
2.47.1
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH 03/10] ABI: testing: sysfs-class-power: add BypassS0 charge_type
2024-12-26 11:27 [PATCH 00/10] hwmon: (oxpsensors) Add 2024 OneXPlayer line-up, add charge limiting and turbo LED, fix ABI Antheas Kapenekakis
2024-12-26 11:27 ` [PATCH 01/10] hwmon: (oxp-sensors) Distinguish the X1 variants Antheas Kapenekakis
2024-12-26 11:27 ` [PATCH 02/10] hwmon: (oxp-sensors) Add all OneXFly variants Antheas Kapenekakis
@ 2024-12-26 11:27 ` Antheas Kapenekakis
2024-12-26 11:27 ` [PATCH 04/10] hwmon: (oxp-sensors) Add charge threshold and bypass to OneXPlayer Antheas Kapenekakis
` (7 subsequent siblings)
10 siblings, 0 replies; 18+ messages in thread
From: Antheas Kapenekakis @ 2024-12-26 11:27 UTC (permalink / raw)
To: linux-hwmon
Cc: linux-doc, linux-pm, Guenter Roeck, Jean Delvare, Jonathan Corbet,
Joaquin Ignacio Aramendia, Derek J Clark, Kevin Greenberg,
Joshua Tam, Parth Menon, Eileen, Antheas Kapenekakis
OneXPlayer devices support a conditional bypass type, in which the
device will only perform the battery bypass while in the S0 state.
Therefore, add BypassS0, which is a state in which the device
conditionally bypasses the battery only in the S0 state.
Signed-off-by: Antheas Kapenekakis <lkml@antheas.dev>
---
Documentation/ABI/testing/sysfs-class-power | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/Documentation/ABI/testing/sysfs-class-power b/Documentation/ABI/testing/sysfs-class-power
index 45180b62d426..1f5a56aa5c70 100644
--- a/Documentation/ABI/testing/sysfs-class-power
+++ b/Documentation/ABI/testing/sysfs-class-power
@@ -404,12 +404,16 @@ Description:
The charger bypasses the charging path around the
integrated converter allowing for a "smart" wall
adaptor to perform the power conversion externally.
+ BypassS0:
+ Same as Bypass, but the device automatically enables
+ bypass only while on the S0 state and disables it when
+ it powers off or during sleep.
Access: Read, Write
Valid values:
"Unknown", "N/A", "Trickle", "Fast", "Standard",
- "Adaptive", "Custom", "Long Life", "Bypass"
+ "Adaptive", "Custom", "Long Life", "Bypass", "BypassS0"
What: /sys/class/power_supply/<supply_name>/charge_term_current
Date: July 2014
--
2.47.1
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH 04/10] hwmon: (oxp-sensors) Add charge threshold and bypass to OneXPlayer
2024-12-26 11:27 [PATCH 00/10] hwmon: (oxpsensors) Add 2024 OneXPlayer line-up, add charge limiting and turbo LED, fix ABI Antheas Kapenekakis
` (2 preceding siblings ...)
2024-12-26 11:27 ` [PATCH 03/10] ABI: testing: sysfs-class-power: add BypassS0 charge_type Antheas Kapenekakis
@ 2024-12-26 11:27 ` Antheas Kapenekakis
2025-01-07 17:15 ` Guenter Roeck
2024-12-26 11:27 ` [PATCH 05/10] hwmon: (oxp-sensors) Rename ec group to tt_toggle Antheas Kapenekakis
` (6 subsequent siblings)
10 siblings, 1 reply; 18+ messages in thread
From: Antheas Kapenekakis @ 2024-12-26 11:27 UTC (permalink / raw)
To: linux-hwmon
Cc: linux-doc, linux-pm, Guenter Roeck, Jean Delvare, Jonathan Corbet,
Joaquin Ignacio Aramendia, Derek J Clark, Kevin Greenberg,
Joshua Tam, Parth Menon, Eileen, Antheas Kapenekakis
With the X1 (AMD), OneXPlayer added a charge limit and charge bypass to
their devices. Charge limit allows for choosing an arbitrary battery
charge setpoint in percentages. Charge bypass allows to instruct the
device to stop charging either when its on or always.
This feature was then extended for the F1Pro as well. OneXPlayer also
released BIOS updates for the X1 Mini, X1 (Intel), and F1 devices that
add support for this feature. Therefore, enable it for all F1 and
X1 devices.
Add both of these under the standard sysfs battery endpoints for them,
by looking for the battery. OneXPlayer devices have a single battery.
Signed-off-by: Antheas Kapenekakis <lkml@antheas.dev>
---
drivers/hwmon/oxp-sensors.c | 206 ++++++++++++++++++++++++++++++++++++
1 file changed, 206 insertions(+)
diff --git a/drivers/hwmon/oxp-sensors.c b/drivers/hwmon/oxp-sensors.c
index 6aed7b3c8674..8683d708d5a2 100644
--- a/drivers/hwmon/oxp-sensors.c
+++ b/drivers/hwmon/oxp-sensors.c
@@ -26,6 +26,7 @@
#include <linux/module.h>
#include <linux/platform_device.h>
#include <linux/processor.h>
+#include <acpi/battery.h>
/* Handle ACPI lock mechanism */
static u32 oxp_mutex;
@@ -89,6 +90,35 @@ static enum oxp_board board;
#define OXP_TURBO_RETURN_VAL 0x00 /* Common return val */
+#define OXP_X1_CHARGE_LIMIT_REG 0xA3 /* X1 charge limit (%) */
+#define OXP_X1_CHARGE_BYPASS_REG 0xA4 /* X1 bypass charging */
+
+#define OXP_X1_CHARGE_BYPASS_MASK_S0 0x01
+/*
+ * Cannot control S3, S5 individually.
+ * X1 Mask is 0x0A, OneXFly F1Pro is just 0x02
+ * but the extra bit on the X1 does nothing.
+ */
+#define OXP_X1_CHARGE_BYPASS_MASK_S3S5 0x02
+
+enum charge_type_value_index {
+ CT_OFF,
+ CT_S0,
+ CT_S5,
+};
+
+static u8 charge_type_values_x1[] = {
+ [CT_OFF] = 0x00,
+ [CT_S0] = OXP_X1_CHARGE_BYPASS_MASK_S0,
+ [CT_S5] = OXP_X1_CHARGE_BYPASS_MASK_S0 | OXP_X1_CHARGE_BYPASS_MASK_S3S5,
+};
+
+static const char * const charge_type_strings[] = {
+ [CT_OFF] = "Standard",
+ [CT_S0] = "BypassS0",
+ [CT_S5] = "Bypass",
+};
+
static const struct dmi_system_id dmi_table[] = {
{
.matches = {
@@ -429,6 +459,177 @@ static ssize_t tt_toggle_show(struct device *dev,
static DEVICE_ATTR_RW(tt_toggle);
+/* Callbacks for turbo toggle attribute */
+static bool charge_control_supported(void)
+{
+ switch (board) {
+ case oxp_x1:
+ case oxp_fly:
+ return 1;
+ default:
+ break;
+ }
+ return 0;
+}
+
+static ssize_t charge_type_store(struct device *dev,
+ struct device_attribute *attr, const char *buf,
+ size_t count)
+{
+ u64 val, reg;
+ int ret;
+
+ ret = __sysfs_match_string(charge_type_strings,
+ ARRAY_SIZE(charge_type_strings), buf);
+ if (ret < 0)
+ return ret;
+
+ switch (board) {
+ case oxp_x1:
+ case oxp_fly:
+ val = charge_type_values_x1[ret];
+ reg = OXP_X1_CHARGE_BYPASS_REG;
+ break;
+ default:
+ return -EINVAL;
+ }
+
+ ret = write_to_ec(reg, val);
+ if (ret < 0)
+ return ret;
+
+ return count;
+}
+
+static ssize_t charge_type_show(struct device *dev,
+ struct device_attribute *attr, char *buf)
+{
+ int ret;
+ u8 reg;
+ long val;
+ const u8 *vals;
+ char *str;
+
+ switch (board) {
+ case oxp_x1:
+ case oxp_fly:
+ vals = charge_type_values_x1;
+ reg = OXP_X1_CHARGE_BYPASS_REG;
+ break;
+ default:
+ return -EINVAL;
+ }
+
+ ret = read_from_ec(reg, 1, &val);
+ if (ret < 0)
+ return ret;
+
+ str = (char *) charge_type_strings[0];
+ for (ret = 0; ret < ARRAY_SIZE(charge_type_strings); ret++) {
+ if (val == vals[ret]) {
+ str = (char *) charge_type_strings[ret];
+ break;
+ }
+ }
+
+ return sysfs_emit(buf, "%s\n", str);
+}
+
+static DEVICE_ATTR_RW(charge_type);
+
+static ssize_t charge_control_end_threshold_store(struct device *dev,
+ struct device_attribute *attr, const char *buf,
+ size_t count)
+{
+ u64 val, reg;
+ int ret;
+
+ ret = kstrtou64(buf, 10, &val);
+ if (ret < 0)
+ return ret;
+
+ if (val > 100)
+ return -EINVAL;
+
+ switch (board) {
+ case oxp_x1:
+ case oxp_fly:
+ reg = OXP_X1_CHARGE_LIMIT_REG;
+ break;
+ default:
+ return -EINVAL;
+ }
+
+ ret = write_to_ec(reg, val);
+ if (ret < 0)
+ return ret;
+
+ return count;
+}
+
+static ssize_t charge_control_end_threshold_show(struct device *dev,
+ struct device_attribute *attr, char *buf)
+{
+ int ret;
+ u8 reg;
+ long val;
+
+ switch (board) {
+ case oxp_x1:
+ case oxp_fly:
+ reg = OXP_X1_CHARGE_LIMIT_REG;
+ break;
+ default:
+ return -EINVAL;
+ }
+
+ ret = read_from_ec(reg, 1, &val);
+ if (ret < 0)
+ return ret;
+
+ return sysfs_emit(buf, "%ld\n", val);
+}
+
+static DEVICE_ATTR_RW(charge_control_end_threshold);
+
+static int oxp_battery_add(struct power_supply *battery, struct acpi_battery_hook *hook)
+{
+ /* OneXPlayer devices only have one battery. */
+ if (strcmp(battery->desc->name, "BAT0") != 0 &&
+ strcmp(battery->desc->name, "BAT1") != 0 &&
+ strcmp(battery->desc->name, "BATC") != 0 &&
+ strcmp(battery->desc->name, "BATT") != 0)
+ return -ENODEV;
+
+ if (device_create_file(&battery->dev,
+ &dev_attr_charge_control_end_threshold))
+ return -ENODEV;
+
+ if (device_create_file(&battery->dev,
+ &dev_attr_charge_type)) {
+ device_remove_file(&battery->dev,
+ &dev_attr_charge_control_end_threshold);
+ return -ENODEV;
+ }
+
+ return 0;
+}
+
+static int oxp_battery_remove(struct power_supply *battery, struct acpi_battery_hook *hook)
+{
+ device_remove_file(&battery->dev,
+ &dev_attr_charge_control_end_threshold);
+ device_remove_file(&battery->dev,
+ &dev_attr_charge_type);
+ return 0;
+}
+
+static struct acpi_battery_hook battery_hook = {
+ .add_battery = oxp_battery_add,
+ .remove_battery = oxp_battery_remove,
+ .name = "OneXPlayer Battery",
+};
+
/* PWM enable/disable functions */
static int oxp_pwm_enable(void)
{
@@ -746,6 +947,9 @@ static int __init oxp_platform_init(void)
platform_create_bundle(&oxp_platform_driver,
oxp_platform_probe, NULL, 0, NULL, 0);
+ if (charge_control_supported())
+ battery_hook_register(&battery_hook);
+
return PTR_ERR_OR_ZERO(oxp_platform_device);
}
@@ -753,6 +957,8 @@ static void __exit oxp_platform_exit(void)
{
platform_device_unregister(oxp_platform_device);
platform_driver_unregister(&oxp_platform_driver);
+ if (charge_control_supported())
+ battery_hook_unregister(&battery_hook);
}
MODULE_DEVICE_TABLE(dmi, dmi_table);
--
2.47.1
^ permalink raw reply related [flat|nested] 18+ messages in thread* Re: [PATCH 04/10] hwmon: (oxp-sensors) Add charge threshold and bypass to OneXPlayer
2024-12-26 11:27 ` [PATCH 04/10] hwmon: (oxp-sensors) Add charge threshold and bypass to OneXPlayer Antheas Kapenekakis
@ 2025-01-07 17:15 ` Guenter Roeck
2025-01-07 17:19 ` Antheas Kapenekakis
0 siblings, 1 reply; 18+ messages in thread
From: Guenter Roeck @ 2025-01-07 17:15 UTC (permalink / raw)
To: Antheas Kapenekakis
Cc: linux-hwmon, linux-doc, linux-pm, Jean Delvare, Jonathan Corbet,
Joaquin Ignacio Aramendia, Derek J Clark, Kevin Greenberg,
Joshua Tam, Parth Menon, Eileen
On Thu, Dec 26, 2024 at 12:27:34PM +0100, Antheas Kapenekakis wrote:
> With the X1 (AMD), OneXPlayer added a charge limit and charge bypass to
> their devices. Charge limit allows for choosing an arbitrary battery
> charge setpoint in percentages. Charge bypass allows to instruct the
> device to stop charging either when its on or always.
>
> This feature was then extended for the F1Pro as well. OneXPlayer also
> released BIOS updates for the X1 Mini, X1 (Intel), and F1 devices that
> add support for this feature. Therefore, enable it for all F1 and
> X1 devices.
>
> Add both of these under the standard sysfs battery endpoints for them,
> by looking for the battery. OneXPlayer devices have a single battery.
>
This exceeds the scope of a hardware monitoring device, and even more so
with the subsequent addition of LED support.
I would suggest to move the code to drivers/platform/x86/, where
multi-function drivers in a single file are permitted.
Thanks,
Guenter
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH 04/10] hwmon: (oxp-sensors) Add charge threshold and bypass to OneXPlayer
2025-01-07 17:15 ` Guenter Roeck
@ 2025-01-07 17:19 ` Antheas Kapenekakis
0 siblings, 0 replies; 18+ messages in thread
From: Antheas Kapenekakis @ 2025-01-07 17:19 UTC (permalink / raw)
To: Guenter Roeck
Cc: linux-hwmon, linux-doc, linux-pm, Jean Delvare, Jonathan Corbet,
Joaquin Ignacio Aramendia, Derek J Clark, Kevin Greenberg,
Joshua Tam, Parth Menon, Eileen
Do you suggest I do that in patch 3 so that the first two can be
cherry picked by LTS kernels?
Also, for the latter part of the series concerning the ABI break, can
you comment on that?
Antheas
^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH 05/10] hwmon: (oxp-sensors) Rename ec group to tt_toggle
2024-12-26 11:27 [PATCH 00/10] hwmon: (oxpsensors) Add 2024 OneXPlayer line-up, add charge limiting and turbo LED, fix ABI Antheas Kapenekakis
` (3 preceding siblings ...)
2024-12-26 11:27 ` [PATCH 04/10] hwmon: (oxp-sensors) Add charge threshold and bypass to OneXPlayer Antheas Kapenekakis
@ 2024-12-26 11:27 ` Antheas Kapenekakis
2024-12-26 11:27 ` [PATCH 06/10] hwmon: (oxp-sensors) Add turbo led support to X1 devices Antheas Kapenekakis
` (5 subsequent siblings)
10 siblings, 0 replies; 18+ messages in thread
From: Antheas Kapenekakis @ 2024-12-26 11:27 UTC (permalink / raw)
To: linux-hwmon
Cc: linux-doc, linux-pm, Guenter Roeck, Jean Delvare, Jonathan Corbet,
Joaquin Ignacio Aramendia, Derek J Clark, Kevin Greenberg,
Joshua Tam, Parth Menon, Eileen, Antheas Kapenekakis
Currently, the EC group is used for the turbo button. However, the next
patch in the series adds support for the LED button in X1 devices, which
is only applicable for X1 devices. Therefore, rename it to prepare for
adding the second group.
Signed-off-by: Antheas Kapenekakis <lkml@antheas.dev>
---
drivers/hwmon/oxp-sensors.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/hwmon/oxp-sensors.c b/drivers/hwmon/oxp-sensors.c
index 8683d708d5a2..30b7020ea836 100644
--- a/drivers/hwmon/oxp-sensors.c
+++ b/drivers/hwmon/oxp-sensors.c
@@ -877,18 +877,18 @@ static const struct hwmon_channel_info * const oxp_platform_sensors[] = {
NULL,
};
-static struct attribute *oxp_ec_attrs[] = {
+static struct attribute *oxp_tt_toggle_attrs[] = {
&dev_attr_tt_toggle.attr,
NULL
};
-static struct attribute_group oxp_ec_attribute_group = {
+static struct attribute_group oxp_tt_toggle_attribute_group = {
.is_visible = tt_toggle_is_visible,
- .attrs = oxp_ec_attrs,
+ .attrs = oxp_tt_toggle_attrs,
};
static const struct attribute_group *oxp_ec_groups[] = {
- &oxp_ec_attribute_group,
+ &oxp_tt_toggle_attribute_group,
NULL
};
--
2.47.1
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH 06/10] hwmon: (oxp-sensors) Add turbo led support to X1 devices
2024-12-26 11:27 [PATCH 00/10] hwmon: (oxpsensors) Add 2024 OneXPlayer line-up, add charge limiting and turbo LED, fix ABI Antheas Kapenekakis
` (4 preceding siblings ...)
2024-12-26 11:27 ` [PATCH 05/10] hwmon: (oxp-sensors) Rename ec group to tt_toggle Antheas Kapenekakis
@ 2024-12-26 11:27 ` Antheas Kapenekakis
2024-12-26 11:27 ` [PATCH 07/10] hwmon: (oxp-sensors) Move pwm_enable read to its own function Antheas Kapenekakis
` (4 subsequent siblings)
10 siblings, 0 replies; 18+ messages in thread
From: Antheas Kapenekakis @ 2024-12-26 11:27 UTC (permalink / raw)
To: linux-hwmon
Cc: linux-doc, linux-pm, Guenter Roeck, Jean Delvare, Jonathan Corbet,
Joaquin Ignacio Aramendia, Derek J Clark, Kevin Greenberg,
Joshua Tam, Parth Menon, Eileen, Antheas Kapenekakis
The X1 and X1 mini lineups feature an LED nested within their turbo
button. When turbo takeover is not enabled, the turbo button allows
the device to switch from 18W to 25W TDP. When the device is in the
25W TDP mode, the LED is turned on.
However, when we engage turbo takeover, the turbo led remains on its
last state, which might be illuminated and cannot be currently
controlled. Therefore, add the register that controls it under sysfs,
to allow userspace to turn it off once engaging turbo takeover and
then control it as they wish.
As part of researching this topic, I verified that other OneXPlayer
devices do not have a turbo led, which makes this feature only
applicable to X1 and X1 mini devices.
Signed-off-by: Antheas Kapenekakis <lkml@antheas.dev>
---
drivers/hwmon/oxp-sensors.c | 84 +++++++++++++++++++++++++++++++++++++
1 file changed, 84 insertions(+)
diff --git a/drivers/hwmon/oxp-sensors.c b/drivers/hwmon/oxp-sensors.c
index 30b7020ea836..850e8d72be1f 100644
--- a/drivers/hwmon/oxp-sensors.c
+++ b/drivers/hwmon/oxp-sensors.c
@@ -101,6 +101,12 @@ static enum oxp_board board;
*/
#define OXP_X1_CHARGE_BYPASS_MASK_S3S5 0x02
+/* X1 Turbo LED */
+#define OXP_X1_TURBO_LED_REG 0x57
+
+#define OXP_X1_TURBO_LED_OFF 0x01
+#define OXP_X1_TURBO_LED_ON 0x02
+
enum charge_type_value_index {
CT_OFF,
CT_S0,
@@ -459,6 +465,73 @@ static ssize_t tt_toggle_show(struct device *dev,
static DEVICE_ATTR_RW(tt_toggle);
+/* Callbacks for turbo toggle attribute */
+static umode_t tt_led_is_visible(struct kobject *kobj,
+ struct attribute *attr, int n)
+{
+ switch (board) {
+ case oxp_x1:
+ return attr->mode;
+ default:
+ break;
+ }
+ return 0;
+}
+
+static ssize_t tt_led_store(struct device *dev,
+ struct device_attribute *attr, const char *buf,
+ size_t count)
+{
+ u8 reg, val;
+ int rval;
+ bool value;
+
+ rval = kstrtobool(buf, &value);
+ if (rval)
+ return rval;
+
+ switch (board) {
+ case oxp_x1:
+ reg = OXP_X1_TURBO_LED_REG;
+ val = value ? OXP_X1_TURBO_LED_ON : OXP_X1_TURBO_LED_OFF;
+ break;
+ default:
+ return -EINVAL;
+ }
+ rval = write_to_ec(reg, val);
+
+ if (rval)
+ return rval;
+
+ return count;
+}
+
+static ssize_t tt_led_show(struct device *dev,
+ struct device_attribute *attr, char *buf)
+{
+ int retval;
+ u8 reg;
+ long enval;
+ long val;
+
+ switch (board) {
+ case oxp_x1:
+ reg = OXP_2_TURBO_SWITCH_REG;
+ enval = OXP_X1_TURBO_LED_ON;
+ break;
+ default:
+ return -EINVAL;
+ }
+
+ retval = read_from_ec(reg, 1, &val);
+ if (retval)
+ return retval;
+
+ return sysfs_emit(buf, "%d\n", val == enval);
+}
+
+static DEVICE_ATTR_RW(tt_led);
+
/* Callbacks for turbo toggle attribute */
static bool charge_control_supported(void)
{
@@ -887,8 +960,19 @@ static struct attribute_group oxp_tt_toggle_attribute_group = {
.attrs = oxp_tt_toggle_attrs,
};
+static struct attribute *oxp_tt_led_attrs[] = {
+ &dev_attr_tt_led.attr,
+ NULL
+};
+
+static struct attribute_group oxp_tt_led_attribute_group = {
+ .is_visible = tt_led_is_visible,
+ .attrs = oxp_tt_led_attrs,
+};
+
static const struct attribute_group *oxp_ec_groups[] = {
&oxp_tt_toggle_attribute_group,
+ &oxp_tt_led_attribute_group,
NULL
};
--
2.47.1
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH 07/10] hwmon: (oxp-sensors) Move pwm_enable read to its own function
2024-12-26 11:27 [PATCH 00/10] hwmon: (oxpsensors) Add 2024 OneXPlayer line-up, add charge limiting and turbo LED, fix ABI Antheas Kapenekakis
` (5 preceding siblings ...)
2024-12-26 11:27 ` [PATCH 06/10] hwmon: (oxp-sensors) Add turbo led support to X1 devices Antheas Kapenekakis
@ 2024-12-26 11:27 ` Antheas Kapenekakis
2024-12-26 11:27 ` [PATCH 08/10] hwmon: (oxp-sensors) Move pwm value read/write to separate functions Antheas Kapenekakis
` (3 subsequent siblings)
10 siblings, 0 replies; 18+ messages in thread
From: Antheas Kapenekakis @ 2024-12-26 11:27 UTC (permalink / raw)
To: linux-hwmon
Cc: linux-doc, linux-pm, Guenter Roeck, Jean Delvare, Jonathan Corbet,
Joaquin Ignacio Aramendia, Derek J Clark, Kevin Greenberg,
Joshua Tam, Parth Menon, Eileen, Antheas Kapenekakis
Currently, this driver breaks sysfs by using auto as 0 and manual as 1.
However, for pwm_enable, 0 is full speed, 1 is manual, and 2 is auto.
For the correction to be possible, this means that the pwm_enable
endpoint will need access to both pwm enable and value (as for
the 0th value, the fan needs to be set to full power).
Therefore, begin by moving the current pwm_enable read to its own
function, oxp_pwm_enable.
Signed-off-by: Antheas Kapenekakis <lkml@antheas.dev>
---
drivers/hwmon/oxp-sensors.c | 50 ++++++++++++++++++++-----------------
1 file changed, 27 insertions(+), 23 deletions(-)
diff --git a/drivers/hwmon/oxp-sensors.c b/drivers/hwmon/oxp-sensors.c
index 850e8d72be1f..ff21a94bb80b 100644
--- a/drivers/hwmon/oxp-sensors.c
+++ b/drivers/hwmon/oxp-sensors.c
@@ -755,6 +755,32 @@ static int oxp_pwm_disable(void)
}
}
+static int oxp_pwm_read(long *val)
+{
+ switch (board) {
+ case orange_pi_neo:
+ return read_from_ec(ORANGEPI_SENSOR_PWM_ENABLE_REG, 1, val);
+ case aok_zoe_a1:
+ case aya_neo_2:
+ case aya_neo_air:
+ case aya_neo_air_1s:
+ case aya_neo_air_plus_mendo:
+ case aya_neo_air_pro:
+ case aya_neo_flip:
+ case aya_neo_geek:
+ case aya_neo_kun:
+ case oxp_2:
+ case oxp_fly:
+ case oxp_mini_amd:
+ case oxp_mini_amd_a07:
+ case oxp_mini_amd_pro:
+ case oxp_x1:
+ return read_from_ec(OXP_SENSOR_PWM_ENABLE_REG, 1, val);
+ default:
+ return -EOPNOTSUPP;
+ }
+}
+
/* Callbacks for hwmon interface */
static umode_t oxp_ec_hwmon_is_visible(const void *drvdata,
enum hwmon_sensor_types type, u32 attr, int channel)
@@ -852,29 +878,7 @@ static int oxp_platform_read(struct device *dev, enum hwmon_sensor_types type,
}
return 0;
case hwmon_pwm_enable:
- switch (board) {
- case orange_pi_neo:
- return read_from_ec(ORANGEPI_SENSOR_PWM_ENABLE_REG, 1, val);
- case aok_zoe_a1:
- case aya_neo_2:
- case aya_neo_air:
- case aya_neo_air_1s:
- case aya_neo_air_plus_mendo:
- case aya_neo_air_pro:
- case aya_neo_flip:
- case aya_neo_geek:
- case aya_neo_kun:
- case oxp_2:
- case oxp_fly:
- case oxp_mini_amd:
- case oxp_mini_amd_a07:
- case oxp_mini_amd_pro:
- case oxp_x1:
- return read_from_ec(OXP_SENSOR_PWM_ENABLE_REG, 1, val);
- default:
- break;
- }
- break;
+ return oxp_pwm_read(val);
default:
break;
}
--
2.47.1
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH 08/10] hwmon: (oxp-sensors) Move pwm value read/write to separate functions
2024-12-26 11:27 [PATCH 00/10] hwmon: (oxpsensors) Add 2024 OneXPlayer line-up, add charge limiting and turbo LED, fix ABI Antheas Kapenekakis
` (6 preceding siblings ...)
2024-12-26 11:27 ` [PATCH 07/10] hwmon: (oxp-sensors) Move pwm_enable read to its own function Antheas Kapenekakis
@ 2024-12-26 11:27 ` Antheas Kapenekakis
2024-12-26 11:27 ` [PATCH 09/10] hwmon: (oxp-sensors) Move fan speed read to separate function Antheas Kapenekakis
` (2 subsequent siblings)
10 siblings, 0 replies; 18+ messages in thread
From: Antheas Kapenekakis @ 2024-12-26 11:27 UTC (permalink / raw)
To: linux-hwmon
Cc: linux-doc, linux-pm, Guenter Roeck, Jean Delvare, Jonathan Corbet,
Joaquin Ignacio Aramendia, Derek J Clark, Kevin Greenberg,
Joshua Tam, Parth Menon, Eileen, Antheas Kapenekakis
Currently, this driver breaks sysfs by using auto as 0 and manual as 1.
However, for pwm_enable, 0 is full speed, 1 is manual, and 2 is auto.
For the correction to be possible, this means that the pwm_enable
endpoint will need access to both pwm enable and value (as for
the 0th value, the fan needs to be set to full power).
Therefore, move the pwm value read/write to separate functions.
Signed-off-by: Antheas Kapenekakis <lkml@antheas.dev>
---
drivers/hwmon/oxp-sensors.c | 162 +++++++++++++++++++-----------------
1 file changed, 87 insertions(+), 75 deletions(-)
diff --git a/drivers/hwmon/oxp-sensors.c b/drivers/hwmon/oxp-sensors.c
index ff21a94bb80b..56873b879dee 100644
--- a/drivers/hwmon/oxp-sensors.c
+++ b/drivers/hwmon/oxp-sensors.c
@@ -795,6 +795,91 @@ static umode_t oxp_ec_hwmon_is_visible(const void *drvdata,
}
}
+/* PWM input read/write functions */
+static int oxp_pwm_input_write(long val)
+{
+ if (val < 0 || val > 255)
+ return -EINVAL;
+ switch (board) {
+ case orange_pi_neo:
+ /* scale to range [1-244] */
+ val = ((val - 1) * 243 / 254) + 1;
+ return write_to_ec(ORANGEPI_SENSOR_PWM_REG, val);
+ case oxp_2:
+ case oxp_x1:
+ /* scale to range [0-184] */
+ val = (val * 184) / 255;
+ return write_to_ec(OXP_SENSOR_PWM_REG, val);
+ case aya_neo_2:
+ case aya_neo_air:
+ case aya_neo_air_1s:
+ case aya_neo_air_plus_mendo:
+ case aya_neo_air_pro:
+ case aya_neo_flip:
+ case aya_neo_geek:
+ case aya_neo_kun:
+ case oxp_mini_amd:
+ case oxp_mini_amd_a07:
+ /* scale to range [0-100] */
+ val = (val * 100) / 255;
+ return write_to_ec(OXP_SENSOR_PWM_REG, val);
+ case aok_zoe_a1:
+ case oxp_fly:
+ case oxp_mini_amd_pro:
+ return write_to_ec(OXP_SENSOR_PWM_REG, val);
+ default:
+ return -EOPNOTSUPP;
+ }
+}
+
+static int oxp_pwm_input_read(long *val)
+{
+ int ret;
+
+ switch (board) {
+ case orange_pi_neo:
+ ret = read_from_ec(ORANGEPI_SENSOR_PWM_REG, 1, val);
+ if (ret)
+ return ret;
+ /* scale from range [1-244] */
+ *val = ((*val - 1) * 254 / 243) + 1;
+ break;
+ case oxp_2:
+ case oxp_x1:
+ ret = read_from_ec(OXP_SENSOR_PWM_REG, 1, val);
+ if (ret)
+ return ret;
+ /* scale from range [0-184] */
+ *val = (*val * 255) / 184;
+ break;
+ case aya_neo_2:
+ case aya_neo_air:
+ case aya_neo_air_1s:
+ case aya_neo_air_plus_mendo:
+ case aya_neo_air_pro:
+ case aya_neo_flip:
+ case aya_neo_geek:
+ case aya_neo_kun:
+ case oxp_mini_amd:
+ case oxp_mini_amd_a07:
+ ret = read_from_ec(OXP_SENSOR_PWM_REG, 1, val);
+ if (ret)
+ return ret;
+ /* scale from range [0-100] */
+ *val = (*val * 255) / 100;
+ break;
+ case aok_zoe_a1:
+ case oxp_fly:
+ case oxp_mini_amd_pro:
+ default:
+ ret = read_from_ec(OXP_SENSOR_PWM_REG, 1, val);
+ if (ret)
+ return ret;
+ break;
+ }
+ return 0;
+}
+
static int oxp_platform_read(struct device *dev, enum hwmon_sensor_types type,
u32 attr, int channel, long *val)
{
@@ -835,48 +920,7 @@ static int oxp_platform_read(struct device *dev, enum hwmon_sensor_types type,
case hwmon_pwm:
switch (attr) {
case hwmon_pwm_input:
- switch (board) {
- case orange_pi_neo:
- ret = read_from_ec(ORANGEPI_SENSOR_PWM_REG, 1, val);
- if (ret)
- return ret;
- /* scale from range [1-244] */
- *val = ((*val - 1) * 254 / 243) + 1;
- break;
- case oxp_2:
- case oxp_x1:
- ret = read_from_ec(OXP_SENSOR_PWM_REG, 1, val);
- if (ret)
- return ret;
- /* scale from range [0-184] */
- *val = (*val * 255) / 184;
- break;
- case aya_neo_2:
- case aya_neo_air:
- case aya_neo_air_1s:
- case aya_neo_air_plus_mendo:
- case aya_neo_air_pro:
- case aya_neo_flip:
- case aya_neo_geek:
- case aya_neo_kun:
- case oxp_mini_amd:
- case oxp_mini_amd_a07:
- ret = read_from_ec(OXP_SENSOR_PWM_REG, 1, val);
- if (ret)
- return ret;
- /* scale from range [0-100] */
- *val = (*val * 255) / 100;
- break;
- case aok_zoe_a1:
- case oxp_fly:
- case oxp_mini_amd_pro:
- default:
- ret = read_from_ec(OXP_SENSOR_PWM_REG, 1, val);
- if (ret)
- return ret;
- break;
- }
- return 0;
+ return oxp_pwm_input_read(val);
case hwmon_pwm_enable:
return oxp_pwm_read(val);
default:
@@ -902,39 +946,7 @@ static int oxp_platform_write(struct device *dev, enum hwmon_sensor_types type,
return oxp_pwm_disable();
return -EINVAL;
case hwmon_pwm_input:
- if (val < 0 || val > 255)
- return -EINVAL;
- switch (board) {
- case orange_pi_neo:
- /* scale to range [1-244] */
- val = ((val - 1) * 243 / 254) + 1;
- return write_to_ec(ORANGEPI_SENSOR_PWM_REG, val);
- case oxp_2:
- case oxp_x1:
- /* scale to range [0-184] */
- val = (val * 184) / 255;
- return write_to_ec(OXP_SENSOR_PWM_REG, val);
- case aya_neo_2:
- case aya_neo_air:
- case aya_neo_air_1s:
- case aya_neo_air_plus_mendo:
- case aya_neo_air_pro:
- case aya_neo_flip:
- case aya_neo_geek:
- case aya_neo_kun:
- case oxp_mini_amd:
- case oxp_mini_amd_a07:
- /* scale to range [0-100] */
- val = (val * 100) / 255;
- return write_to_ec(OXP_SENSOR_PWM_REG, val);
- case aok_zoe_a1:
- case oxp_fly:
- case oxp_mini_amd_pro:
- return write_to_ec(OXP_SENSOR_PWM_REG, val);
- default:
- break;
- }
- break;
+ return oxp_pwm_input_write(val);
default:
break;
}
--
2.47.1
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH 09/10] hwmon: (oxp-sensors) Move fan speed read to separate function
2024-12-26 11:27 [PATCH 00/10] hwmon: (oxpsensors) Add 2024 OneXPlayer line-up, add charge limiting and turbo LED, fix ABI Antheas Kapenekakis
` (7 preceding siblings ...)
2024-12-26 11:27 ` [PATCH 08/10] hwmon: (oxp-sensors) Move pwm value read/write to separate functions Antheas Kapenekakis
@ 2024-12-26 11:27 ` Antheas Kapenekakis
2024-12-26 11:27 ` [PATCH 10/10] hwmon: (oxp-sensors) Adhere to sysfs-class-hwmon and enable pwm on 2 Antheas Kapenekakis
2024-12-26 21:08 ` [PATCH 00/10] hwmon: (oxpsensors) Add 2024 OneXPlayer line-up, add charge limiting and turbo LED, fix ABI Guenter Roeck
10 siblings, 0 replies; 18+ messages in thread
From: Antheas Kapenekakis @ 2024-12-26 11:27 UTC (permalink / raw)
To: linux-hwmon
Cc: linux-doc, linux-pm, Guenter Roeck, Jean Delvare, Jonathan Corbet,
Joaquin Ignacio Aramendia, Derek J Clark, Kevin Greenberg,
Joshua Tam, Parth Menon, Eileen, Antheas Kapenekakis
While not necessary for fixing the sysfs issue, fan speed will be the
only remaining value without a function. Therefore, finish the refactor
by moving it to a separate function.
Signed-off-by: Antheas Kapenekakis <lkml@antheas.dev>
---
drivers/hwmon/oxp-sensors.c | 53 ++++++++++++++++++++-----------------
1 file changed, 29 insertions(+), 24 deletions(-)
diff --git a/drivers/hwmon/oxp-sensors.c b/drivers/hwmon/oxp-sensors.c
index 56873b879dee..97bf51eba741 100644
--- a/drivers/hwmon/oxp-sensors.c
+++ b/drivers/hwmon/oxp-sensors.c
@@ -795,6 +795,34 @@ static umode_t oxp_ec_hwmon_is_visible(const void *drvdata,
}
}
+/* Fan speed read function */
+static int oxp_pwm_fan_speed(long *val)
+{
+ switch (board) {
+ case orange_pi_neo:
+ return read_from_ec(ORANGEPI_SENSOR_FAN_REG, 2, val);
+ case oxp_2:
+ case oxp_x1:
+ return read_from_ec(OXP_2_SENSOR_FAN_REG, 2, val);
+ case aok_zoe_a1:
+ case aya_neo_2:
+ case aya_neo_air:
+ case aya_neo_air_1s:
+ case aya_neo_air_plus_mendo:
+ case aya_neo_air_pro:
+ case aya_neo_flip:
+ case aya_neo_geek:
+ case aya_neo_kun:
+ case oxp_fly:
+ case oxp_mini_amd:
+ case oxp_mini_amd_a07:
+ case oxp_mini_amd_pro:
+ return read_from_ec(OXP_SENSOR_FAN_REG, 2, val);
+ default:
+ return -EOPNOTSUPP;
+ }
+}
+
/* PWM input read/write functions */
static int oxp_pwm_input_write(long val)
{
@@ -889,30 +917,7 @@ static int oxp_platform_read(struct device *dev, enum hwmon_sensor_types type,
case hwmon_fan:
switch (attr) {
case hwmon_fan_input:
- switch (board) {
- case orange_pi_neo:
- return read_from_ec(ORANGEPI_SENSOR_FAN_REG, 2, val);
- case oxp_2:
- case oxp_x1:
- return read_from_ec(OXP_2_SENSOR_FAN_REG, 2, val);
- case aok_zoe_a1:
- case aya_neo_2:
- case aya_neo_air:
- case aya_neo_air_1s:
- case aya_neo_air_plus_mendo:
- case aya_neo_air_pro:
- case aya_neo_flip:
- case aya_neo_geek:
- case aya_neo_kun:
- case oxp_fly:
- case oxp_mini_amd:
- case oxp_mini_amd_a07:
- case oxp_mini_amd_pro:
- return read_from_ec(OXP_SENSOR_FAN_REG, 2, val);
- default:
- break;
- }
- break;
+ return oxp_pwm_fan_speed(val);
default:
break;
}
--
2.47.1
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH 10/10] hwmon: (oxp-sensors) Adhere to sysfs-class-hwmon and enable pwm on 2
2024-12-26 11:27 [PATCH 00/10] hwmon: (oxpsensors) Add 2024 OneXPlayer line-up, add charge limiting and turbo LED, fix ABI Antheas Kapenekakis
` (8 preceding siblings ...)
2024-12-26 11:27 ` [PATCH 09/10] hwmon: (oxp-sensors) Move fan speed read to separate function Antheas Kapenekakis
@ 2024-12-26 11:27 ` Antheas Kapenekakis
2024-12-26 21:08 ` [PATCH 00/10] hwmon: (oxpsensors) Add 2024 OneXPlayer line-up, add charge limiting and turbo LED, fix ABI Guenter Roeck
10 siblings, 0 replies; 18+ messages in thread
From: Antheas Kapenekakis @ 2024-12-26 11:27 UTC (permalink / raw)
To: linux-hwmon
Cc: linux-doc, linux-pm, Guenter Roeck, Jean Delvare, Jonathan Corbet,
Joaquin Ignacio Aramendia, Derek J Clark, Kevin Greenberg,
Joshua Tam, Parth Menon, Eileen, Antheas Kapenekakis
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.
Signed-off-by: Antheas Kapenekakis <lkml@antheas.dev>
---
drivers/hwmon/oxp-sensors.c | 37 +++++++++++++++++++++++++++++++++----
1 file changed, 33 insertions(+), 4 deletions(-)
diff --git a/drivers/hwmon/oxp-sensors.c b/drivers/hwmon/oxp-sensors.c
index 97bf51eba741..2ea9029ac287 100644
--- a/drivers/hwmon/oxp-sensors.c
+++ b/drivers/hwmon/oxp-sensors.c
@@ -927,7 +927,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;
}
@@ -941,15 +961,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:
@@ -1014,7 +1043,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);
return PTR_ERR_OR_ZERO(hwdev);
--
2.47.1
^ permalink raw reply related [flat|nested] 18+ messages in thread* Re: [PATCH 00/10] hwmon: (oxpsensors) Add 2024 OneXPlayer line-up, add charge limiting and turbo LED, fix ABI
2024-12-26 11:27 [PATCH 00/10] hwmon: (oxpsensors) Add 2024 OneXPlayer line-up, add charge limiting and turbo LED, fix ABI Antheas Kapenekakis
` (9 preceding siblings ...)
2024-12-26 11:27 ` [PATCH 10/10] hwmon: (oxp-sensors) Adhere to sysfs-class-hwmon and enable pwm on 2 Antheas Kapenekakis
@ 2024-12-26 21:08 ` Guenter Roeck
2024-12-26 21:16 ` Derek J. Clark
10 siblings, 1 reply; 18+ messages in thread
From: Guenter Roeck @ 2024-12-26 21:08 UTC (permalink / raw)
To: Antheas Kapenekakis
Cc: linux-hwmon, linux-doc, linux-pm, Jean Delvare, Jonathan Corbet,
Joaquin Ignacio Aramendia, Derek J Clark, Kevin Greenberg,
Joshua Tam, Parth Menon, Eileen
On Thu, Dec 26, 2024 at 12:27:30PM +0100, Antheas Kapenekakis wrote:
> This three part series updates the oxpsensors module to bring it in line
> with its Windows OneXPlayer counterpart. First, it adds support for all
> 2024 OneXPlayer handhelds and their special variants.
>
> Then, it adds the new charge limiting and bypass features that were first
> introduced in the X1 and retrofit to older OneXFly variants and for
> controlling the turbo led found in the X1 models. For Bypass, it adds a new
> bypass variant BypassS0 that is only active while the device is in the S0
> state.
>
This is a hardware monitoring driver. It is not a charge controller driver,
and it is not a LED controller driver. If such control is wanted/needed for
this system, it should be implemented either as mfd device with client drivers,
or the entire driver should be moved to platform drivers if there is a desire
to keep it as single driver.
Guenter
^ permalink raw reply [flat|nested] 18+ messages in thread* Re: [PATCH 00/10] hwmon: (oxpsensors) Add 2024 OneXPlayer line-up, add charge limiting and turbo LED, fix ABI
2024-12-26 21:08 ` [PATCH 00/10] hwmon: (oxpsensors) Add 2024 OneXPlayer line-up, add charge limiting and turbo LED, fix ABI Guenter Roeck
@ 2024-12-26 21:16 ` Derek J. Clark
2024-12-26 21:59 ` Antheas Kapenekakis
2024-12-27 17:12 ` Guenter Roeck
0 siblings, 2 replies; 18+ messages in thread
From: Derek J. Clark @ 2024-12-26 21:16 UTC (permalink / raw)
To: Guenter Roeck, Antheas Kapenekakis
Cc: linux-hwmon, linux-doc, linux-pm, Jean Delvare, Jonathan Corbet,
Joaquin Ignacio Aramendia, Kevin Greenberg, Joshua Tam,
Parth Menon, Eileen
On December 26, 2024 1:08:02 PM PST, Guenter Roeck <linux@roeck-us.net> wrote:
>On Thu, Dec 26, 2024 at 12:27:30PM +0100, Antheas Kapenekakis wrote:
>> This three part series updates the oxpsensors module to bring it in line
>> with its Windows OneXPlayer counterpart. First, it adds support for all
>> 2024 OneXPlayer handhelds and their special variants.
>>
>> Then, it adds the new charge limiting and bypass features that were first
>> introduced in the X1 and retrofit to older OneXFly variants and for
>> controlling the turbo led found in the X1 models. For Bypass, it adds a new
>> bypass variant BypassS0 that is only active while the device is in the S0
>> state.
>>
>
>This is a hardware monitoring driver. It is not a charge controller driver,
>and it is not a LED controller driver. If such control is wanted/needed for
>this system, it should be implemented either as mfd device with client drivers,
>or the entire driver should be moved to platform drivers if there is a desire
>to keep it as single driver.
>
>Guenter
I think moving this to x86 platform makes a lot of sense to ensure two separate drivers can't do async writes to the EC. We probably should have done that when adding the turbo button toggle anyway. I'll coordinate that effort with Tobias and Antheas directly before moving forward.
Thanks Guenter,
- Derek
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH 00/10] hwmon: (oxpsensors) Add 2024 OneXPlayer line-up, add charge limiting and turbo LED, fix ABI
2024-12-26 21:16 ` Derek J. Clark
@ 2024-12-26 21:59 ` Antheas Kapenekakis
2024-12-27 17:12 ` Guenter Roeck
1 sibling, 0 replies; 18+ messages in thread
From: Antheas Kapenekakis @ 2024-12-26 21:59 UTC (permalink / raw)
To: Derek J. Clark
Cc: Guenter Roeck, linux-hwmon, linux-doc, linux-pm, Jean Delvare,
Jonathan Corbet, Joaquin Ignacio Aramendia, Kevin Greenberg,
Joshua Tam, Parth Menon, Eileen
Hi Guenter,
Right now, OneXPlayer features a singular EC with a handful of
features. Where with this patch series we essentially have parity with
windows, apart from a VRAM feature which I will have to ask but I
suspect is WMI. It currently concerns a singular component (the EC)
and the functionality such as turbo button affects the hwmon component
(i.e., if the turbo button is not engaged, the fan control
functionality does not work).
As such it cannot be made into separate drivers. I think, and I
suspect you will agree, that the scope of the driver is _correct_ but
the place is not correct.
Therefore, can you suggest a reasonable path forward that is sparing
to this patch series? Should I add an eleventh patch that grafts this
driver to platform-x86? If appropriate, you can cc the x86 mailing
list on your next email.
Best,
Antheas
On Thu, 26 Dec 2024 at 22:16, Derek J. Clark <derekjohn.clark@gmail.com> wrote:
>
>
>
> On December 26, 2024 1:08:02 PM PST, Guenter Roeck <linux@roeck-us.net> wrote:
> >On Thu, Dec 26, 2024 at 12:27:30PM +0100, Antheas Kapenekakis wrote:
> >> This three part series updates the oxpsensors module to bring it in line
> >> with its Windows OneXPlayer counterpart. First, it adds support for all
> >> 2024 OneXPlayer handhelds and their special variants.
> >>
> >> Then, it adds the new charge limiting and bypass features that were first
> >> introduced in the X1 and retrofit to older OneXFly variants and for
> >> controlling the turbo led found in the X1 models. For Bypass, it adds a new
> >> bypass variant BypassS0 that is only active while the device is in the S0
> >> state.
> >>
> >
> >This is a hardware monitoring driver. It is not a charge controller driver,
> >and it is not a LED controller driver. If such control is wanted/needed for
> >this system, it should be implemented either as mfd device with client drivers,
> >or the entire driver should be moved to platform drivers if there is a desire
> >to keep it as single driver.
> >
> >Guenter
>
> I think moving this to x86 platform makes a lot of sense to ensure two separate drivers can't do async writes to the EC. We probably should have done that when adding the turbo button toggle anyway. I'll coordinate that effort with Tobias and Antheas directly before moving forward.
>
> Thanks Guenter,
> - Derek
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH 00/10] hwmon: (oxpsensors) Add 2024 OneXPlayer line-up, add charge limiting and turbo LED, fix ABI
2024-12-26 21:16 ` Derek J. Clark
2024-12-26 21:59 ` Antheas Kapenekakis
@ 2024-12-27 17:12 ` Guenter Roeck
2025-01-04 15:37 ` Antheas Kapenekakis
1 sibling, 1 reply; 18+ messages in thread
From: Guenter Roeck @ 2024-12-27 17:12 UTC (permalink / raw)
To: Derek J. Clark
Cc: Antheas Kapenekakis, linux-hwmon, linux-doc, linux-pm,
Jean Delvare, Jonathan Corbet, Joaquin Ignacio Aramendia,
Kevin Greenberg, Joshua Tam, Parth Menon, Eileen
On Thu, Dec 26, 2024 at 01:16:15PM -0800, Derek J. Clark wrote:
>
>
> On December 26, 2024 1:08:02 PM PST, Guenter Roeck <linux@roeck-us.net> wrote:
> >On Thu, Dec 26, 2024 at 12:27:30PM +0100, Antheas Kapenekakis wrote:
> >> This three part series updates the oxpsensors module to bring it in line
> >> with its Windows OneXPlayer counterpart. First, it adds support for all
> >> 2024 OneXPlayer handhelds and their special variants.
> >>
> >> Then, it adds the new charge limiting and bypass features that were first
> >> introduced in the X1 and retrofit to older OneXFly variants and for
> >> controlling the turbo led found in the X1 models. For Bypass, it adds a new
> >> bypass variant BypassS0 that is only active while the device is in the S0
> >> state.
> >>
> >
> >This is a hardware monitoring driver. It is not a charge controller driver,
> >and it is not a LED controller driver. If such control is wanted/needed for
> >this system, it should be implemented either as mfd device with client drivers,
> >or the entire driver should be moved to platform drivers if there is a desire
> >to keep it as single driver.
> >
> >Guenter
>
> I think moving this to x86 platform makes a lot of sense to ensure two separate drivers can't do async writes to the EC. We probably should have done that when adding the turbo button toggle anyway. I'll coordinate that effort with Tobias and Antheas directly before moving forward.
>
Fine with me, but "ensure two drivers can't do asynchronous writes" is not
really an argument. mfd supports that as well for pretty much all mfd
drivers.
Guenter
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH 00/10] hwmon: (oxpsensors) Add 2024 OneXPlayer line-up, add charge limiting and turbo LED, fix ABI
2024-12-27 17:12 ` Guenter Roeck
@ 2025-01-04 15:37 ` Antheas Kapenekakis
0 siblings, 0 replies; 18+ messages in thread
From: Antheas Kapenekakis @ 2025-01-04 15:37 UTC (permalink / raw)
To: Guenter Roeck
Cc: Derek J. Clark, linux-hwmon, linux-doc, linux-pm, Jean Delvare,
Jonathan Corbet, Joaquin Ignacio Aramendia, Kevin Greenberg,
Joshua Tam, Parth Menon, Eileen
Hi Guenter,
I've spoken with Derek, and we are in agreement this should be moved.
Which part of the patch series do you want me to put the move in? Or
is it something you want to do yourself prior to/after the patch
series. lmk and I will coordinate for V2
As for @Joaquin, can you ack the move since you are the module author?
Antheas
On Fri, 27 Dec 2024 at 18:12, Guenter Roeck <linux@roeck-us.net> wrote:
>
> On Thu, Dec 26, 2024 at 01:16:15PM -0800, Derek J. Clark wrote:
> >
> >
> > On December 26, 2024 1:08:02 PM PST, Guenter Roeck <linux@roeck-us.net> wrote:
> > >On Thu, Dec 26, 2024 at 12:27:30PM +0100, Antheas Kapenekakis wrote:
> > >> This three part series updates the oxpsensors module to bring it in line
> > >> with its Windows OneXPlayer counterpart. First, it adds support for all
> > >> 2024 OneXPlayer handhelds and their special variants.
> > >>
> > >> Then, it adds the new charge limiting and bypass features that were first
> > >> introduced in the X1 and retrofit to older OneXFly variants and for
> > >> controlling the turbo led found in the X1 models. For Bypass, it adds a new
> > >> bypass variant BypassS0 that is only active while the device is in the S0
> > >> state.
> > >>
> > >
> > >This is a hardware monitoring driver. It is not a charge controller driver,
> > >and it is not a LED controller driver. If such control is wanted/needed for
> > >this system, it should be implemented either as mfd device with client drivers,
> > >or the entire driver should be moved to platform drivers if there is a desire
> > >to keep it as single driver.
> > >
> > >Guenter
> >
> > I think moving this to x86 platform makes a lot of sense to ensure two separate drivers can't do async writes to the EC. We probably should have done that when adding the turbo button toggle anyway. I'll coordinate that effort with Tobias and Antheas directly before moving forward.
> >
>
> Fine with me, but "ensure two drivers can't do asynchronous writes" is not
> really an argument. mfd supports that as well for pretty much all mfd
> drivers.
>
> Guenter
^ permalink raw reply [flat|nested] 18+ messages in thread