New Thinkpads have added a 'Mode' Function key that on Windows allows
you to choose the active profile (low-power, balanced, performance)
Added suppoort for this hotkey (F8), and have it cycle through the
options available.
Tested on X1 Carbon G12.
Signed-off-by: Mark Pearson <[email protected]>
---
.../admin-guide/laptops/thinkpad-acpi.rst | 7 ++++++-
drivers/platform/x86/thinkpad_acpi.c | 20 ++++++++++++++++++-
2 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/Documentation/admin-guide/laptops/thinkpad-acpi.rst b/Documentation/admin-guide/laptops/thinkpad-acpi.rst
index 98d304010170..7f674a6cfa8a 100644
--- a/Documentation/admin-guide/laptops/thinkpad-acpi.rst
+++ b/Documentation/admin-guide/laptops/thinkpad-acpi.rst
@@ -444,7 +444,9 @@ event code Key Notes
0x1008 0x07 FN+F8 IBM: toggle screen expand
Lenovo: configure UltraNav,
- or toggle screen expand
+ or toggle screen expand.
+ On newer platforms (2024+)
+ replaced by 0x131f (see below)
0x1009 0x08 FN+F9 -
@@ -504,6 +506,9 @@ event code Key Notes
0x1019 0x18 unknown
+0x131f ... FN+F8 Platform Mode change.
+ Implemented in driver.
+
... ... ...
0x1020 0x1F unknown
diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
index c4895e9bc714..ceb22f8d8442 100644
--- a/drivers/platform/x86/thinkpad_acpi.c
+++ b/drivers/platform/x86/thinkpad_acpi.c
@@ -166,6 +166,7 @@ enum tpacpi_hkey_event_t {
TP_HKEY_EV_VOL_MUTE = 0x1017, /* Mixer output mute */
TP_HKEY_EV_PRIVACYGUARD_TOGGLE = 0x130f, /* Toggle priv.guard on/off */
TP_HKEY_EV_AMT_TOGGLE = 0x131a, /* Toggle AMT on/off */
+ TP_HKEY_EV_PROFILE_TOGGLE = 0x131f, /* Toggle platform profile */
/* Reasons for waking up from S3/S4 */
TP_HKEY_EV_WKUP_S3_UNDOCK = 0x2304, /* undock requested, S3 */
@@ -3731,6 +3732,7 @@ static bool hotkey_notify_extended_hotkey(const u32 hkey)
switch (hkey) {
case TP_HKEY_EV_PRIVACYGUARD_TOGGLE:
case TP_HKEY_EV_AMT_TOGGLE:
+ case TP_HKEY_EV_PROFILE_TOGGLE:
tpacpi_driver_event(hkey);
return true;
}
@@ -11118,7 +11120,23 @@ static void tpacpi_driver_event(const unsigned int hkey_event)
else
dytc_control_amt(!dytc_amt_active);
}
-
+ if (hkey_event == TP_HKEY_EV_PROFILE_TOGGLE) {
+ switch (dytc_current_profile) {
+ case PLATFORM_PROFILE_LOW_POWER:
+ dytc_profile_set(NULL, PLATFORM_PROFILE_BALANCED);
+ break;
+ case PLATFORM_PROFILE_BALANCED:
+ dytc_profile_set(NULL, PLATFORM_PROFILE_PERFORMANCE);
+ break;
+ case PLATFORM_PROFILE_PERFORMANCE:
+ dytc_profile_set(NULL, PLATFORM_PROFILE_LOW_POWER);
+ break;
+ default:
+ pr_warn("Profile HKEY unexpected profile %d", dytc_current_profile);
+ }
+ /* Notify user space the profile changed */
+ platform_profile_notify();
+ }
}
static void hotkey_driver_event(const unsigned int scancode)
--
2.43.0
Hi,
On 1/21/24 00:29, Mark Pearson wrote:
> New Thinkpads have added a 'Mode' Function key that on Windows allows
> you to choose the active profile (low-power, balanced, performance)
>
> Added suppoort for this hotkey (F8), and have it cycle through the
> options available.
>
> Tested on X1 Carbon G12.
>
> Signed-off-by: Mark Pearson <[email protected]>
Thanks, patch looks good to me:
Reviewed-by: Hans de Goede <[email protected]>
Regards,
Hans
> ---
> .../admin-guide/laptops/thinkpad-acpi.rst | 7 ++++++-
> drivers/platform/x86/thinkpad_acpi.c | 20 ++++++++++++++++++-
> 2 files changed, 25 insertions(+), 2 deletions(-)
>
> diff --git a/Documentation/admin-guide/laptops/thinkpad-acpi.rst b/Documentation/admin-guide/laptops/thinkpad-acpi.rst
> index 98d304010170..7f674a6cfa8a 100644
> --- a/Documentation/admin-guide/laptops/thinkpad-acpi.rst
> +++ b/Documentation/admin-guide/laptops/thinkpad-acpi.rst
> @@ -444,7 +444,9 @@ event code Key Notes
>
> 0x1008 0x07 FN+F8 IBM: toggle screen expand
> Lenovo: configure UltraNav,
> - or toggle screen expand
> + or toggle screen expand.
> + On newer platforms (2024+)
> + replaced by 0x131f (see below)
>
> 0x1009 0x08 FN+F9 -
>
> @@ -504,6 +506,9 @@ event code Key Notes
>
> 0x1019 0x18 unknown
>
> +0x131f ... FN+F8 Platform Mode change.
> + Implemented in driver.
> +
> ... ... ...
>
> 0x1020 0x1F unknown
> diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
> index c4895e9bc714..ceb22f8d8442 100644
> --- a/drivers/platform/x86/thinkpad_acpi.c
> +++ b/drivers/platform/x86/thinkpad_acpi.c
> @@ -166,6 +166,7 @@ enum tpacpi_hkey_event_t {
> TP_HKEY_EV_VOL_MUTE = 0x1017, /* Mixer output mute */
> TP_HKEY_EV_PRIVACYGUARD_TOGGLE = 0x130f, /* Toggle priv.guard on/off */
> TP_HKEY_EV_AMT_TOGGLE = 0x131a, /* Toggle AMT on/off */
> + TP_HKEY_EV_PROFILE_TOGGLE = 0x131f, /* Toggle platform profile */
>
> /* Reasons for waking up from S3/S4 */
> TP_HKEY_EV_WKUP_S3_UNDOCK = 0x2304, /* undock requested, S3 */
> @@ -3731,6 +3732,7 @@ static bool hotkey_notify_extended_hotkey(const u32 hkey)
> switch (hkey) {
> case TP_HKEY_EV_PRIVACYGUARD_TOGGLE:
> case TP_HKEY_EV_AMT_TOGGLE:
> + case TP_HKEY_EV_PROFILE_TOGGLE:
> tpacpi_driver_event(hkey);
> return true;
> }
> @@ -11118,7 +11120,23 @@ static void tpacpi_driver_event(const unsigned int hkey_event)
> else
> dytc_control_amt(!dytc_amt_active);
> }
> -
> + if (hkey_event == TP_HKEY_EV_PROFILE_TOGGLE) {
> + switch (dytc_current_profile) {
> + case PLATFORM_PROFILE_LOW_POWER:
> + dytc_profile_set(NULL, PLATFORM_PROFILE_BALANCED);
> + break;
> + case PLATFORM_PROFILE_BALANCED:
> + dytc_profile_set(NULL, PLATFORM_PROFILE_PERFORMANCE);
> + break;
> + case PLATFORM_PROFILE_PERFORMANCE:
> + dytc_profile_set(NULL, PLATFORM_PROFILE_LOW_POWER);
> + break;
> + default:
> + pr_warn("Profile HKEY unexpected profile %d", dytc_current_profile);
> + }
> + /* Notify user space the profile changed */
> + platform_profile_notify();
> + }
> }
>
> static void hotkey_driver_event(const unsigned int scancode)
On Sat, 20 Jan 2024 18:29:34 -0500, Mark Pearson wrote:
> New Thinkpads have added a 'Mode' Function key that on Windows allows
> you to choose the active profile (low-power, balanced, performance)
>
> Added suppoort for this hotkey (F8), and have it cycle through the
> options available.
>
> Tested on X1 Carbon G12.
>
> [...]
Thank you for your contribution, it has been applied to my local
review-ilpo branch. Note it will show up in the public
platform-drivers-x86/review-ilpo branch only once I've pushed my
local branch there, which might take a while.
The list of commits applied:
[1/1] platform/x86: Support for mode FN key
commit: 0959afbafaf8791a9810fba2c55a64dfdcc3b66e
--
i.