From 3d677f12ea3a2097a16ded570623567403dea959 Mon Sep 17 00:00:00 2001

From: Esteve Varela Colominas <esteve.varela@gmail.com>

Date: Mon, 15 Mar 2021 20:58:24 +0100

Subject: [PATCH] platform/x86: thinkpad_acpi: Allow the FnLock LED to change state

Git-commit: 3d677f12ea3a2097a16ded570623567403dea959

Patch-mainline: v5.12-rc5

References: git-fixes

On many recent ThinkPad laptops, there's a new LED next to the ESC key,

that indicates the FnLock status.

When the Fn+ESC combo is pressed, FnLock is toggled, which causes the

Media Key functionality to change, making it so that the media keys

either perform their media key function, or function as an F-key by

default. The Fn key can be used the access the alternate function at any

time.

With the current linux kernel, the LED doens't change state if you press

the Fn+ESC key combo. However, the media key functionality *does*

change. This is annoying, since the LED will stay on if it was on during

bootup, and it makes it hard to keep track what the current state of the

FnLock is.

This patch calls an ACPI function, that gets the current media key

state, when the Fn+ESC key combo is pressed. Through testing it was

discovered that this function causes the LED to update correctly to

reflect the current state when this function is called.

The relevant ACPI calls are the following:

\_sb_.pci0.lpc0.ec0_.hkey.gmks: Get media key state, returns 0x603 if the FnLock mode is enabled, and 0x602 if it's disabled.

\_sb_.pci0.lpc0.ec0_.hkey.smks: Set media key state, sending a 1 will enable FnLock mode, and a 0 will disable it.

Relevant discussion:

https://bugzilla.kernel.org/show_bug.cgi?id=207841

https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1881015

Signed-off-by: Esteve Varela Colominas <esteve.varela@gmail.com>

Link: https://lore.kernel.org/r/20210315195823.23212-1-esteve.varela@gmail.com

Signed-off-by: Hans de Goede <hdegoede@redhat.com>

Acked-by: Takashi Iwai <tiwai@suse.de>

---

 drivers/platform/x86/thinkpad_acpi.c | 8 +++++++-

 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c

index f7de90a47e28..8569c1d2a52c 100644

--- a/drivers/platform/x86/thinkpad_acpi.c

+++ b/drivers/platform/x86/thinkpad_acpi.c

@@ -4081,13 +4081,19 @@ static bool hotkey_notify_6xxx(const u32 hkey,

 	case TP_HKEY_EV_KEY_NUMLOCK:

 	case TP_HKEY_EV_KEY_FN:

-	case TP_HKEY_EV_KEY_FN_ESC:

 		/* key press events, we just ignore them as long as the EC

 		 * is still reporting them in the normal keyboard stream */

 		*send_acpi_ev = false;

 		*ignore_acpi_ev = true;

 		return true;

+	case TP_HKEY_EV_KEY_FN_ESC:

+		/* Get the media key status to foce the status LED to update */

+		acpi_evalf(hkey_handle, NULL, "GMKS", "v");

+		*send_acpi_ev = false;

+		*ignore_acpi_ev = true;

+		return true;

+

 	case TP_HKEY_EV_TABLET_CHANGED:

 		tpacpi_input_send_tabletsw();

 		hotkey_tablet_mode_notify_change();

-- 

2.26.2