From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
stable@vger.kernel.org,
Esteve Varela Colominas <esteve.varela@gmail.com>,
Hans de Goede <hdegoede@redhat.com>,
Sasha Levin <sashal@kernel.org>
Subject: [PATCH 5.10 17/41] platform/x86: thinkpad_acpi: Allow the FnLock LED to change state
Date: Fri, 9 Apr 2021 11:53:39 +0200 [thread overview]
Message-ID: <20210409095305.391635151@linuxfoundation.org> (raw)
In-Reply-To: <20210409095304.818847860@linuxfoundation.org>
From: Esteve Varela Colominas <esteve.varela@gmail.com>
[ Upstream commit 3d677f12ea3a2097a16ded570623567403dea959 ]
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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
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 69402758b99c..3b0acaeb20cf 100644
--- a/drivers/platform/x86/thinkpad_acpi.c
+++ b/drivers/platform/x86/thinkpad_acpi.c
@@ -4079,13 +4079,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.30.2
next prev parent reply other threads:[~2021-04-09 10:01 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-09 9:53 [PATCH 5.10 00/41] 5.10.29-rc1 review Greg Kroah-Hartman
2021-04-09 9:53 ` [PATCH 5.10 01/41] ARM: dts: am33xx: add aliases for mmc interfaces Greg Kroah-Hartman
2021-04-09 9:53 ` [PATCH 5.10 02/41] bus: ti-sysc: Fix warning on unbind if reset is not deasserted Greg Kroah-Hartman
2021-04-09 9:53 ` [PATCH 5.10 03/41] platform/x86: intel-hid: Support Lenovo ThinkPad X1 Tablet Gen 2 Greg Kroah-Hartman
2021-04-09 9:53 ` [PATCH 5.10 04/41] bpf, x86: Use kvmalloc_array instead kmalloc_array in bpf_jit_comp Greg Kroah-Hartman
2021-04-09 9:53 ` [PATCH 5.10 05/41] net/mlx5e: Enforce minimum value check for ICOSQ size Greg Kroah-Hartman
2021-04-09 9:53 ` [PATCH 5.10 06/41] net: pxa168_eth: Fix a potential data race in pxa168_eth_remove Greg Kroah-Hartman
2021-04-09 10:33 ` Pavel Machek
2021-04-09 9:53 ` [PATCH 5.10 07/41] kunit: tool: Fix a python tuple typing error Greg Kroah-Hartman
2021-04-09 9:53 ` [PATCH 5.10 08/41] mISDN: fix crash in fritzpci Greg Kroah-Hartman
2021-04-09 9:53 ` [PATCH 5.10 09/41] mac80211: Check crypto_aead_encrypt for errors Greg Kroah-Hartman
2021-04-09 9:53 ` [PATCH 5.10 10/41] mac80211: choose first enabled channel for monitor Greg Kroah-Hartman
2021-04-09 9:53 ` [PATCH 5.10 11/41] drm/msm/dsi_pll_7nm: Fix variable usage for pll_lockdet_rate Greg Kroah-Hartman
2021-04-09 9:53 ` [PATCH 5.10 12/41] drm/msm/adreno: a5xx_power: Dont apply A540 lm_setup to other GPUs Greg Kroah-Hartman
2021-04-09 9:53 ` [PATCH 5.10 13/41] drm/msm: Ratelimit invalid-fence message Greg Kroah-Hartman
2021-04-09 9:53 ` [PATCH 5.10 14/41] netfilter: conntrack: Fix gre tunneling over ipv6 Greg Kroah-Hartman
2021-04-09 9:53 ` [PATCH 5.10 15/41] netfilter: nftables: skip hook overlap logic if flowtable is stale Greg Kroah-Hartman
2021-04-09 9:53 ` [PATCH 5.10 16/41] net: ipa: fix init header command validation Greg Kroah-Hartman
2021-04-09 9:53 ` Greg Kroah-Hartman [this message]
2021-04-09 9:53 ` [PATCH 5.10 18/41] kselftest/arm64: sve: Do not use non-canonical FFR register value Greg Kroah-Hartman
2021-04-09 9:53 ` [PATCH 5.10 19/41] drm/msm/disp/dpu1: icc path needs to be set before dpu runtime resume Greg Kroah-Hartman
2021-04-09 9:53 ` [PATCH 5.10 20/41] x86/build: Turn off -fcf-protection for realmode targets Greg Kroah-Hartman
2021-04-09 9:53 ` [PATCH 5.10 21/41] block: clear GD_NEED_PART_SCAN later in bdev_disk_changed Greg Kroah-Hartman
2021-04-09 9:53 ` [PATCH 5.10 22/41] platform/x86: intel_pmc_core: Ignore GBE LTR on Tiger Lake platforms Greg Kroah-Hartman
2021-04-09 9:53 ` [PATCH 5.10 23/41] ptp_qoriq: fix overflow in ptp_qoriq_adjfine() u64 calcalation Greg Kroah-Hartman
2021-04-09 9:53 ` [PATCH 5.10 24/41] scsi: target: pscsi: Clean up after failure in pscsi_map_sg() Greg Kroah-Hartman
2021-04-09 9:53 ` [PATCH 5.10 25/41] selftests/vm: fix out-of-tree build Greg Kroah-Hartman
2021-04-09 9:53 ` [PATCH 5.10 26/41] ia64: mca: allocate early mca with GFP_ATOMIC Greg Kroah-Hartman
2021-04-09 9:53 ` [PATCH 5.10 27/41] ia64: fix format strings for err_inject Greg Kroah-Hartman
2021-04-09 9:53 ` [PATCH 5.10 28/41] cifs: revalidate mapping when we open files for SMB1 POSIX Greg Kroah-Hartman
2021-04-09 9:53 ` [PATCH 5.10 29/41] cifs: Silently ignore unknown oplock break handle Greg Kroah-Hartman
2021-04-09 9:53 ` [PATCH 5.10 30/41] io_uring: fix timeout cancel return code Greg Kroah-Hartman
2021-04-09 9:53 ` [PATCH 5.10 31/41] math: Export mul_u64_u64_div_u64 Greg Kroah-Hartman
2021-04-09 9:53 ` [PATCH 5.10 32/41] tools/resolve_btfids: Build libbpf and libsubcmd in separate directories Greg Kroah-Hartman
2021-04-09 9:53 ` [PATCH 5.10 33/41] tools/resolve_btfids: Check objects before removing Greg Kroah-Hartman
2021-04-09 9:53 ` [PATCH 5.10 34/41] tools/resolve_btfids: Set srctree variable unconditionally Greg Kroah-Hartman
2021-04-09 9:53 ` [PATCH 5.10 35/41] kbuild: Add resolve_btfids clean to root clean target Greg Kroah-Hartman
2021-04-09 9:53 ` [PATCH 5.10 36/41] kbuild: Do not clean resolve_btfids if the output does not exist Greg Kroah-Hartman
2021-04-09 9:53 ` [PATCH 5.10 37/41] tools/resolve_btfids: Add /libbpf to .gitignore Greg Kroah-Hartman
2021-04-09 9:54 ` [PATCH 5.10 38/41] bpf, x86: Validate computation of branch displacements for x86-64 Greg Kroah-Hartman
2021-04-09 19:53 ` Sudip Mukherjee
2021-04-09 9:54 ` [PATCH 5.10 39/41] bpf, x86: Validate computation of branch displacements for x86-32 Greg Kroah-Hartman
2021-04-09 19:51 ` Sudip Mukherjee
2021-04-09 20:13 ` Daniel Borkmann
2021-04-09 9:54 ` [PATCH 5.10 40/41] init/Kconfig: make COMPILE_TEST depend on !S390 Greg Kroah-Hartman
2021-04-09 9:54 ` [PATCH 5.10 41/41] init/Kconfig: make COMPILE_TEST depend on HAS_IOMEM Greg Kroah-Hartman
2021-04-09 15:09 ` [PATCH 5.10 00/41] 5.10.29-rc1 review Andrei Rabusov
2021-04-09 18:10 ` Florian Fainelli
2021-04-09 20:14 ` Guenter Roeck
2021-04-09 20:38 ` Shuah Khan
2021-04-09 21:24 ` Sudip Mukherjee
2021-04-10 0:55 ` Samuel Zou
2021-04-10 7:23 ` Naresh Kamboju
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210409095305.391635151@linuxfoundation.org \
--to=gregkh@linuxfoundation.org \
--cc=esteve.varela@gmail.com \
--cc=hdegoede@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=sashal@kernel.org \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).