From nobody Thu Dec 18 04:41:39 2025 Received: from linux1587.grserver.gr (linux1587.grserver.gr [185.138.42.100]) (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 1148223D2BA; Fri, 25 Apr 2025 11:18:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.138.42.100 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745579912; cv=none; b=mjXWCEd7CNev92Sccb642HP5QtzEflAeDgAOVTUcZu97QDdVhq89vAfDaYAaiPwQXaiKKd4o3xGod4y7ckXuPZ7mIrqYMMpVpZIlXF/0pVatY0yk8oDPvM8XtBg54cYl25Emd+Nb3VtWljNUUoMhpdXne8GCbVwZaWCAPHZOVsA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745579912; c=relaxed/simple; bh=azP9R//yUd3y5xSiHZSqZVFVUGg1StaFMpCzpZ10L/A=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=tCXx7rO6W6pE+rN8sdox0ucdXrDc194AWtzx8qzN46XDRkGsHRzbNr2rhSJgmMDEOjKWvxGZH3e+MYNWqcJwBKorfH8eCYgrTYWfy2mS1dqvfdJ+FZpJWjzUBYblMyJutGkEZGTDnkoxm47BIAqdau7dC5wONWrluko5O9WoTQ4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=antheas.dev; spf=pass smtp.mailfrom=antheas.dev; dkim=pass (1024-bit key) header.d=antheas.dev header.i=@antheas.dev header.b=stSaLV1H; arc=none smtp.client-ip=185.138.42.100 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=antheas.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=antheas.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=antheas.dev header.i=@antheas.dev header.b="stSaLV1H" Received: from localhost.localdomain (unknown [IPv6:2a02:2149:8a3b:5a00:3490:6581:3910:8337]) by linux1587.grserver.gr (Postfix) with ESMTPSA id 0B0002E08D31; Fri, 25 Apr 2025 14:18:26 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=antheas.dev; s=default; t=1745579907; bh=B46fOP7F4O5Q9kYipJf9WysyVm2OwQxbttBN2mgY+e8=; h=From:To:Subject; b=stSaLV1HhfYIPrA9/wOqsz56q9wTUVnysMnalaRb2fiGrGRnxWo+UCUEZkXxKsZM9 1QhqD1fkr9XMBNCtzzrsKvkZgevXyDdI3d35ejOiYprOI2CEHrviajcpRafAyv+qqh 1F/LQeqhJn5d7NS7rTA7HiI/li48YYkUAbBOhzf4= Authentication-Results: linux1587.grserver.gr; spf=pass (sender IP is 2a02:2149:8a3b:5a00:3490:6581:3910:8337) smtp.mailfrom=lkml@antheas.dev smtp.helo=localhost.localdomain Received-SPF: pass (linux1587.grserver.gr: connection is authenticated) From: Antheas Kapenekakis 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 , Jean Delvare , Jonathan Corbet , Joaquin Ignacio Aramendia , Derek J Clark , Kevin Greenberg , Joshua Tam , Parth Menon , Eileen , linux-kernel@vger.kernel.org, sre@kernel.org, linux@weissschuh.net, ilpo.jarvinen@linux.intel.com, hdegoede@redhat.com, mario.limonciello@amd.com, Antheas Kapenekakis Subject: [PATCH v10 01/16] hwmon: (oxp-sensors) Distinguish the X1 variants Date: Fri, 25 Apr 2025 13:18:06 +0200 Message-ID: <20250425111821.88746-2-lkml@antheas.dev> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250425111821.88746-1-lkml@antheas.dev> References: <20250425111821.88746-1-lkml@antheas.dev> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-PPP-Message-ID: <174557990684.22197.4530897932196290193@linux1587.grserver.gr> X-PPP-Vhost: antheas.dev X-Virus-Scanned: clamav-milter 0.103.11 at linux1587.grserver.gr X-Virus-Status: Clean 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. Reviewed-by: Derek J. Clark Acked-by: Guenter Roeck Reviewed-by: Thomas Wei=C3=9Fschuh Reviewed-by: Ilpo J=C3=A4rvinen Signed-off-by: Antheas Kapenekakis --- drivers/hwmon/oxp-sensors.c | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/drivers/hwmon/oxp-sensors.c b/drivers/hwmon/oxp-sensors.c index 83730d9318240..5a4230ad3757e 100644 --- a/drivers/hwmon/oxp-sensors.c +++ b/drivers/hwmon/oxp-sensors.c @@ -205,7 +205,28 @@ static const struct dmi_system_id dmi_table[] =3D { { .matches =3D { 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 =3D (void *)oxp_x1, + }, + { + .matches =3D { + DMI_MATCH(DMI_BOARD_VENDOR, "ONE-NETBOOK"), + DMI_EXACT_MATCH(DMI_BOARD_NAME, "ONEXPLAYER X1 i"), + }, + .driver_data =3D (void *)oxp_x1, + }, + { + .matches =3D { + DMI_MATCH(DMI_BOARD_VENDOR, "ONE-NETBOOK"), + DMI_EXACT_MATCH(DMI_BOARD_NAME, "ONEXPLAYER X1 mini"), + }, + .driver_data =3D (void *)oxp_x1, + }, + { + .matches =3D { + DMI_MATCH(DMI_BOARD_VENDOR, "ONE-NETBOOK"), + DMI_EXACT_MATCH(DMI_BOARD_NAME, "ONEXPLAYER X1Pro"), }, .driver_data =3D (void *)oxp_x1, }, --=20 2.49.0 From nobody Thu Dec 18 04:41:39 2025 Received: from linux1587.grserver.gr (linux1587.grserver.gr [185.138.42.100]) (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 CF55E2288D5; Fri, 25 Apr 2025 11:18:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.138.42.100 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745579913; cv=none; b=FXrqSDYMYw+2UntYwJH6ObhS9hCxZMkRGuMx5eBh7EYiNbTx6SP4m9rzVyrXd5iZq4/q9uFboetvSNmaUu4+bb0nxEkH2Xb8Rqpk32iS4eYvTzmB5mCdl03o0MXA6N5FmLvfuBziApcQk761BonSLdM58/t+niDtD+VPTsopqLU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745579913; c=relaxed/simple; bh=DQuiCF1SN/NjnZzhOowdWV/B0vWkundVtE6TjRFYqqk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=DoQmKut+FEgNkt1ApBmx5yOtK2sj3hcMXWtcl+D4JdPHa6dxUM1pCNnLqu5czoqcdsUop9Mnc1kUH39+YEWEFneKrY85rAHMyVLTNBIN52n97B5ylI+e9J6rmjjxxFqL6jYeRXkuYU/JuvJ2rHHlth+u9loQ+DChvNccnK9Go6s= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=antheas.dev; spf=pass smtp.mailfrom=antheas.dev; dkim=pass (1024-bit key) header.d=antheas.dev header.i=@antheas.dev header.b=XE7GT5qE; arc=none smtp.client-ip=185.138.42.100 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=antheas.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=antheas.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=antheas.dev header.i=@antheas.dev header.b="XE7GT5qE" Received: from localhost.localdomain (unknown [IPv6:2a02:2149:8a3b:5a00:3490:6581:3910:8337]) by linux1587.grserver.gr (Postfix) with ESMTPSA id C6C482E08DB1; Fri, 25 Apr 2025 14:18:27 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=antheas.dev; s=default; t=1745579908; bh=/7DXyuv2rJHvdhAG9cuHuiAEipooyujiZO2C2+5uEdU=; h=From:To:Subject; b=XE7GT5qEFNmSB/X3c5JAUI6QBtX29SPwRCvbIBiApjcXyLCqXbYaRv+A/v86XS+7O o4KxX6BimoR7/fR6vTteBn8guufp3BsRwbkmsmab+4XGEB/hp/3vUkS8ZguzVLcVZZ Mro1HUgBm3jtiozlOJcS2zgSbHPTQm/ax2ozeHhg= Authentication-Results: linux1587.grserver.gr; spf=pass (sender IP is 2a02:2149:8a3b:5a00:3490:6581:3910:8337) smtp.mailfrom=lkml@antheas.dev smtp.helo=localhost.localdomain Received-SPF: pass (linux1587.grserver.gr: connection is authenticated) From: Antheas Kapenekakis 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 , Jean Delvare , Jonathan Corbet , Joaquin Ignacio Aramendia , Derek J Clark , Kevin Greenberg , Joshua Tam , Parth Menon , Eileen , linux-kernel@vger.kernel.org, sre@kernel.org, linux@weissschuh.net, ilpo.jarvinen@linux.intel.com, hdegoede@redhat.com, mario.limonciello@amd.com, Antheas Kapenekakis Subject: [PATCH v10 02/16] hwmon: (oxp-sensors) Add all OneXFly variants Date: Fri, 25 Apr 2025 13:18:07 +0200 Message-ID: <20250425111821.88746-3-lkml@antheas.dev> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250425111821.88746-1-lkml@antheas.dev> References: <20250425111821.88746-1-lkml@antheas.dev> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-PPP-Message-ID: <174557990864.22256.14651202597221804722@linux1587.grserver.gr> X-PPP-Vhost: antheas.dev X-Virus-Scanned: clamav-milter 0.103.11 at linux1587.grserver.gr X-Virus-Status: Clean 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. Acked-by: Guenter Roeck Reviewed-by: Thomas Wei=C3=9Fschuh Reviewed-by: Derek J. Clark Reviewed-by: Ilpo J=C3=A4rvinen Signed-off-by: Antheas Kapenekakis --- 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 5a4230ad3757e..f7a64fbc8f33e 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[] =3D { }, .driver_data =3D (void *)oxp_fly, }, + { + .matches =3D { + DMI_MATCH(DMI_BOARD_VENDOR, "ONE-NETBOOK"), + DMI_EXACT_MATCH(DMI_BOARD_NAME, "ONEXPLAYER F1 EVA-01"), + }, + .driver_data =3D (void *)oxp_fly, + }, + { + .matches =3D { + DMI_MATCH(DMI_BOARD_VENDOR, "ONE-NETBOOK"), + DMI_EXACT_MATCH(DMI_BOARD_NAME, "ONEXPLAYER F1 OLED"), + }, + .driver_data =3D (void *)oxp_fly, + }, + { + .matches =3D { + DMI_MATCH(DMI_BOARD_VENDOR, "ONE-NETBOOK"), + DMI_EXACT_MATCH(DMI_BOARD_NAME, "ONEXPLAYER F1L"), + }, + .driver_data =3D (void *)oxp_fly, + }, + { + .matches =3D { + DMI_MATCH(DMI_BOARD_VENDOR, "ONE-NETBOOK"), + DMI_EXACT_MATCH(DMI_BOARD_NAME, "ONEXPLAYER F1Pro"), + }, + .driver_data =3D (void *)oxp_fly, + }, + { + .matches =3D { + DMI_MATCH(DMI_BOARD_VENDOR, "ONE-NETBOOK"), + DMI_EXACT_MATCH(DMI_BOARD_NAME, "ONEXPLAYER F1 EVA-02"), + }, + .driver_data =3D (void *)oxp_fly, + }, { .matches =3D { DMI_MATCH(DMI_BOARD_VENDOR, "ONE-NETBOOK"), --=20 2.49.0 From nobody Thu Dec 18 04:41:39 2025 Received: from linux1587.grserver.gr (linux1587.grserver.gr [185.138.42.100]) (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 94771242910; Fri, 25 Apr 2025 11:18:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.138.42.100 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745579914; cv=none; b=V0NExDWeogEUoLY3mEXhB+53AImC5l6I4rZEQtlF9isqzwJL8vyeZhZzS1qrjxRn9bD49jmQRkHO9uErQN5nOWnNwyQNz/50gbdyoB0NkhMowydWZLBlBHGPEpdRaZ6rAF/08rT/cYOvFxRiPeg+hobjQFUp/olLlYl654bJ3Ws= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745579914; c=relaxed/simple; bh=2/ypSyoYNu8cEq3/yQaqMZAbKghQoGyh2jaRuNy5+mQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=anR0LEnqs276SZA3BUvrf8iriYeVM18uYYcskqdEgEdEaMdtu7nyvw8CCcIr8gf3fQSiG6F5mSZN/xEd+MY1GLfFVGCn9Qd4tTYMJE8sU4PAg3zmIqHxWIc6MMHjQjf1IvEJ607z74FoVfvDitpTF0YhPnZ+Td951hQ4b4mmkGk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=antheas.dev; spf=pass smtp.mailfrom=antheas.dev; dkim=pass (1024-bit key) header.d=antheas.dev header.i=@antheas.dev header.b=I2u1EbqY; arc=none smtp.client-ip=185.138.42.100 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=antheas.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=antheas.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=antheas.dev header.i=@antheas.dev header.b="I2u1EbqY" Received: from localhost.localdomain (unknown [IPv6:2a02:2149:8a3b:5a00:3490:6581:3910:8337]) by linux1587.grserver.gr (Postfix) with ESMTPSA id 15BBD2E08E40; Fri, 25 Apr 2025 14:18:29 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=antheas.dev; s=default; t=1745579910; bh=ysaYju0DB2ji/n/5B8qba4PBt3eR62rRuuXd90ma+XE=; h=From:To:Subject; b=I2u1EbqYGWJwTTUUMr+S+JF6QAbhum62ynP+Z0nE2hQOuSXX+mYTc5PJM534ZcN6N IBVlllyZY93wygk29c60dbGkJiDg8M2z5vsADwvKRBlKQtD4G++60OPQtVVQDZbNJJ yYCsoWZEjXNYT7K5cyRF4nGhvQwbPWZbdoPLHgXw= Authentication-Results: linux1587.grserver.gr; spf=pass (sender IP is 2a02:2149:8a3b:5a00:3490:6581:3910:8337) smtp.mailfrom=lkml@antheas.dev smtp.helo=localhost.localdomain Received-SPF: pass (linux1587.grserver.gr: connection is authenticated) From: Antheas Kapenekakis 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 , Jean Delvare , Jonathan Corbet , Joaquin Ignacio Aramendia , Derek J Clark , Kevin Greenberg , Joshua Tam , Parth Menon , Eileen , linux-kernel@vger.kernel.org, sre@kernel.org, linux@weissschuh.net, ilpo.jarvinen@linux.intel.com, hdegoede@redhat.com, mario.limonciello@amd.com, Antheas Kapenekakis Subject: [PATCH v10 03/16] platform/x86: oxpec: Move hwmon/oxp-sensors to platform/x86 Date: Fri, 25 Apr 2025 13:18:08 +0200 Message-ID: <20250425111821.88746-4-lkml@antheas.dev> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250425111821.88746-1-lkml@antheas.dev> References: <20250425111821.88746-1-lkml@antheas.dev> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-PPP-Message-ID: <174557990993.22340.14670900801837697787@linux1587.grserver.gr> X-PPP-Vhost: antheas.dev X-Virus-Scanned: clamav-milter 0.103.11 at linux1587.grserver.gr X-Virus-Status: Clean The EC of OneXPlayer devices used to only control the fan. This is no longer the case, with the EC of OneXPlayer gaining additional functionality (turbo button, turbo led, battery controls). As it will be beneficial from a complexity perspective to retain this driver as a single unit, move it out of hwmon, and into platform/x86. Also, remove the hwmon documentation to prepare moving it to Documentation/ABI/. While at it, add myself to the maintainer's file. Acked-by: Guenter Roeck Reviewed-by: Thomas Wei=C3=9Fschuh Reviewed-by: Derek J. Clark Signed-off-by: Antheas Kapenekakis --- Documentation/hwmon/index.rst | 2 +- Documentation/hwmon/oxp-sensors.rst | 89 ------------------- MAINTAINERS | 7 +- drivers/hwmon/Kconfig | 11 --- drivers/hwmon/Makefile | 1 - drivers/platform/x86/Kconfig | 12 +++ drivers/platform/x86/Makefile | 3 + .../oxp-sensors.c =3D> platform/x86/oxpec.c} | 10 +-- 8 files changed, 24 insertions(+), 111 deletions(-) delete mode 100644 Documentation/hwmon/oxp-sensors.rst rename drivers/{hwmon/oxp-sensors.c =3D> platform/x86/oxpec.c} (98%) diff --git a/Documentation/hwmon/index.rst b/Documentation/hwmon/index.rst index f0ddf6222c44d..a86f7aa9006e6 100644 --- a/Documentation/hwmon/index.rst +++ b/Documentation/hwmon/index.rst @@ -189,7 +189,7 @@ Hardware Monitoring Kernel Drivers nzxt-kraken3 nzxt-smart2 occ - oxp-sensors + oxpec pc87360 pc87427 pcf8591 diff --git a/Documentation/hwmon/oxp-sensors.rst b/Documentation/hwmon/oxp-= sensors.rst deleted file mode 100644 index 581c4dafbfa13..0000000000000 --- a/Documentation/hwmon/oxp-sensors.rst +++ /dev/null @@ -1,89 +0,0 @@ -.. SPDX-License-Identifier: GPL-2.0-or-later - -Kernel driver oxp-sensors -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D - -Authors: - - Derek John Clark - - Joaqu=C3=ADn Ignacio Aramend=C3=ADa - -Description: ------------- - -Handheld devices from OneNetbook, AOKZOE, AYANEO, And OrangePi provide fan -readings and fan control through their embedded controllers. - -Currently supports OneXPlayer devices, AOKZOE, AYANEO, and OrangePi -handheld devices. AYANEO devices preceding the AIR and OneXPlayer devices -preceding the Mini A07 are not supportable as the EC model is different -and do not have manual control capabilities. - -Some OneXPlayer and AOKZOE models have a toggle for changing the behaviour -of the "Turbo/Silent" button of the device. It will change the key event -that it triggers with a flip of the `tt_toggle` attribute. See below for -boards that support this function. - -Supported devices ------------------ - -Currently the driver supports the following handhelds: - - - AOKZOE A1 - - AOKZOE A1 PRO - - AYANEO 2 - - AYANEO 2S - - AYANEO AIR - - AYANEO AIR 1S - - AYANEO AIR Plus (Mendocino) - - AYANEO AIR Pro - - AYANEO Flip DS - - AYANEO Flip KB - - AYANEO Geek - - AYANEO Geek 1S - - AYANEO KUN - - OneXPlayer 2 - - OneXPlayer 2 Pro - - OneXPlayer AMD - - OneXPlayer mini AMD - - OneXPlayer mini AMD PRO - - OneXPlayer OneXFly - - OneXPlayer X1 A - - OneXPlayer X1 i - - OneXPlayer X1 mini - - OrangePi NEO-01 - -"Turbo/Silent" button behaviour toggle is only supported on: - - AOK ZOE A1 - - AOK ZOE A1 PRO - - OneXPlayer 2 - - OneXPlayer 2 Pro - - OneXPlayer mini AMD (only with updated alpha BIOS) - - OneXPlayer mini AMD PRO - - OneXPlayer OneXFly - - OneXPlayer X1 A - - OneXPlayer X1 i - - OneXPlayer X1 mini - -Sysfs entries -------------- - -The following attributes are supported: - -fan1_input - Read Only. Reads current fan RPM. - -pwm1_enable - Read Write. Enable manual fan control. Write "1" to set to manual, write= "0" - to let the EC control de fan speed. Read this attribute to see current s= tatus. - -pwm1 - Read Write. Read this attribute to see current duty cycle in the range [= 0-255]. - When pwm1_enable is set to "1" (manual) write any value in the range [0-= 255] - to set fan speed. - -tt_toggle - Read Write. Read this attribute to check the status of the turbo/silent - button behaviour function. Write "1" to activate the switch and "0" to - deactivate it. The specific keycodes and behaviour is specific to the de= vice - both with this function on and off. This attribute is attached to the pl= atform - driver and not to the hwmon driver (/sys/devices/platform/oxp-platform/t= t_toggle) diff --git a/MAINTAINERS b/MAINTAINERS index fa1e04e87d1d6..81bcae55bc2a9 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -18067,12 +18067,13 @@ S: Maintained F: drivers/mtd/nand/onenand/ F: include/linux/mtd/onenand*.h =20 -ONEXPLAYER FAN DRIVER +ONEXPLAYER PLATFORM EC DRIVER +M: Antheas Kapenekakis M: Derek John Clark M: Joaqu=C3=ADn Ignacio Aramend=C3=ADa -L: linux-hwmon@vger.kernel.org +L: platform-driver-x86@vger.kernel.org S: Maintained -F: drivers/hwmon/oxp-sensors.c +F: drivers/platform/x86/oxpec.c =20 ONIE TLV NVMEM LAYOUT DRIVER M: Miquel Raynal diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig index f91f713b0105d..5fd93aad2d6df 100644 --- a/drivers/hwmon/Kconfig +++ b/drivers/hwmon/Kconfig @@ -1795,17 +1795,6 @@ config SENSORS_NZXT_SMART2 =20 source "drivers/hwmon/occ/Kconfig" =20 -config SENSORS_OXP - tristate "OneXPlayer EC fan control" - depends on ACPI_EC - depends on X86 - help - If you say yes here you get support for fan readings and control over - OneXPlayer handheld devices. Only OneXPlayer mini AMD handheld variant - boards are supported. - - Can also be built as a module. In that case it will be called oxp-sensor= s. - config SENSORS_PCF8591 tristate "Philips PCF8591 ADC/DAC" depends on I2C diff --git a/drivers/hwmon/Makefile b/drivers/hwmon/Makefile index 766c652ef22be..e3468d024ff39 100644 --- a/drivers/hwmon/Makefile +++ b/drivers/hwmon/Makefile @@ -183,7 +183,6 @@ obj-$(CONFIG_SENSORS_NTC_THERMISTOR) +=3D ntc_thermisto= r.o obj-$(CONFIG_SENSORS_NZXT_KRAKEN2) +=3D nzxt-kraken2.o obj-$(CONFIG_SENSORS_NZXT_KRAKEN3) +=3D nzxt-kraken3.o obj-$(CONFIG_SENSORS_NZXT_SMART2) +=3D nzxt-smart2.o -obj-$(CONFIG_SENSORS_OXP) +=3D oxp-sensors.o obj-$(CONFIG_SENSORS_PC87360) +=3D pc87360.o obj-$(CONFIG_SENSORS_PC87427) +=3D pc87427.o obj-$(CONFIG_SENSORS_PCF8591) +=3D pcf8591.o diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig index 43407e76476b5..739740c4bb535 100644 --- a/drivers/platform/x86/Kconfig +++ b/drivers/platform/x86/Kconfig @@ -1201,6 +1201,18 @@ config SEL3350_PLATFORM To compile this driver as a module, choose M here: the module will be called sel3350-platform. =20 +config OXP_EC + tristate "OneXPlayer EC platform control" + depends on ACPI_EC + depends on HWMON + depends on X86 + help + Enables support for the platform EC of OneXPlayer and AOKZOE + handheld devices. This includes fan speed, fan controls, and + disabling the default TDP behavior of the device. Due to legacy + reasons, this driver also provides hwmon functionality to Ayaneo + devices and the OrangePi Neo. + endif # X86_PLATFORM_DEVICES =20 config P2SB diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile index 650dfbebb6c8c..38ffc4c98e786 100644 --- a/drivers/platform/x86/Makefile +++ b/drivers/platform/x86/Makefile @@ -154,3 +154,6 @@ obj-$(CONFIG_WINMATE_FM07_KEYS) +=3D winmate-fm07-keys= .o =20 # SEL obj-$(CONFIG_SEL3350_PLATFORM) +=3D sel3350-platform.o + +# OneXPlayer +obj-$(CONFIG_OXP_EC) +=3D oxpec.o diff --git a/drivers/hwmon/oxp-sensors.c b/drivers/platform/x86/oxpec.c similarity index 98% rename from drivers/hwmon/oxp-sensors.c rename to drivers/platform/x86/oxpec.c index f7a64fbc8f33e..dc3a0871809cd 100644 --- a/drivers/hwmon/oxp-sensors.c +++ b/drivers/platform/x86/oxpec.c @@ -1,11 +1,8 @@ // SPDX-License-Identifier: GPL-2.0+ /* - * Platform driver for OneXPlayer, AOKZOE, AYANEO, and OrangePi Handhelds - * that expose fan reading and control via hwmon sysfs. - * - * Old OXP boards have the same DMI strings and they are told apart by - * the boot cpu vendor (Intel/AMD). Of these older models only AMD is - * supported. + * Platform driver for OneXPlayer and AOKZOE devices. For the time being, + * it also exposes fan controls for AYANEO, and OrangePi Handhelds via + * hwmon sysfs. * * Fan control is provided via pwm interface in the range [0-255]. * Old AMD boards use [0-100] as range in the EC, the written value is @@ -16,6 +13,7 @@ * * Copyright (C) 2022 Joaqu=C3=ADn I. Aramend=C3=ADa * Copyright (C) 2024 Derek J. Clark + * Copyright (C) 2025 Antheas Kapenekakis */ =20 #include --=20 2.49.0 From nobody Thu Dec 18 04:41:39 2025 Received: from linux1587.grserver.gr (linux1587.grserver.gr [185.138.42.100]) (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 E0E962459D4; Fri, 25 Apr 2025 11:18:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.138.42.100 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745579915; cv=none; b=t7TSj4IFgjQU/jRxsbC8ujIurs6ZxEkUgT92B1d4A8BJHX1I7XEhAWnAmgB/LHidCYbT9hjm7so8zrq+CjtpCgXWufhyWAxpI57S6xqbj/pfEgKV1JAW36nhpRZTS/pqJo5bMsFAw7Z+l+39WLjT983QYZ6hAz3JtQTi+b8XMA8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745579915; c=relaxed/simple; bh=2FuEymNwGKa3IfCrY44fYa8PWJ+WJu2ChlaRywwEKsY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=Ws/CQLowRO4guRXP95WfQiKJdCHvpL8s5zmGPZ+W1UXVAl5iqALxpJJVgVnSxBRc7TQ8nCKNH/FZVcxPc1wiMPFUApuCKDutS2CVu2NhS61aqXSpBWxmCQchJJI8cyTU/YdKVoaOdxhnAOAveEJI0I9sKb8MqjZG0JgCainpNn4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=antheas.dev; spf=pass smtp.mailfrom=antheas.dev; dkim=pass (1024-bit key) header.d=antheas.dev header.i=@antheas.dev header.b=gJYVKpTj; arc=none smtp.client-ip=185.138.42.100 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=antheas.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=antheas.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=antheas.dev header.i=@antheas.dev header.b="gJYVKpTj" Received: from localhost.localdomain (unknown [IPv6:2a02:2149:8a3b:5a00:3490:6581:3910:8337]) by linux1587.grserver.gr (Postfix) with ESMTPSA id 614E92E08E2F; Fri, 25 Apr 2025 14:18:30 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=antheas.dev; s=default; t=1745579911; bh=yhS5jj8uPnODX/cUTr02ZIb+Afctp8JJ+1rXz/Rqye8=; h=From:To:Subject; b=gJYVKpTj05Pl0Ru2IcJAN1m8y8N29Rn3SCrfzxgq48NGoWgYeywGDfUlocqFAUrq/ H3XB2bBAJ/mzq2oex6vPsKcisNmRq/0JRXo5kTiXQKl0fJlMNtX/TGTvslSqsp06MN nozrk2zTHNm+kqVeB87AWpkZYBJGiVCChx97IbQo= Authentication-Results: linux1587.grserver.gr; spf=pass (sender IP is 2a02:2149:8a3b:5a00:3490:6581:3910:8337) smtp.mailfrom=lkml@antheas.dev smtp.helo=localhost.localdomain Received-SPF: pass (linux1587.grserver.gr: connection is authenticated) From: Antheas Kapenekakis 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 , Jean Delvare , Jonathan Corbet , Joaquin Ignacio Aramendia , Derek J Clark , Kevin Greenberg , Joshua Tam , Parth Menon , Eileen , linux-kernel@vger.kernel.org, sre@kernel.org, linux@weissschuh.net, ilpo.jarvinen@linux.intel.com, hdegoede@redhat.com, mario.limonciello@amd.com, Antheas Kapenekakis Subject: [PATCH v10 04/16] ABI: testing: sysfs-class-oxp: add missing documentation Date: Fri, 25 Apr 2025 13:18:09 +0200 Message-ID: <20250425111821.88746-5-lkml@antheas.dev> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250425111821.88746-1-lkml@antheas.dev> References: <20250425111821.88746-1-lkml@antheas.dev> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-PPP-Message-ID: <174557991129.22425.16534301586685073371@linux1587.grserver.gr> X-PPP-Vhost: antheas.dev X-Virus-Scanned: clamav-milter 0.103.11 at linux1587.grserver.gr X-Virus-Status: Clean Add missing documentation about the tt_toggle attribute that was added in kernel 6.5. Fixes: be144ee491272 ("hwmon: (oxp-sensors) Add tt_toggle attribute on supp= orted boards") Reviewed-by: Thomas Wei=C3=9Fschuh Reviewed-by: Derek J. Clark Signed-off-by: Antheas Kapenekakis --- Documentation/ABI/testing/sysfs-platform-oxp | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 Documentation/ABI/testing/sysfs-platform-oxp diff --git a/Documentation/ABI/testing/sysfs-platform-oxp b/Documentation/A= BI/testing/sysfs-platform-oxp new file mode 100644 index 0000000000000..091269ab2c8c4 --- /dev/null +++ b/Documentation/ABI/testing/sysfs-platform-oxp @@ -0,0 +1,13 @@ +What: /sys/devices/platform//tt_toggle +Date: Jun 2023 +KernelVersion: 6.5 +Contact: "Antheas Kapenekakis" +Description: + Takeover TDP controls from the device. OneXPlayer devices have a + turbo button that can be used to switch between two TDP modes + (usually 15W and 25W). By setting this attribute to 1, this + functionality is disabled, handing TDP control over to (Windows) + userspace software and the Turbo button turns into a keyboard + shortcut over the AT keyboard of the device. In addition, + using this setting is a prerequisite for PWM control for most + newer models (otherwise it NOOPs). --=20 2.49.0 From nobody Thu Dec 18 04:41:39 2025 Received: from linux1587.grserver.gr (linux1587.grserver.gr [185.138.42.100]) (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 33F7C2475C2; Fri, 25 Apr 2025 11:18:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.138.42.100 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745579916; cv=none; b=gILDkRmUJuTxIa76LfoubpF05esFJfRJ99Pb82bxgeIQf94ITLHuCigYiDHSULxvwV/aPt6ax8CqMWcUY0em7Mt4CrSWvNQMhuyAczMaRj1HuebdRY+Nz91hfgyjAMn3piHO647X5kirGVgpHNDQhlIf2gIVMpIoejq5wGFk91g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745579916; c=relaxed/simple; bh=KgeLBLUqyMCAfp8HeyHw/KMMrJ/KP4MlFBSWaFW5MHg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=FYRI/JwQOegjlCseWZOd8ZTZPeig7Aqnv4ZggqvABFQuUK+IE5Oha4MOrP8z+xFcdVmwxL1fyuyklmWJXq0RxW+sCi144o9zZsVm+mc4WpRS19AwxU7doitDqYfYKc7wJDc66CFROlJugeNTl60VUoV7PvDIEQ0DgO7kC4qR/lE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=antheas.dev; spf=pass smtp.mailfrom=antheas.dev; dkim=pass (1024-bit key) header.d=antheas.dev header.i=@antheas.dev header.b=IGuT9+fv; arc=none smtp.client-ip=185.138.42.100 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=antheas.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=antheas.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=antheas.dev header.i=@antheas.dev header.b="IGuT9+fv" Received: from localhost.localdomain (unknown [IPv6:2a02:2149:8a3b:5a00:3490:6581:3910:8337]) by linux1587.grserver.gr (Postfix) with ESMTPSA id DA2042E08E42; Fri, 25 Apr 2025 14:18:31 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=antheas.dev; s=default; t=1745579913; bh=UF9WFNgRR76C7UnzKQASAEECGiGNsHozip/3FZayxBc=; h=From:To:Subject; b=IGuT9+fvohgj7yOiD4HXzvKPjg6Zxif0InX1uG4iPR69123TlCrIs761L82CswGUM ipDG3kN5L/bR++SkYmJ3EGwQ+HycOlqsl9j5BvVD+8YEi6vAoDS7TYlCFNJ00G2ANw J1j1IwGGJ2hCHiBYmHmMMhD+JY1sXq48BLAa+nBE= Authentication-Results: linux1587.grserver.gr; spf=pass (sender IP is 2a02:2149:8a3b:5a00:3490:6581:3910:8337) smtp.mailfrom=lkml@antheas.dev smtp.helo=localhost.localdomain Received-SPF: pass (linux1587.grserver.gr: connection is authenticated) From: Antheas Kapenekakis 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 , Jean Delvare , Jonathan Corbet , Joaquin Ignacio Aramendia , Derek J Clark , Kevin Greenberg , Joshua Tam , Parth Menon , Eileen , linux-kernel@vger.kernel.org, sre@kernel.org, linux@weissschuh.net, ilpo.jarvinen@linux.intel.com, hdegoede@redhat.com, mario.limonciello@amd.com, Antheas Kapenekakis Subject: [PATCH v10 05/16] ABI: testing: sysfs-class-oxp: add tt_led attribute documentation Date: Fri, 25 Apr 2025 13:18:10 +0200 Message-ID: <20250425111821.88746-6-lkml@antheas.dev> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250425111821.88746-1-lkml@antheas.dev> References: <20250425111821.88746-1-lkml@antheas.dev> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-PPP-Message-ID: <174557991273.22511.14304133268253133356@linux1587.grserver.gr> X-PPP-Vhost: antheas.dev X-Virus-Scanned: clamav-milter 0.103.11 at linux1587.grserver.gr X-Virus-Status: Clean Adds documentation about the tt_led attribute of OneXPlayer devices to the sysfs-class-oxp ABI documentation. Reviewed-by: Thomas Wei=C3=9Fschuh Reviewed-by: Derek J. Clark Signed-off-by: Antheas Kapenekakis --- Documentation/ABI/testing/sysfs-platform-oxp | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/Documentation/ABI/testing/sysfs-platform-oxp b/Documentation/A= BI/testing/sysfs-platform-oxp index 091269ab2c8c4..b3f39fc21dfa8 100644 --- a/Documentation/ABI/testing/sysfs-platform-oxp +++ b/Documentation/ABI/testing/sysfs-platform-oxp @@ -11,3 +11,15 @@ Description: shortcut over the AT keyboard of the device. In addition, using this setting is a prerequisite for PWM control for most newer models (otherwise it NOOPs). + +What: /sys/devices/platform//tt_led +Date: April 2025 +KernelVersion: 6.16 +Contact: "Antheas Kapenekakis" +Description: + Some OneXPlayer devices (e.g., X1 series) feature a little LED + nested in the Turbo button. This LED is illuminated when the + device is in the higher TDP mode (e.g., 25W). Once tt_toggle + is engaged, this LED is left dangling to its last state. This + attribute allows userspace to control the LED state manually + (either with 1 or 0). Only a subset of devices contain this LED. --=20 2.49.0 From nobody Thu Dec 18 04:41:39 2025 Received: from linux1587.grserver.gr (linux1587.grserver.gr [185.138.42.100]) (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 2C51224A044; Fri, 25 Apr 2025 11:18:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.138.42.100 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745579917; cv=none; b=Dl4fWTX1UwC9AVyHFmwJ0O/vvDGMYynrxNaj/W49mlUU3xdm8bS3aNSHVoO/STxpX9AKhUcc/ZEIjbhP1aiV6O3sUf7PG8NnWFqpgP68yOQTdfV7To/EY1irrHP9JwGUCnRVl1bI5kgR/+tAVUCHRK5mvSqOzG2wd2SJz40r1pc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745579917; c=relaxed/simple; bh=yYF43Unru39rskLB6o15FW18gb2pC1rZY8MRgF53hIU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=QxLPejydb3UZUswD5de4eutzkGytBO8bUwgYxU+pgEjG8h832q40yyGu4lmNpRkphpQyYE92m05bj/O67Lm5I+0mxxODR55hiyn5Ilo7G09JuvNsdJJlqTOkCUvzMS+kNKJbmGU7s1DBgqM5fcQVxDl+mQ3MXVPjXxeG45GUKiE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=antheas.dev; spf=pass smtp.mailfrom=antheas.dev; dkim=pass (1024-bit key) header.d=antheas.dev header.i=@antheas.dev header.b=jTLGBuO7; arc=none smtp.client-ip=185.138.42.100 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=antheas.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=antheas.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=antheas.dev header.i=@antheas.dev header.b="jTLGBuO7" Received: from localhost.localdomain (unknown [IPv6:2a02:2149:8a3b:5a00:3490:6581:3910:8337]) by linux1587.grserver.gr (Postfix) with ESMTPSA id 38C162E08E43; Fri, 25 Apr 2025 14:18:33 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=antheas.dev; s=default; t=1745579914; bh=rPiuh34oF+Te4yOv2w+rVAfjfi+m0fUEXD7gGDgXtCU=; h=From:To:Subject; b=jTLGBuO7y/massQcKQB2bcEzlnJS+omgkMC3/a0qKWS/1ALco/s7hXH2+K2xK1XUv zxJ4Iv8o64vApsqFQM8n48X4c05IS+Rd2WpSZxrqmq1LwG38bpCczha4v3j51Oulwp 7vckMlhvjl27m0XM4CaERJlOXRNGN7aExq2r3mvs= Authentication-Results: linux1587.grserver.gr; spf=pass (sender IP is 2a02:2149:8a3b:5a00:3490:6581:3910:8337) smtp.mailfrom=lkml@antheas.dev smtp.helo=localhost.localdomain Received-SPF: pass (linux1587.grserver.gr: connection is authenticated) From: Antheas Kapenekakis 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 , Jean Delvare , Jonathan Corbet , Joaquin Ignacio Aramendia , Derek J Clark , Kevin Greenberg , Joshua Tam , Parth Menon , Eileen , linux-kernel@vger.kernel.org, sre@kernel.org, linux@weissschuh.net, ilpo.jarvinen@linux.intel.com, hdegoede@redhat.com, mario.limonciello@amd.com, Antheas Kapenekakis Subject: [PATCH v10 06/16] platform/x86: oxpec: Rename ec group to tt_toggle Date: Fri, 25 Apr 2025 13:18:11 +0200 Message-ID: <20250425111821.88746-7-lkml@antheas.dev> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250425111821.88746-1-lkml@antheas.dev> References: <20250425111821.88746-1-lkml@antheas.dev> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-PPP-Message-ID: <174557991407.22603.4992304841289262955@linux1587.grserver.gr> X-PPP-Vhost: antheas.dev X-Virus-Scanned: clamav-milter 0.103.11 at linux1587.grserver.gr X-Virus-Status: Clean 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. And make it const while at it. Reviewed-by: Derek J. Clark Reviewed-by: Thomas Wei=C3=9Fschuh Reviewed-by: Ilpo J=C3=A4rvinen Signed-off-by: Antheas Kapenekakis --- drivers/platform/x86/oxpec.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/platform/x86/oxpec.c b/drivers/platform/x86/oxpec.c index dc3a0871809cd..ee37070ec54fc 100644 --- a/drivers/platform/x86/oxpec.c +++ b/drivers/platform/x86/oxpec.c @@ -681,18 +681,18 @@ static const struct hwmon_channel_info * const oxp_pl= atform_sensors[] =3D { NULL, }; =20 -static struct attribute *oxp_ec_attrs[] =3D { +static struct attribute *oxp_tt_toggle_attrs[] =3D { &dev_attr_tt_toggle.attr, NULL }; =20 -static struct attribute_group oxp_ec_attribute_group =3D { +static const struct attribute_group oxp_tt_toggle_attribute_group =3D { .is_visible =3D tt_toggle_is_visible, - .attrs =3D oxp_ec_attrs, + .attrs =3D oxp_tt_toggle_attrs, }; =20 static const struct attribute_group *oxp_ec_groups[] =3D { - &oxp_ec_attribute_group, + &oxp_tt_toggle_attribute_group, NULL }; =20 --=20 2.49.0 From nobody Thu Dec 18 04:41:39 2025 Received: from linux1587.grserver.gr (linux1587.grserver.gr [185.138.42.100]) (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 ED49424E00D; Fri, 25 Apr 2025 11:18:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.138.42.100 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745579919; cv=none; b=F8RAs5o22V0Vs75I26glMXkKbOhIczb2oLOz3rhvcZhEePAZAqi4qDHwVpCTjZpb4k+gThMaOyXhTI5ztodISqEfyjG+4SuJgT038/8p5mQ/fbzPn00zSGqjzlGHOCYwIvGFcxF0fXINTOcGMS3jRnSU1vXcRAR+asvCz6mXeOw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745579919; c=relaxed/simple; bh=Ts9/6WmFW9d5WfyukcBjoPW8DshAtmG62UkMdczslsI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=F698HLKeh4mjEjviDqHodOGSwLITCTMNZYYc6EDEr5RSqmG31iqdoHWduhrLhYjTMNzvvHqsVFIaVJqz97F3P5Kz0R+TiS2LapMbN997QogJ9z3X4+/ZLIAtGuH55qufF3V8V0FcJD7HQjlthVLSyAMzjLakiLKqGAZFQPyL8h0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=antheas.dev; spf=pass smtp.mailfrom=antheas.dev; dkim=pass (1024-bit key) header.d=antheas.dev header.i=@antheas.dev header.b=YitbNnhQ; arc=none smtp.client-ip=185.138.42.100 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=antheas.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=antheas.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=antheas.dev header.i=@antheas.dev header.b="YitbNnhQ" Received: from localhost.localdomain (unknown [IPv6:2a02:2149:8a3b:5a00:3490:6581:3910:8337]) by linux1587.grserver.gr (Postfix) with ESMTPSA id 8A67F2E08DB8; Fri, 25 Apr 2025 14:18:34 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=antheas.dev; s=default; t=1745579915; bh=mQu2YgAJ9WbC5nTJ9MrzKK2HFf9ggMAcU2tfPiRdys8=; h=From:To:Subject; b=YitbNnhQ9G1o7k1DrIFVz6rkGUi7RaO32SdcEGh+W7j/IC+5JWDhwK2O8lKnxGO6Y q7kgVoAwNZ0+c8Hw9BhFD9RXMLGOUTt7mfoIJsUn/n7fb2k1ECX1XtBus+7Jyz1lO/ 3JkXlfHY79U99XkiPMPM53Qs76BNSN1X70DF0rZs= Authentication-Results: linux1587.grserver.gr; spf=pass (sender IP is 2a02:2149:8a3b:5a00:3490:6581:3910:8337) smtp.mailfrom=lkml@antheas.dev smtp.helo=localhost.localdomain Received-SPF: pass (linux1587.grserver.gr: connection is authenticated) From: Antheas Kapenekakis 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 , Jean Delvare , Jonathan Corbet , Joaquin Ignacio Aramendia , Derek J Clark , Kevin Greenberg , Joshua Tam , Parth Menon , Eileen , linux-kernel@vger.kernel.org, sre@kernel.org, linux@weissschuh.net, ilpo.jarvinen@linux.intel.com, hdegoede@redhat.com, mario.limonciello@amd.com, Antheas Kapenekakis Subject: [PATCH v10 07/16] platform/x86: oxpec: Add turbo led support to X1 devices Date: Fri, 25 Apr 2025 13:18:12 +0200 Message-ID: <20250425111821.88746-8-lkml@antheas.dev> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250425111821.88746-1-lkml@antheas.dev> References: <20250425111821.88746-1-lkml@antheas.dev> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-PPP-Message-ID: <174557991539.22675.6447176555898419901@linux1587.grserver.gr> X-PPP-Vhost: antheas.dev X-Virus-Scanned: clamav-milter 0.103.11 at linux1587.grserver.gr X-Virus-Status: Clean 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. 2024 OneXPlayer devices, other than the X1s, do not have a turbo LED. However, earlier models do, so this can be extended to them as well when the register for it is found. Reviewed-by: Thomas Wei=C3=9Fschuh Reviewed-by: Derek J. Clark Signed-off-by: Antheas Kapenekakis --- drivers/platform/x86/oxpec.c | 84 ++++++++++++++++++++++++++++++++++++ 1 file changed, 84 insertions(+) diff --git a/drivers/platform/x86/oxpec.c b/drivers/platform/x86/oxpec.c index ee37070ec54fc..97594fe614896 100644 --- a/drivers/platform/x86/oxpec.c +++ b/drivers/platform/x86/oxpec.c @@ -87,6 +87,12 @@ static enum oxp_board board; =20 #define OXP_TURBO_RETURN_VAL 0x00 /* Common return val */ =20 +/* X1 Turbo LED */ +#define OXP_X1_TURBO_LED_REG 0x57 + +#define OXP_X1_TURBO_LED_OFF 0x01 +#define OXP_X1_TURBO_LED_ON 0x02 + static const struct dmi_system_id dmi_table[] =3D { { .matches =3D { @@ -434,6 +440,73 @@ static ssize_t tt_toggle_show(struct device *dev, =20 static DEVICE_ATTR_RW(tt_toggle); =20 +/* Callbacks for turbo LED 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; + bool value; + int ret; + + ret =3D kstrtobool(buf, &value); + if (ret) + return ret; + + switch (board) { + case oxp_x1: + reg =3D OXP_X1_TURBO_LED_REG; + val =3D value ? OXP_X1_TURBO_LED_ON : OXP_X1_TURBO_LED_OFF; + break; + default: + return -EINVAL; + } + + ret =3D write_to_ec(reg, val); + if (ret) + return ret; + + return count; +} + +static ssize_t tt_led_show(struct device *dev, + struct device_attribute *attr, char *buf) +{ + long enval; + long val; + int ret; + u8 reg; + + switch (board) { + case oxp_x1: + reg =3D OXP_X1_TURBO_LED_REG; + enval =3D OXP_X1_TURBO_LED_ON; + break; + default: + return -EINVAL; + } + + ret =3D read_from_ec(reg, 1, &val); + if (ret) + return ret; + + return sysfs_emit(buf, "%d\n", val =3D=3D enval); +} + +static DEVICE_ATTR_RW(tt_led); + /* PWM enable/disable functions */ static int oxp_pwm_enable(void) { @@ -691,8 +764,19 @@ static const struct attribute_group oxp_tt_toggle_attr= ibute_group =3D { .attrs =3D oxp_tt_toggle_attrs, }; =20 +static struct attribute *oxp_tt_led_attrs[] =3D { + &dev_attr_tt_led.attr, + NULL +}; + +static const struct attribute_group oxp_tt_led_attribute_group =3D { + .is_visible =3D tt_led_is_visible, + .attrs =3D oxp_tt_led_attrs, +}; + static const struct attribute_group *oxp_ec_groups[] =3D { &oxp_tt_toggle_attribute_group, + &oxp_tt_led_attribute_group, NULL }; =20 --=20 2.49.0 From nobody Thu Dec 18 04:41:39 2025 Received: from linux1587.grserver.gr (linux1587.grserver.gr [185.138.42.100]) (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 428AB243374; Fri, 25 Apr 2025 11:18:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.138.42.100 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745579920; cv=none; b=HcZY+I6cPH1PwqtC3wPgPNqu1XhzRLHzEjmWZs9kqloIdUYZ8N8ScYE/JLVbYbSzPxBjmk4r/oNJQYATNYwzR+GI6NQPQiJyc5PzS/LaUo1tBW4QC2ndvCS2BzpHO63X/Ph4QyoZRF9WrjomaL3db8Y8i+lV9/TePgz3+lBQljE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745579920; c=relaxed/simple; bh=AfcL0Nwf6KBck4GsxAmBQhQ4ZKqHYKxhM/JpLsdTG1c=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=LU805OzpIcZy/a4x/wr8ESSyh/LYemlTRqZc4GcrLChkyvRxdCgViSbbdcyPkDxVik4jaeZkpbtffZEbisdv2uvMVp5DvfdQ9yUvUdcwHduxzWWQdWsaSHni697cGk3pOIGQ6kT60Q2eQaSvprrzafe/9Y0RIaoxkJLxphf65yE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=antheas.dev; spf=pass smtp.mailfrom=antheas.dev; dkim=pass (1024-bit key) header.d=antheas.dev header.i=@antheas.dev header.b=ydtrIwEz; arc=none smtp.client-ip=185.138.42.100 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=antheas.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=antheas.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=antheas.dev header.i=@antheas.dev header.b="ydtrIwEz" Received: from localhost.localdomain (unknown [IPv6:2a02:2149:8a3b:5a00:3490:6581:3910:8337]) by linux1587.grserver.gr (Postfix) with ESMTPSA id DAEB12E08E36; Fri, 25 Apr 2025 14:18:35 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=antheas.dev; s=default; t=1745579917; bh=z/313biShVTazLrvUB2ckbPzjcB11lIzCuKyGQptDbI=; h=From:To:Subject; b=ydtrIwEzMvT7F69OQQEG4Zk9D0l7IiGvag+heD5BRhaXMdLIEZTeozcDxPLsYxIRX 4U6iWur2+nLqSCR9Tha4tnVakRuWTy3wNWdZ5c846r0MTQ0egkQFRYzvUVVEd0QvTp Xc61CmrqTbrVEfGSJxbzgwbfQCRPCEo3ufK5ASew= Authentication-Results: linux1587.grserver.gr; spf=pass (sender IP is 2a02:2149:8a3b:5a00:3490:6581:3910:8337) smtp.mailfrom=lkml@antheas.dev smtp.helo=localhost.localdomain Received-SPF: pass (linux1587.grserver.gr: connection is authenticated) From: Antheas Kapenekakis 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 , Jean Delvare , Jonathan Corbet , Joaquin Ignacio Aramendia , Derek J Clark , Kevin Greenberg , Joshua Tam , Parth Menon , Eileen , linux-kernel@vger.kernel.org, sre@kernel.org, linux@weissschuh.net, ilpo.jarvinen@linux.intel.com, hdegoede@redhat.com, mario.limonciello@amd.com, Antheas Kapenekakis Subject: [PATCH v10 08/16] platform/x86: oxpec: Move pwm_enable read to its own function Date: Fri, 25 Apr 2025 13:18:13 +0200 Message-ID: <20250425111821.88746-9-lkml@antheas.dev> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250425111821.88746-1-lkml@antheas.dev> References: <20250425111821.88746-1-lkml@antheas.dev> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-PPP-Message-ID: <174557991681.22747.8157243158238482210@linux1587.grserver.gr> X-PPP-Vhost: antheas.dev X-Virus-Scanned: clamav-milter 0.103.11 at linux1587.grserver.gr X-Virus-Status: Clean Currently, this driver breaks ABI 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. Reviewed-by: Derek J. Clark Reviewed-by: Thomas Wei=C3=9Fschuh Reviewed-by: Ilpo J=C3=A4rvinen Signed-off-by: Antheas Kapenekakis --- drivers/platform/x86/oxpec.c | 50 +++++++++++++++++++----------------- 1 file changed, 27 insertions(+), 23 deletions(-) diff --git a/drivers/platform/x86/oxpec.c b/drivers/platform/x86/oxpec.c index 97594fe614896..f5f3fbbca5552 100644 --- a/drivers/platform/x86/oxpec.c +++ b/drivers/platform/x86/oxpec.c @@ -559,6 +559,32 @@ static int oxp_pwm_disable(void) } } =20 +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) @@ -656,29 +682,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; } --=20 2.49.0 From nobody Thu Dec 18 04:41:39 2025 Received: from linux1587.grserver.gr (linux1587.grserver.gr [185.138.42.100]) (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 481D525228B; Fri, 25 Apr 2025 11:18:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.138.42.100 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745579922; cv=none; b=jGgL7EKJJrGkakokub6ngVKgPX+2/LB4Bc5KJkmmkEqNJXOm9cNSNNdPlAbvizgG9md93V9fMa4UA5t5qMzIFcM3cHsjl0MlhLVLHKrd2JUhnEOtxFRG1PTM8GMiDFvopEretBRDD8qPeDT9GYEG2HhJ8Z6isPuy7PwMQ16ZRIE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745579922; c=relaxed/simple; bh=Uz/HxOdawB8yA+nM2b1LPMEDleVe+lhgVkBUbkapCqw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=mbRwZaNdK6BMH02OCJtIBFI9XCdYPMCzYY7Sv4oYW/WCUZpuOvu/Ckc4QWzHI3lKvs5y4GQ1nTld8WYHIWOwCHbSkOEfQ0M8xYO40AgFZ89/J2LGf0mAgWvBVGXE+LqcY6JgBybBn8re6E1YMP63x5pjAp3CaTjMK/e5plcck54= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=antheas.dev; spf=pass smtp.mailfrom=antheas.dev; dkim=pass (1024-bit key) header.d=antheas.dev header.i=@antheas.dev header.b=Y2nlMVQj; arc=none smtp.client-ip=185.138.42.100 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=antheas.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=antheas.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=antheas.dev header.i=@antheas.dev header.b="Y2nlMVQj" Received: from localhost.localdomain (unknown [IPv6:2a02:2149:8a3b:5a00:3490:6581:3910:8337]) by linux1587.grserver.gr (Postfix) with ESMTPSA id 4B4BC2E08E4E; Fri, 25 Apr 2025 14:18:37 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=antheas.dev; s=default; t=1745579918; bh=x1EfM4iPcxxLy10xcIZpSqDS78JelduiUC4Laf3pAmw=; h=From:To:Subject; b=Y2nlMVQjzcesy2g5IPNAhN9oxc2I68f2hc2+9ZGTrZ3fm6wAeR4KVs0jo+o7QzPAr bfq0QW3or2V1EQYJaJQti03IelzUh0fJb+MnzJavJE3+F61ni5gMhKqGW88AzOnKgP 9saIr1KSHsqx5a57YR7EQfraxfJoM/kvEKBAyaL0= Authentication-Results: linux1587.grserver.gr; spf=pass (sender IP is 2a02:2149:8a3b:5a00:3490:6581:3910:8337) smtp.mailfrom=lkml@antheas.dev smtp.helo=localhost.localdomain Received-SPF: pass (linux1587.grserver.gr: connection is authenticated) From: Antheas Kapenekakis 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 , Jean Delvare , Jonathan Corbet , Joaquin Ignacio Aramendia , Derek J Clark , Kevin Greenberg , Joshua Tam , Parth Menon , Eileen , linux-kernel@vger.kernel.org, sre@kernel.org, linux@weissschuh.net, ilpo.jarvinen@linux.intel.com, hdegoede@redhat.com, mario.limonciello@amd.com, Antheas Kapenekakis Subject: [PATCH v10 09/16] platform/x86: oxpec: Move pwm value read/write to separate functions Date: Fri, 25 Apr 2025 13:18:14 +0200 Message-ID: <20250425111821.88746-10-lkml@antheas.dev> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250425111821.88746-1-lkml@antheas.dev> References: <20250425111821.88746-1-lkml@antheas.dev> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-PPP-Message-ID: <174557991817.22820.5117572294016848859@linux1587.grserver.gr> X-PPP-Vhost: antheas.dev X-Virus-Scanned: clamav-milter 0.103.11 at linux1587.grserver.gr X-Virus-Status: Clean Currently, this driver breaks hwmon ABI 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. Reviewed-by: Derek J. Clark Reviewed-by: Thomas Wei=C3=9Fschuh Reviewed-by: Ilpo J=C3=A4rvinen Signed-off-by: Antheas Kapenekakis --- drivers/platform/x86/oxpec.c | 163 +++++++++++++++++++---------------- 1 file changed, 88 insertions(+), 75 deletions(-) diff --git a/drivers/platform/x86/oxpec.c b/drivers/platform/x86/oxpec.c index f5f3fbbca5552..5da8e1d6073d5 100644 --- a/drivers/platform/x86/oxpec.c +++ b/drivers/platform/x86/oxpec.c @@ -599,6 +599,92 @@ static umode_t oxp_ec_hwmon_is_visible(const void *drv= data, } } =20 +/* 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 =3D ((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 =3D (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 =3D (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 =3D read_from_ec(ORANGEPI_SENSOR_PWM_REG, 1, val); + if (ret) + return ret; + /* scale from range [1-244] */ + *val =3D ((*val - 1) * 254 / 243) + 1; + break; + case oxp_2: + case oxp_x1: + ret =3D read_from_ec(OXP_SENSOR_PWM_REG, 1, val); + if (ret) + return ret; + /* scale from range [0-184] */ + *val =3D (*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 =3D read_from_ec(OXP_SENSOR_PWM_REG, 1, val); + if (ret) + return ret; + /* scale from range [0-100] */ + *val =3D (*val * 255) / 100; + break; + case aok_zoe_a1: + case oxp_fly: + case oxp_mini_amd_pro: + default: + ret =3D 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 t= ype, u32 attr, int channel, long *val) { @@ -639,48 +725,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 =3D read_from_ec(ORANGEPI_SENSOR_PWM_REG, 1, val); - if (ret) - return ret; - /* scale from range [1-244] */ - *val =3D ((*val - 1) * 254 / 243) + 1; - break; - case oxp_2: - case oxp_x1: - ret =3D read_from_ec(OXP_SENSOR_PWM_REG, 1, val); - if (ret) - return ret; - /* scale from range [0-184] */ - *val =3D (*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 =3D read_from_ec(OXP_SENSOR_PWM_REG, 1, val); - if (ret) - return ret; - /* scale from range [0-100] */ - *val =3D (*val * 255) / 100; - break; - case aok_zoe_a1: - case oxp_fly: - case oxp_mini_amd_pro: - default: - ret =3D 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: @@ -706,39 +751,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 =3D ((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 =3D (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 =3D (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; } --=20 2.49.0 From nobody Thu Dec 18 04:41:39 2025 Received: from linux1587.grserver.gr (linux1587.grserver.gr [185.138.42.100]) (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 BF01A253348; Fri, 25 Apr 2025 11:18:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.138.42.100 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745579923; cv=none; b=s5elm0InoGQwV/hCAP2BdrsAAoaI4AaHVSHxAPpvRLz+jV0llpU0UiUHXUYOM2kDiS3aW9jTRFxTVntLQgmZglFt/HR6NU2b2lofgjsY6V4JgrhPDqluAwflawp/aUV6t9e9DBQyMLoZu0QD/E4PJapObOg8VW59f2ZbDSLcnKc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745579923; c=relaxed/simple; bh=gEDmgPokvw6ugASfNUefu2HruCUnes9m660rPre0zQ4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=LkAZRSIUcmlCpnGO07boArHahxh/ZTu+ckVrOvVbUwWf7bqAPiMGwN94cxXJaxYwVVwoJ6igQFHtcB2wYAxYQzQO2xkxQHM8kuj75XHBv4bazar0M8dZsp51FUTk64L0FUVwe2IHhwy9DHPeiiflmwqX863vizatXpLNzSpYilk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=antheas.dev; spf=pass smtp.mailfrom=antheas.dev; dkim=pass (1024-bit key) header.d=antheas.dev header.i=@antheas.dev header.b=2lWTeGKA; arc=none smtp.client-ip=185.138.42.100 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=antheas.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=antheas.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=antheas.dev header.i=@antheas.dev header.b="2lWTeGKA" Received: from localhost.localdomain (unknown [IPv6:2a02:2149:8a3b:5a00:3490:6581:3910:8337]) by linux1587.grserver.gr (Postfix) with ESMTPSA id A3F9D2E08E5B; Fri, 25 Apr 2025 14:18:38 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=antheas.dev; s=default; t=1745579919; bh=ux46EIFG1RjE0EMy8IYDoNpS3GlvT1Z0tQftOdpuEMI=; h=From:To:Subject; b=2lWTeGKAtiwyoh8S/mMNe27pr9MK4ZO5hFmHkgnZg3khOBYUN4/ROr+0w5Q+cmk2v EBIur1ReqpHZYz7R8/pPpdLqNgEGiuAwpE+MK2kEf3QCNdW8COhdyXFr77UmAI17Pw ZL8hhlRuG1oN1QkEI5BDW0K9xKrzJiIIJcY/qFmU= Authentication-Results: linux1587.grserver.gr; spf=pass (sender IP is 2a02:2149:8a3b:5a00:3490:6581:3910:8337) smtp.mailfrom=lkml@antheas.dev smtp.helo=localhost.localdomain Received-SPF: pass (linux1587.grserver.gr: connection is authenticated) From: Antheas Kapenekakis 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 , Jean Delvare , Jonathan Corbet , Joaquin Ignacio Aramendia , Derek J Clark , Kevin Greenberg , Joshua Tam , Parth Menon , Eileen , linux-kernel@vger.kernel.org, sre@kernel.org, linux@weissschuh.net, ilpo.jarvinen@linux.intel.com, hdegoede@redhat.com, mario.limonciello@amd.com, Antheas Kapenekakis Subject: [PATCH v10 10/16] platform/x86: oxpec: Move fan speed read to separate function Date: Fri, 25 Apr 2025 13:18:15 +0200 Message-ID: <20250425111821.88746-11-lkml@antheas.dev> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250425111821.88746-1-lkml@antheas.dev> References: <20250425111821.88746-1-lkml@antheas.dev> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-PPP-Message-ID: <174557991957.22875.12392744324485101210@linux1587.grserver.gr> X-PPP-Vhost: antheas.dev X-Virus-Scanned: clamav-milter 0.103.11 at linux1587.grserver.gr X-Virus-Status: Clean While not necessary for fixing the ABI hwmon issue, fan speed will be the only remaining value without a function. Therefore, finish the refactor by moving it to a separate function. Reviewed-by: Derek J. Clark Reviewed-by: Thomas Wei=C3=9Fschuh Reviewed-by: Ilpo J=C3=A4rvinen Signed-off-by: Antheas Kapenekakis --- drivers/platform/x86/oxpec.c | 53 ++++++++++++++++++++---------------- 1 file changed, 29 insertions(+), 24 deletions(-) diff --git a/drivers/platform/x86/oxpec.c b/drivers/platform/x86/oxpec.c index 5da8e1d6073d5..918a553bd8969 100644 --- a/drivers/platform/x86/oxpec.c +++ b/drivers/platform/x86/oxpec.c @@ -599,6 +599,34 @@ static umode_t oxp_ec_hwmon_is_visible(const void *drv= data, } } =20 +/* 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) { @@ -694,30 +722,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; } --=20 2.49.0 From nobody Thu Dec 18 04:41:39 2025 Received: from linux1587.grserver.gr (linux1587.grserver.gr [185.138.42.100]) (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 6E150253F1E; Fri, 25 Apr 2025 11:18:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.138.42.100 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745579925; cv=none; b=kSVcXuk/k+EaBbKs4E+qiPFQZ4SDfwVxdeuwoDSOxBKz3ZO7zrBI835WuyVL4lc2V6lnSL9ZaZFKQrq7A7eBGQLwAKopbpj0WSfJOpHDrOr1pTG3x1B6hanQbriwqajYf2yFm+pGZZoO/v0LnTteCuCA3dUcvhafMAe7DNsyWj4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745579925; c=relaxed/simple; bh=miUObJDyJhocrK069DSWw9HgrhX/3Yys15Nv1kXF/d0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=koi59FTVNDq6hDd3Org9FkO2QZlrPVaN+rsVu6Fv8sMaoCBaJrYilmjsRkyWvSD+58EXWSogv/rIjOh4mQOsCH8920nXc2EwLNtK20zkLkQWPnor/hnrbeTcjxHVFPVkOdnchjG3YZqokKO+59W/yBabAGr/i/KhTYM13khoVGU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=antheas.dev; spf=pass smtp.mailfrom=antheas.dev; dkim=pass (1024-bit key) header.d=antheas.dev header.i=@antheas.dev header.b=QCdlu9/y; arc=none smtp.client-ip=185.138.42.100 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=antheas.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=antheas.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=antheas.dev header.i=@antheas.dev header.b="QCdlu9/y" Received: from localhost.localdomain (unknown [IPv6:2a02:2149:8a3b:5a00:3490:6581:3910:8337]) by linux1587.grserver.gr (Postfix) with ESMTPSA id 22D872E08E4A; Fri, 25 Apr 2025 14:18:40 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=antheas.dev; s=default; t=1745579921; bh=Sl7br+SAU7xPTSVWbVcHApKipE2FAs8bFVtAUIQuXBc=; h=From:To:Subject; b=QCdlu9/y8c5xlKZ1MlMiXWbvR7rUtRh+wCukrUxRlRZs0xCinZEbVBq8tuvtKWggI FQ+iVo5pPbaHTD58KIpIQa9uuOasJAVTdQCEqaZ2FBzsgMNZB5uZBMq08rLIChIbY+ qUKNAJ8Rx4TJQsCbakymmyisSPn4+hiaqv5jCpZA= Authentication-Results: linux1587.grserver.gr; spf=pass (sender IP is 2a02:2149:8a3b:5a00:3490:6581:3910:8337) smtp.mailfrom=lkml@antheas.dev smtp.helo=localhost.localdomain Received-SPF: pass (linux1587.grserver.gr: connection is authenticated) From: Antheas Kapenekakis 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 , Jean Delvare , Jonathan Corbet , Joaquin Ignacio Aramendia , Derek J Clark , Kevin Greenberg , Joshua Tam , Parth Menon , Eileen , linux-kernel@vger.kernel.org, sre@kernel.org, linux@weissschuh.net, ilpo.jarvinen@linux.intel.com, hdegoede@redhat.com, mario.limonciello@amd.com, Antheas Kapenekakis Subject: [PATCH v10 11/16] platform/x86: oxpec: Adhere to sysfs-class-hwmon and enable pwm on 2 Date: Fri, 25 Apr 2025 13:18:16 +0200 Message-ID: <20250425111821.88746-12-lkml@antheas.dev> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250425111821.88746-1-lkml@antheas.dev> References: <20250425111821.88746-1-lkml@antheas.dev> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-PPP-Message-ID: <174557992101.22935.2100658857750823117@linux1587.grserver.gr> X-PPP-Vhost: antheas.dev X-Virus-Scanned: clamav-milter 0.103.11 at linux1587.grserver.gr X-Virus-Status: Clean 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/ Reviewed-by: Derek J. Clark Reviewed-by: Thomas Wei=C3=9Fschuh Signed-off-by: Antheas Kapenekakis --- 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 918a553bd8969..45dfe0a7578b7 100644 --- a/drivers/platform/x86/oxpec.c +++ b/drivers/platform/x86/oxpec.c @@ -732,7 +732,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 =3D oxp_pwm_read(val); + if (ret) + return ret; + + /* Check for auto and return 2 */ + if (!*val) { + *val =3D 2; + return 0; + } + + /* Return 0 if at full fan speed, 1 otherwise */ + ret =3D oxp_pwm_fan_speed(val); + if (ret) + return ret; + + if (*val =3D=3D 255) + *val =3D 0; + else + *val =3D 1; + + return 0; default: break; } @@ -746,15 +766,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 =3D=3D 1) return oxp_pwm_enable(); - else if (val =3D=3D 0) + else if (val =3D=3D 2) return oxp_pwm_disable(); - return -EINVAL; + else if (val !=3D 0) + return -EINVAL; + + /* Enable PWM and set to max speed */ + ret =3D oxp_pwm_enable(); + if (ret) + return ret; + return oxp_pwm_input_write(255); case hwmon_pwm_input: return oxp_pwm_input_write(val); default: @@ -819,7 +848,7 @@ static int oxp_platform_probe(struct platform_device *p= dev) struct device *dev =3D &pdev->dev; struct device *hwdev; =20 - hwdev =3D devm_hwmon_device_register_with_info(dev, "oxpec", NULL, + hwdev =3D devm_hwmon_device_register_with_info(dev, "oxp_ec", NULL, &oxp_ec_chip_info, NULL); =20 return PTR_ERR_OR_ZERO(hwdev); --=20 2.49.0 From nobody Thu Dec 18 04:41:39 2025 Received: from linux1587.grserver.gr (linux1587.grserver.gr [185.138.42.100]) (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 04DA1256C8D; Fri, 25 Apr 2025 11:18:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.138.42.100 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745579927; cv=none; b=msBMxDLaH+OTHLDUfTYod8jbFuqwc4Kgpqe3592nNGkvq0F3razYwuE09kLwAORHiVh/XT2VR8abAIHKN6mLO8BXPxksijgWd+LYp26DpQYRSno9vlY8FrKJ99RSe6VBbWT1oH/fZlQuwVvOQhUj/6n2cDSt8urylGJBHT3MGz4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745579927; c=relaxed/simple; bh=9oV0RAXjgZPgX4bJl0iXP3AyceiTlXZbI6u/9AcEd34=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=VLingKbqVbnzhJPtq3KgL2nn4V0fCwONDc3ZKtgMNFEJy5i9LHoFOnO7HhGyoMIFWq19YISotbIj6LbzBxNH+O7gJ1liwV+NSYOJMHPZ+iPWpzu7gve4D1IXguYd9SyWrdh6lcweR8Y+/GFCHcMuR4v8dPbwHt49lU3zRWmV8JA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=antheas.dev; spf=pass smtp.mailfrom=antheas.dev; dkim=pass (1024-bit key) header.d=antheas.dev header.i=@antheas.dev header.b=PTMou2Km; arc=none smtp.client-ip=185.138.42.100 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=antheas.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=antheas.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=antheas.dev header.i=@antheas.dev header.b="PTMou2Km" Received: from localhost.localdomain (unknown [IPv6:2a02:2149:8a3b:5a00:3490:6581:3910:8337]) by linux1587.grserver.gr (Postfix) with ESMTPSA id 826992E08D31; Fri, 25 Apr 2025 14:18:41 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=antheas.dev; s=default; t=1745579923; bh=gXOg+mPEJn+J6EYJM9On4ifLChbXUraaMbSMCOiL9l0=; h=From:To:Subject; b=PTMou2KmxZkao9KQpoPxkTwmy9G4/O7+iOk0TGMijNP7XCqVLkOoH0bwWcSm5a6uW GeeiafRYBGwLWcvgxr64FDBh1GecS57lUqMXRdmCc4GIHYEhmLT35x9lRBYNgn3v9I TuKCmgokD8I7x9XQ7tzp1/7rrNEOkKb7zWyauD3c= Authentication-Results: linux1587.grserver.gr; spf=pass (sender IP is 2a02:2149:8a3b:5a00:3490:6581:3910:8337) smtp.mailfrom=lkml@antheas.dev smtp.helo=localhost.localdomain Received-SPF: pass (linux1587.grserver.gr: connection is authenticated) From: Antheas Kapenekakis 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 , Jean Delvare , Jonathan Corbet , Joaquin Ignacio Aramendia , Derek J Clark , Kevin Greenberg , Joshua Tam , Parth Menon , Eileen , linux-kernel@vger.kernel.org, sre@kernel.org, linux@weissschuh.net, ilpo.jarvinen@linux.intel.com, hdegoede@redhat.com, mario.limonciello@amd.com, Antheas Kapenekakis Subject: [PATCH v10 12/16] platform/x86: oxpec: Follow reverse xmas convention for tt_toggle Date: Fri, 25 Apr 2025 13:18:17 +0200 Message-ID: <20250425111821.88746-13-lkml@antheas.dev> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250425111821.88746-1-lkml@antheas.dev> References: <20250425111821.88746-1-lkml@antheas.dev> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-PPP-Message-ID: <174557992239.22999.6367353196272731325@linux1587.grserver.gr> X-PPP-Vhost: antheas.dev X-Virus-Scanned: clamav-milter 0.103.11 at linux1587.grserver.gr X-Virus-Status: Clean Since the rest of the driver follows this convention, apply it to the tt_toggle attribute as well. Suggested-by: Derek J. Clark Reviewed-by: Thomas Wei=C3=9Fschuh Reviewed-by: Derek J. Clark Reviewed-by: Ilpo J=C3=A4rvinen Signed-off-by: Antheas Kapenekakis --- drivers/platform/x86/oxpec.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/platform/x86/oxpec.c b/drivers/platform/x86/oxpec.c index 45dfe0a7578b7..96e9b7205be42 100644 --- a/drivers/platform/x86/oxpec.c +++ b/drivers/platform/x86/oxpec.c @@ -275,9 +275,9 @@ static const struct dmi_system_id dmi_table[] =3D { /* Helper functions to handle EC read/write */ static int read_from_ec(u8 reg, int size, long *val) { - int i; - int ret; u8 buffer; + int ret; + int i; =20 if (!lock_global_acpi_lock()) return -EBUSY; @@ -389,8 +389,8 @@ static ssize_t tt_toggle_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) { - int rval; bool value; + int rval; =20 rval =3D kstrtobool(buf, &value); if (rval) @@ -411,8 +411,8 @@ static ssize_t tt_toggle_show(struct device *dev, struct device_attribute *attr, char *buf) { int retval; - u8 reg; long val; + u8 reg; =20 switch (board) { case oxp_mini_amd_a07: --=20 2.49.0 From nobody Thu Dec 18 04:41:39 2025 Received: from linux1587.grserver.gr (linux1587.grserver.gr [185.138.42.100]) (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 2E2DF2571BC; Fri, 25 Apr 2025 11:18:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.138.42.100 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745579929; cv=none; b=MPL+p9ePv+1OURP7w/IMx50lRg0JxsQzy+HJTgdu7JgcxyjXV6MmSlw6Gfvk3sEwYd9s/kMWegwADLXNUOvKdGdpT99OwgBgZRmXTSbKvba+4wPrQzbQq/31dyteydO2IaCwwYUJDJJmbylopJ/hZEzgUKJGyW5sCXvSxxawPNc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745579929; c=relaxed/simple; bh=HWrtJGu36+Tjmp+jQPTHcW486BAmz4c8wtSG0n4UjfM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=WzZ6U9XrnUwpaiVgzKCi8A2+bX8K5u5ZBvORFj0hJomzkXzyybF56J9Sx1S3FloYrlD4zqKQdNzSHFLv9R+aGWJz7HFDzzZgwrY4u0bFrjMo4T2Bupxo5OS5mEjAtuMGlqjM6fDsHqNcbW+78p/1/KFOmX/D3QwHGpF9keblSJI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=antheas.dev; spf=pass smtp.mailfrom=antheas.dev; dkim=pass (1024-bit key) header.d=antheas.dev header.i=@antheas.dev header.b=2TKnnLZA; arc=none smtp.client-ip=185.138.42.100 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=antheas.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=antheas.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=antheas.dev header.i=@antheas.dev header.b="2TKnnLZA" Received: from localhost.localdomain (unknown [IPv6:2a02:2149:8a3b:5a00:3490:6581:3910:8337]) by linux1587.grserver.gr (Postfix) with ESMTPSA id 2416A2E08DB1; Fri, 25 Apr 2025 14:18:44 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=antheas.dev; s=default; t=1745579925; bh=LZE5oE2VvX68JSaIpTMQBjpgC+iEII7D1XoT+KTQkGQ=; h=From:To:Subject; b=2TKnnLZABt24V+l9cdt3rvgkFnezCfT2J5TrEtYntKxB1roZbKdurnBb5VQWq6viB xqkVhE/xyT5Ji/8D7Auw8hLNLci6ZGsFs7mwLMuNGN3HVThHFxjPWKZhF3Fkc938Dn O4kqrPYDnnpbfC2UdbW+0jLCpUMo5Fq/jOe9R7fg= Authentication-Results: linux1587.grserver.gr; spf=pass (sender IP is 2a02:2149:8a3b:5a00:3490:6581:3910:8337) smtp.mailfrom=lkml@antheas.dev smtp.helo=localhost.localdomain Received-SPF: pass (linux1587.grserver.gr: connection is authenticated) From: Antheas Kapenekakis 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 , Jean Delvare , Jonathan Corbet , Joaquin Ignacio Aramendia , Derek J Clark , Kevin Greenberg , Joshua Tam , Parth Menon , Eileen , linux-kernel@vger.kernel.org, sre@kernel.org, linux@weissschuh.net, ilpo.jarvinen@linux.intel.com, hdegoede@redhat.com, mario.limonciello@amd.com, Antheas Kapenekakis Subject: [PATCH v10 13/16] power: supply: add inhibit-charge-awake to charge_behaviour Date: Fri, 25 Apr 2025 13:18:18 +0200 Message-ID: <20250425111821.88746-14-lkml@antheas.dev> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250425111821.88746-1-lkml@antheas.dev> References: <20250425111821.88746-1-lkml@antheas.dev> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-PPP-Message-ID: <174557992504.23105.7297001227554873076@linux1587.grserver.gr> X-PPP-Vhost: antheas.dev X-Virus-Scanned: clamav-milter 0.103.11 at linux1587.grserver.gr X-Virus-Status: Clean OneXPlayer devices have a charge inhibit feature that allows the user to select between it being active always or only when the device is on. Therefore, add attribute inhibit-charge-awake to charge_behaviour to allow the user to select that charge should be paused only when the device is awake. Reviewed-by: Hans de Goede Reviewed-by: Thomas Wei=C3=9Fschuh Reviewed-by: Derek J. Clark Signed-off-by: Antheas Kapenekakis --- Documentation/ABI/testing/sysfs-class-power | 11 ++++++----- drivers/power/supply/power_supply_sysfs.c | 7 ++++--- drivers/power/supply/test_power.c | 1 + include/linux/power_supply.h | 1 + 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/Documentation/ABI/testing/sysfs-class-power b/Documentation/AB= I/testing/sysfs-class-power index 2a5c1a09a28f9..78afb2422fc5a 100644 --- a/Documentation/ABI/testing/sysfs-class-power +++ b/Documentation/ABI/testing/sysfs-class-power @@ -508,11 +508,12 @@ Description: Access: Read, Write =20 Valid values: - =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D - auto: Charge normally, respect thresholds - inhibit-charge: Do not charge while AC is attached - force-discharge: Force discharge while AC is attached - =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D + =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D + auto: Charge normally, respect thresholds + inhibit-charge: Do not charge while AC is attached + inhibit-charge-awake: inhibit-charge only when device is awake + force-discharge: Force discharge while AC is attached + =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =20 What: /sys/class/power_supply//technology Date: May 2007 diff --git a/drivers/power/supply/power_supply_sysfs.c b/drivers/power/supp= ly/power_supply_sysfs.c index 439dd0bf8644e..ad4f8b944d204 100644 --- a/drivers/power/supply/power_supply_sysfs.c +++ b/drivers/power/supply/power_supply_sysfs.c @@ -138,9 +138,10 @@ static const char * const POWER_SUPPLY_SCOPE_TEXT[] = =3D { }; =20 static const char * const POWER_SUPPLY_CHARGE_BEHAVIOUR_TEXT[] =3D { - [POWER_SUPPLY_CHARGE_BEHAVIOUR_AUTO] =3D "auto", - [POWER_SUPPLY_CHARGE_BEHAVIOUR_INHIBIT_CHARGE] =3D "inhibit-charge", - [POWER_SUPPLY_CHARGE_BEHAVIOUR_FORCE_DISCHARGE] =3D "force-discharge", + [POWER_SUPPLY_CHARGE_BEHAVIOUR_AUTO] =3D "auto", + [POWER_SUPPLY_CHARGE_BEHAVIOUR_INHIBIT_CHARGE] =3D "inhibit-charge", + [POWER_SUPPLY_CHARGE_BEHAVIOUR_INHIBIT_CHARGE_AWAKE] =3D "inhibit-charge-= awake", + [POWER_SUPPLY_CHARGE_BEHAVIOUR_FORCE_DISCHARGE] =3D "force-discharge", }; =20 static struct power_supply_attr power_supply_attrs[] __ro_after_init =3D { diff --git a/drivers/power/supply/test_power.c b/drivers/power/supply/test_= power.c index 2a975a110f485..958e0c0cf2876 100644 --- a/drivers/power/supply/test_power.c +++ b/drivers/power/supply/test_power.c @@ -214,6 +214,7 @@ static const struct power_supply_desc test_power_desc[]= =3D { .property_is_writeable =3D test_power_battery_property_is_writeable, .charge_behaviours =3D BIT(POWER_SUPPLY_CHARGE_BEHAVIOUR_AUTO) | BIT(POWER_SUPPLY_CHARGE_BEHAVIOUR_INHIBIT_CHARGE) + | BIT(POWER_SUPPLY_CHARGE_BEHAVIOUR_INHIBIT_CHARGE_AWAKE) | BIT(POWER_SUPPLY_CHARGE_BEHAVIOUR_FORCE_DISCHARGE), }, [TEST_USB] =3D { diff --git a/include/linux/power_supply.h b/include/linux/power_supply.h index 888824592953d..cbec930430a79 100644 --- a/include/linux/power_supply.h +++ b/include/linux/power_supply.h @@ -212,6 +212,7 @@ enum power_supply_usb_type { enum power_supply_charge_behaviour { POWER_SUPPLY_CHARGE_BEHAVIOUR_AUTO =3D 0, POWER_SUPPLY_CHARGE_BEHAVIOUR_INHIBIT_CHARGE, + POWER_SUPPLY_CHARGE_BEHAVIOUR_INHIBIT_CHARGE_AWAKE, POWER_SUPPLY_CHARGE_BEHAVIOUR_FORCE_DISCHARGE, }; =20 --=20 2.49.0 From nobody Thu Dec 18 04:41:39 2025 Received: from linux1587.grserver.gr (linux1587.grserver.gr [185.138.42.100]) (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 3269E2586DA; Fri, 25 Apr 2025 11:18:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.138.42.100 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745579931; cv=none; b=srxr8HTiIq4fG+xY4zhXlgpHuxqn/lRbCebWeKbTNRorEeAKvODwkyMjcIEQGuB+9Hv4mlOtuANS3Uv1UeThTpcn7D6md1NFIqy5KzU9dKrGdwid90+pHwU/86qyns68mHa5RSvt6azHHdCiKxLtArl5kNQkN1A/zmidXze4274= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745579931; c=relaxed/simple; bh=+6ONVK/5tBw7E1HTNYbNqGgnMRJdKrRkDTsIslMmZM4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=pWGlwfK97N9oPPrBNJU+8aE6mxNDy67NVt/jH7WqD19fiFYNaAVcv2SynW6EEUNHsfsGbekA9TTFmhy7yuSDSm8VJYnmSKuMF4iYTLKi9A/5hpCdIDQN3CXRYLvBzO6YSsOLCSsAYnyryAkwWTd1JcUUlWTnVXH6Y6HFHlWz1GU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=antheas.dev; spf=pass smtp.mailfrom=antheas.dev; dkim=pass (1024-bit key) header.d=antheas.dev header.i=@antheas.dev header.b=WqtzK920; arc=none smtp.client-ip=185.138.42.100 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=antheas.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=antheas.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=antheas.dev header.i=@antheas.dev header.b="WqtzK920" Received: from localhost.localdomain (unknown [IPv6:2a02:2149:8a3b:5a00:3490:6581:3910:8337]) by linux1587.grserver.gr (Postfix) with ESMTPSA id 8D49A2E08E40; Fri, 25 Apr 2025 14:18:45 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=antheas.dev; s=default; t=1745579926; bh=TD37M8j59PKJ/VIqbsDpykNaxTny+lGYk91LizPk2UA=; h=From:To:Subject; b=WqtzK9200GeBGfKaDiAF3KJBnp+ogLSChZ2/UxZ1FcBk12Q6N86YXDIB5/tinzQ3V hIUzw5JWt9FtWOoOpJkUrSAcon7qi+oTDqN6p0yfukrQO/NuedzWGk961s3V1PuFTF gjAgYVUMrrHavr2640CCFWREC7wFHNVKrgrxgHWk= Authentication-Results: linux1587.grserver.gr; spf=pass (sender IP is 2a02:2149:8a3b:5a00:3490:6581:3910:8337) smtp.mailfrom=lkml@antheas.dev smtp.helo=localhost.localdomain Received-SPF: pass (linux1587.grserver.gr: connection is authenticated) From: Antheas Kapenekakis 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 , Jean Delvare , Jonathan Corbet , Joaquin Ignacio Aramendia , Derek J Clark , Kevin Greenberg , Joshua Tam , Parth Menon , Eileen , linux-kernel@vger.kernel.org, sre@kernel.org, linux@weissschuh.net, ilpo.jarvinen@linux.intel.com, hdegoede@redhat.com, mario.limonciello@amd.com, Antheas Kapenekakis Subject: [PATCH v10 14/16] platform/x86: oxpec: Add charge threshold and behaviour to OneXPlayer Date: Fri, 25 Apr 2025 13:18:19 +0200 Message-ID: <20250425111821.88746-15-lkml@antheas.dev> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250425111821.88746-1-lkml@antheas.dev> References: <20250425111821.88746-1-lkml@antheas.dev> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-PPP-Message-ID: <174557992640.23202.12239168386226565786@linux1587.grserver.gr> X-PPP-Vhost: antheas.dev X-Virus-Scanned: clamav-milter 0.103.11 at linux1587.grserver.gr X-Virus-Status: Clean With the X1 (AMD), OneXPlayer added a charge limit and charge inhibit feature to their devices. Charge limit allows for choosing an arbitrary battery charge setpoint in percentages. Charge ihibit allows to instruct the device to stop charging either when it is awake 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. Reviewed-by: Thomas Wei=C3=9Fschuh Reviewed-by: Derek J. Clark Signed-off-by: Antheas Kapenekakis --- drivers/platform/x86/Kconfig | 1 + drivers/platform/x86/oxpec.c | 152 ++++++++++++++++++++++++++++++++++- 2 files changed, 152 insertions(+), 1 deletion(-) diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig index 739740c4bb535..6c9e64a03aaef 100644 --- a/drivers/platform/x86/Kconfig +++ b/drivers/platform/x86/Kconfig @@ -1204,6 +1204,7 @@ config SEL3350_PLATFORM config OXP_EC tristate "OneXPlayer EC platform control" depends on ACPI_EC + depends on ACPI_BATTERY depends on HWMON depends on X86 help diff --git a/drivers/platform/x86/oxpec.c b/drivers/platform/x86/oxpec.c index 96e9b7205be42..d71ff189bafef 100644 --- a/drivers/platform/x86/oxpec.c +++ b/drivers/platform/x86/oxpec.c @@ -24,6 +24,7 @@ #include #include #include +#include =20 /* Handle ACPI lock mechanism */ static u32 oxp_mutex; @@ -60,6 +61,7 @@ enum oxp_board { }; =20 static enum oxp_board board; +static struct device *oxp_dev; =20 /* Fan reading and PWM */ #define OXP_SENSOR_FAN_REG 0x76 /* Fan reading is 2 registers = long */ @@ -93,6 +95,20 @@ static enum oxp_board board; #define OXP_X1_TURBO_LED_OFF 0x01 #define OXP_X1_TURBO_LED_ON 0x02 =20 +/* Battery extension settings */ +#define EC_CHARGE_CONTROL_BEHAVIOURS (BIT(POWER_SUPPLY_CHARGE_BEHAVIOUR_AU= TO) | \ + BIT(POWER_SUPPLY_CHARGE_BEHAVIOUR_INHIBIT_CHARGE) | \ + BIT(POWER_SUPPLY_CHARGE_BEHAVIOUR_INHIBIT_CHARGE_AWAKE)) + +#define OXP_X1_CHARGE_LIMIT_REG 0xA3 /* X1 charge limit (%) */ +#define OXP_X1_CHARGE_INHIBIT_REG 0xA4 /* X1 bypass charging */ + +#define OXP_X1_CHARGE_INHIBIT_MASK_AWAKE 0x01 +/* X1 Mask is 0x0A, F1Pro is 0x02 but the extra bit on the X1 does nothing= . */ +#define OXP_X1_CHARGE_INHIBIT_MASK_OFF 0x02 +#define OXP_X1_CHARGE_INHIBIT_MASK_ALWAYS (OXP_X1_CHARGE_INHIBIT_MASK_AWAK= E | \ + OXP_X1_CHARGE_INHIBIT_MASK_OFF) + static const struct dmi_system_id dmi_table[] =3D { { .matches =3D { @@ -507,6 +523,129 @@ static ssize_t tt_led_show(struct device *dev, =20 static DEVICE_ATTR_RW(tt_led); =20 +/* Callbacks for charge behaviour attributes */ +static bool oxp_psy_ext_supported(void) +{ + switch (board) { + case oxp_x1: + case oxp_fly: + return true; + default: + break; + } + return false; +} + +static int oxp_psy_ext_get_prop(struct power_supply *psy, + const struct power_supply_ext *ext, + void *data, + enum power_supply_property psp, + union power_supply_propval *val) +{ + long raw_val; + int ret; + + switch (psp) { + case POWER_SUPPLY_PROP_CHARGE_CONTROL_END_THRESHOLD: + ret =3D read_from_ec(OXP_X1_CHARGE_LIMIT_REG, 1, &raw_val); + if (ret) + return ret; + if (raw_val < 0 || raw_val > 100) + return -EINVAL; + val->intval =3D raw_val; + return 0; + case POWER_SUPPLY_PROP_CHARGE_BEHAVIOUR: + ret =3D read_from_ec(OXP_X1_CHARGE_INHIBIT_REG, 1, &raw_val); + if (ret) + return ret; + if ((raw_val & OXP_X1_CHARGE_INHIBIT_MASK_ALWAYS) =3D=3D + OXP_X1_CHARGE_INHIBIT_MASK_ALWAYS) + val->intval =3D POWER_SUPPLY_CHARGE_BEHAVIOUR_INHIBIT_CHARGE; + else if ((raw_val & OXP_X1_CHARGE_INHIBIT_MASK_AWAKE) =3D=3D + OXP_X1_CHARGE_INHIBIT_MASK_AWAKE) + val->intval =3D POWER_SUPPLY_CHARGE_BEHAVIOUR_INHIBIT_CHARGE_AWAKE; + else + val->intval =3D POWER_SUPPLY_CHARGE_BEHAVIOUR_AUTO; + return 0; + default: + return -EINVAL; + } +} + +static int oxp_psy_ext_set_prop(struct power_supply *psy, + const struct power_supply_ext *ext, + void *data, + enum power_supply_property psp, + const union power_supply_propval *val) +{ + long raw_val; + + switch (psp) { + case POWER_SUPPLY_PROP_CHARGE_CONTROL_END_THRESHOLD: + if (val->intval > 100) + return -EINVAL; + return write_to_ec(OXP_X1_CHARGE_LIMIT_REG, val->intval); + case POWER_SUPPLY_PROP_CHARGE_BEHAVIOUR: + switch (val->intval) { + case POWER_SUPPLY_CHARGE_BEHAVIOUR_AUTO: + raw_val =3D 0; + break; + case POWER_SUPPLY_CHARGE_BEHAVIOUR_INHIBIT_CHARGE_AWAKE: + raw_val =3D OXP_X1_CHARGE_INHIBIT_MASK_AWAKE; + break; + case POWER_SUPPLY_CHARGE_BEHAVIOUR_INHIBIT_CHARGE: + raw_val =3D OXP_X1_CHARGE_INHIBIT_MASK_ALWAYS; + break; + default: + return -EINVAL; + } + + return write_to_ec(OXP_X1_CHARGE_INHIBIT_REG, raw_val); + default: + return -EINVAL; + } +} + +static int oxp_psy_prop_is_writeable(struct power_supply *psy, + const struct power_supply_ext *ext, + void *data, + enum power_supply_property psp) +{ + return true; +} + +static const enum power_supply_property oxp_psy_ext_props[] =3D { + POWER_SUPPLY_PROP_CHARGE_BEHAVIOUR, + POWER_SUPPLY_PROP_CHARGE_CONTROL_END_THRESHOLD, +}; + +static const struct power_supply_ext oxp_psy_ext =3D { + .name =3D "oxp-charge-control", + .properties =3D oxp_psy_ext_props, + .num_properties =3D ARRAY_SIZE(oxp_psy_ext_props), + .charge_behaviours =3D EC_CHARGE_CONTROL_BEHAVIOURS, + .get_property =3D oxp_psy_ext_get_prop, + .set_property =3D oxp_psy_ext_set_prop, + .property_is_writeable =3D oxp_psy_prop_is_writeable, +}; + +static int oxp_add_battery(struct power_supply *battery, struct acpi_batte= ry_hook *hook) +{ + return power_supply_register_extension(battery, &oxp_psy_ext, oxp_dev, NU= LL); +} + +static int oxp_remove_battery(struct power_supply *battery, struct acpi_ba= ttery_hook *hook) +{ + power_supply_unregister_extension(battery, &oxp_psy_ext); + return 0; +} + +static struct acpi_battery_hook battery_hook =3D { + .add_battery =3D oxp_add_battery, + .remove_battery =3D oxp_remove_battery, + .name =3D "OneXPlayer Battery", +}; + /* PWM enable/disable functions */ static int oxp_pwm_enable(void) { @@ -847,11 +986,22 @@ static int oxp_platform_probe(struct platform_device = *pdev) { struct device *dev =3D &pdev->dev; struct device *hwdev; + int ret; =20 + oxp_dev =3D dev; hwdev =3D devm_hwmon_device_register_with_info(dev, "oxp_ec", NULL, &oxp_ec_chip_info, NULL); =20 - return PTR_ERR_OR_ZERO(hwdev); + if (IS_ERR(hwdev)) + return PTR_ERR(hwdev); + + if (oxp_psy_ext_supported()) { + ret =3D devm_battery_hook_register(dev, &battery_hook); + if (ret) + return ret; + } + + return 0; } =20 static struct platform_driver oxp_platform_driver =3D { --=20 2.49.0 From nobody Thu Dec 18 04:41:39 2025 Received: from linux1587.grserver.gr (linux1587.grserver.gr [185.138.42.100]) (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 2F6F0258CE7; Fri, 25 Apr 2025 11:18:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.138.42.100 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745579931; cv=none; b=fFwkGZ94hPjnvMUqCCO0Lx967bOAwe5kw0OKfZPKKDcNGgM7S+7jVMG/xpdWr7vm4ZvINDQVGMZ2HCNsMRHF1YASFhZrSY9snV/cycH3m/d4Rs5RJE2tZVqA+UkAlTNTxFS8uY8XeG0u5GR4llZ5tZvRNjcWNK2hg+DCxFvqtJw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745579931; c=relaxed/simple; bh=pkeS98euH30dOGfG1+dOVA0/1dKYBGZgUZN07dZ0H+4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=HTqPz2ODNOYuB0KJOpLyYCb61OF/ZWaaoGaJY29gH1av50Q8PyqdlX1Ot+ulXAPlIkkeGfPdMj/MS/aFmGm4qS5Au+tdd/XILXx6MoyP15R2w7Dl7C24U9auWfE7eKiwygDD126cgUaXOSfKWVE3kbnEWptYomkJe+eR8SdB1P0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=antheas.dev; spf=pass smtp.mailfrom=antheas.dev; dkim=pass (1024-bit key) header.d=antheas.dev header.i=@antheas.dev header.b=YIE2x61x; arc=none smtp.client-ip=185.138.42.100 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=antheas.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=antheas.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=antheas.dev header.i=@antheas.dev header.b="YIE2x61x" Received: from localhost.localdomain (unknown [IPv6:2a02:2149:8a3b:5a00:3490:6581:3910:8337]) by linux1587.grserver.gr (Postfix) with ESMTPSA id E95A12E08E62; Fri, 25 Apr 2025 14:18:46 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=antheas.dev; s=default; t=1745579928; bh=DWjWW+uNRKRGl5pgiRex0CDUsiqQn/RmxukuWZy+SwA=; h=From:To:Subject; b=YIE2x61x0iYPVxSciPYml29JTIC4f8nxoD2Gd4HI+2UY9FNK+TZY83nXjFWxU1/5w 8ONx1PP/grLkNNfrKZH+e06L44CJkL62g8x9SuroUV/RW5pV8cjwXpuu9uDyRb4jZf d3bxiR/HZuRaAZ4E2YJjrmXTqYB1Gw6aGDKTaAeU= Authentication-Results: linux1587.grserver.gr; spf=pass (sender IP is 2a02:2149:8a3b:5a00:3490:6581:3910:8337) smtp.mailfrom=lkml@antheas.dev smtp.helo=localhost.localdomain Received-SPF: pass (linux1587.grserver.gr: connection is authenticated) From: Antheas Kapenekakis 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 , Jean Delvare , Jonathan Corbet , Joaquin Ignacio Aramendia , Derek J Clark , Kevin Greenberg , Joshua Tam , Parth Menon , Eileen , linux-kernel@vger.kernel.org, sre@kernel.org, linux@weissschuh.net, ilpo.jarvinen@linux.intel.com, hdegoede@redhat.com, mario.limonciello@amd.com, Antheas Kapenekakis Subject: [PATCH v10 15/16] platform/x86: oxpec: Rename rval to ret in tt_toggle Date: Fri, 25 Apr 2025 13:18:20 +0200 Message-ID: <20250425111821.88746-16-lkml@antheas.dev> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250425111821.88746-1-lkml@antheas.dev> References: <20250425111821.88746-1-lkml@antheas.dev> 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 X-PPP-Message-ID: <174557992781.23293.12127681747810270918@linux1587.grserver.gr> X-PPP-Vhost: antheas.dev X-Virus-Scanned: clamav-milter 0.103.11 at linux1587.grserver.gr X-Virus-Status: Clean Content-Type: text/plain; charset="utf-8" Rename the variable `rval` to `ret` in the function for consistency. Signed-off-by: Antheas Kapenekakis --- drivers/platform/x86/oxpec.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/platform/x86/oxpec.c b/drivers/platform/x86/oxpec.c index d71ff189bafef..692a6d6d08316 100644 --- a/drivers/platform/x86/oxpec.c +++ b/drivers/platform/x86/oxpec.c @@ -406,19 +406,19 @@ static ssize_t tt_toggle_store(struct device *dev, size_t count) { bool value; - int rval; + int ret; =20 - rval =3D kstrtobool(buf, &value); - if (rval) - return rval; + ret =3D kstrtobool(buf, &value); + if (ret) + return ret; =20 if (value) { - rval =3D tt_toggle_enable(); + ret =3D tt_toggle_enable(); } else { - rval =3D tt_toggle_disable(); + ret =3D tt_toggle_disable(); } - if (rval) - return rval; + if (ret) + return ret; =20 return count; } --=20 2.49.0 From nobody Thu Dec 18 04:41:39 2025 Received: from linux1587.grserver.gr (linux1587.grserver.gr [185.138.42.100]) (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 7AC3A2594B4; Fri, 25 Apr 2025 11:18:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.138.42.100 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745579933; cv=none; b=iNHzg7KV9aIaKVD9ozzzkpw4EtXMDinaWgXJ1WgS4z/JQAzIEpe38De24XIninf2MXxjZif8jYpu4Tx1kfF/Q8GxjHtAKuLUhnZORDh+6OgJYVEwtYmXZd/CSNGaQXkv020wNAt4rE6t7ZaRZqGJrzrNKY9tnzbjqXA3GPpYmNs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745579933; c=relaxed/simple; bh=T7PKyVUt3crhS062wcPX6RuQLioSxyB4opN5XxKCgAY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Wx50jAkU5BEXkFCTBFqVUxM5LO0TqagfUgt/0XLmtW7xhEIn7Z9H84gIyy5BgFuh/n8t1AKqNtUKNyuG6S12r+IJAH+LRIBjNZXAAPkpegxqifMYYVD1TcUTg4msVhtavdAJ0r9XypIzwT8PxBUKTKT6akI5kp8xirgoT55q6/M= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=antheas.dev; spf=pass smtp.mailfrom=antheas.dev; dkim=pass (1024-bit key) header.d=antheas.dev header.i=@antheas.dev header.b=gN9XDfXO; arc=none smtp.client-ip=185.138.42.100 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=antheas.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=antheas.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=antheas.dev header.i=@antheas.dev header.b="gN9XDfXO" Received: from localhost.localdomain (unknown [IPv6:2a02:2149:8a3b:5a00:3490:6581:3910:8337]) by linux1587.grserver.gr (Postfix) with ESMTPSA id 4DF772E028F6; Fri, 25 Apr 2025 14:18:48 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=antheas.dev; s=default; t=1745579929; bh=EOM7xb1wc43oU0lf5rEDD2j76CA4sncrvzR8q1EepOk=; h=From:To:Subject; b=gN9XDfXO9bZuksSsw7C9sWYvNPOBsB77UZG1AoldwsHpf3RsJacLdDwCOxqYqiS+o C9HcCfuMGURG2GWy8WDQEWwLryfHeISXzXqmvquLiiHfOiyENWtNc99prITGsoQsQe Tvrg4ba7t6hVZrdU9D/N6b0yKzDVYr4tj4KkLo+o= Authentication-Results: linux1587.grserver.gr; spf=pass (sender IP is 2a02:2149:8a3b:5a00:3490:6581:3910:8337) smtp.mailfrom=lkml@antheas.dev smtp.helo=localhost.localdomain Received-SPF: pass (linux1587.grserver.gr: connection is authenticated) From: Antheas Kapenekakis 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 , Jean Delvare , Jonathan Corbet , Joaquin Ignacio Aramendia , Derek J Clark , Kevin Greenberg , Joshua Tam , Parth Menon , Eileen , linux-kernel@vger.kernel.org, sre@kernel.org, linux@weissschuh.net, ilpo.jarvinen@linux.intel.com, hdegoede@redhat.com, mario.limonciello@amd.com, Antheas Kapenekakis Subject: [PATCH v10 16/16] platform/x86: oxpec: Convert defines to using tabs Date: Fri, 25 Apr 2025 13:18:21 +0200 Message-ID: <20250425111821.88746-17-lkml@antheas.dev> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250425111821.88746-1-lkml@antheas.dev> References: <20250425111821.88746-1-lkml@antheas.dev> 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 X-PPP-Message-ID: <174557992913.23354.14997138938371653254@linux1587.grserver.gr> X-PPP-Vhost: antheas.dev X-Virus-Scanned: clamav-milter 0.103.11 at linux1587.grserver.gr X-Virus-Status: Clean Content-Type: text/plain; charset="utf-8" The defines used spaces previously. Convert all of them to use tabs. Signed-off-by: Antheas Kapenekakis --- drivers/platform/x86/oxpec.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/drivers/platform/x86/oxpec.c b/drivers/platform/x86/oxpec.c index 692a6d6d08316..a07ba9c2fe4f5 100644 --- a/drivers/platform/x86/oxpec.c +++ b/drivers/platform/x86/oxpec.c @@ -64,36 +64,36 @@ static enum oxp_board board; static struct device *oxp_dev; =20 /* Fan reading and PWM */ -#define OXP_SENSOR_FAN_REG 0x76 /* Fan reading is 2 registers = long */ -#define OXP_2_SENSOR_FAN_REG 0x58 /* Fan reading is 2 registers = long */ -#define OXP_SENSOR_PWM_ENABLE_REG 0x4A /* PWM enable is 1 register lo= ng */ -#define OXP_SENSOR_PWM_REG 0x4B /* PWM reading is 1 register l= ong */ -#define PWM_MODE_AUTO 0x00 -#define PWM_MODE_MANUAL 0x01 +#define OXP_SENSOR_FAN_REG 0x76 /* Fan reading is 2 registers long */ +#define OXP_2_SENSOR_FAN_REG 0x58 /* Fan reading is 2 registers long */ +#define OXP_SENSOR_PWM_ENABLE_REG 0x4A /* PWM enable is 1 register long */ +#define OXP_SENSOR_PWM_REG 0x4B /* PWM reading is 1 register long */ +#define PWM_MODE_AUTO 0x00 +#define PWM_MODE_MANUAL 0x01 =20 /* OrangePi fan reading and PWM */ -#define ORANGEPI_SENSOR_FAN_REG 0x78 /* Fan reading is 2 registers = long */ -#define ORANGEPI_SENSOR_PWM_ENABLE_REG 0x40 /* PWM enable is 1 register lo= ng */ -#define ORANGEPI_SENSOR_PWM_REG 0x38 /* PWM reading is 1 register l= ong */ +#define ORANGEPI_SENSOR_FAN_REG 0x78 /* Fan reading is 2 registers long */ +#define ORANGEPI_SENSOR_PWM_ENABLE_REG 0x40 /* PWM enable is 1 register lo= ng */ +#define ORANGEPI_SENSOR_PWM_REG 0x38 /* PWM reading is 1 register long */ =20 /* Turbo button takeover function * Different boards have different values and EC registers * for the same function */ -#define OXP_TURBO_SWITCH_REG 0xF1 /* Mini Pro, OneXFly, AOKZOE */ -#define OXP_2_TURBO_SWITCH_REG 0xEB /* OXP2 and X1 */ -#define OXP_MINI_TURBO_SWITCH_REG 0x1E /* Mini AO7 */ +#define OXP_TURBO_SWITCH_REG 0xF1 /* Mini Pro, OneXFly, AOKZOE */ +#define OXP_2_TURBO_SWITCH_REG 0xEB /* OXP2 and X1 */ +#define OXP_MINI_TURBO_SWITCH_REG 0x1E /* Mini AO7 */ =20 -#define OXP_MINI_TURBO_TAKE_VAL 0x01 /* Mini AO7 */ -#define OXP_TURBO_TAKE_VAL 0x40 /* All other models */ +#define OXP_MINI_TURBO_TAKE_VAL 0x01 /* Mini AO7 */ +#define OXP_TURBO_TAKE_VAL 0x40 /* All other models */ =20 -#define OXP_TURBO_RETURN_VAL 0x00 /* Common return val */ +#define OXP_TURBO_RETURN_VAL 0x00 /* Common return val */ =20 /* X1 Turbo LED */ -#define OXP_X1_TURBO_LED_REG 0x57 +#define OXP_X1_TURBO_LED_REG 0x57 =20 -#define OXP_X1_TURBO_LED_OFF 0x01 -#define OXP_X1_TURBO_LED_ON 0x02 +#define OXP_X1_TURBO_LED_OFF 0x01 +#define OXP_X1_TURBO_LED_ON 0x02 =20 /* Battery extension settings */ #define EC_CHARGE_CONTROL_BEHAVIOURS (BIT(POWER_SUPPLY_CHARGE_BEHAVIOUR_AU= TO) | \ --=20 2.49.0