From nobody Mon Apr 27 14:50:23 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 43B71C43334 for ; Sun, 12 Jun 2022 09:06:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235415AbiFLJF7 (ORCPT ); Sun, 12 Jun 2022 05:05:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35900 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231250AbiFLJFz (ORCPT ); Sun, 12 Jun 2022 05:05:55 -0400 Received: from mail-ej1-x629.google.com (mail-ej1-x629.google.com [IPv6:2a00:1450:4864:20::629]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0094619D; Sun, 12 Jun 2022 02:05:53 -0700 (PDT) Received: by mail-ej1-x629.google.com with SMTP id v1so5687843ejg.13; Sun, 12 Jun 2022 02:05:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=iUOlWIxQiOg7kBTKt6fHp2ojMo1J1FWT8vKkXq6OhaI=; b=mmXn+bGOYLkL2y0A3ELZ2gA97uEjiYwL2v9I8ibCTyYVZIs4+X1NWXXPpJM+NYi1do ien8zbKagbgUmxKHA3F3CcMvPQeNTJVCoN5zL9R6XV00fsmBdX+5WD2fJ1xRwgnumr3f 9+WAziVmvxlBRl6ANBntPH882A/nMHYqwnYBetO+nEuYeNOWtqRXVmelfyrcxqlVjUBE cXm7/eycCPzmbSHNcCSkdXpFsJKGtAqNq8HllzNmGAgK8Rw0NLxAa2nMHbnoPJbRB7OO hXfFOd5O0qGeXTCREiCfbgnIIHbuoUdtQbzTO98J3E8VfqKsjm07zZQ4btxz5UNxeu5T jlnw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=iUOlWIxQiOg7kBTKt6fHp2ojMo1J1FWT8vKkXq6OhaI=; b=JsmByGxOTvHRt8A0S3zh6qCeeaIe+Co81TLbcgTw7g3Tjru/WxTVDhq9D7FYuLj8VN 9uF0jRrb66NkFJ9wRnznhw4NPgcnlLd9bu2zOrX/Nspp+W6Sdcij7jZkQdIrdZaxYYgW EyDVfbi1AwvrpdxlYJQ0ydj8GfmNVHQ5Dt5inWO9BUrRkxV5+rNlK500VgAsXM+HBreC Q1Kg5sZmYqDmM837wc4B/c3gNkrKp+o0L34kUWLnTo0PfsRCFEtMH6t8rkEpoASibYAt hiyT1fR/aAcre+8s790caqVy4DOpsSR3wih8zJGdoSANP0PnidgYRu9ZAsZYcgyFxbLO rABA== X-Gm-Message-State: AOAM5317qZgsBEwaXqBzsVHA1L0+QLOCS+rmB6CKI6BokvoUlCBIzMLp Wcejm1uTgd9fXb/NvZv9UYY= X-Google-Smtp-Source: ABdhPJw8/uBxI1gqB5aFdCRUTYC+d/c2PQEx3+X27+AsyOtXmWuxKAuLDl0b5r5N+kMhvtVlPOeSew== X-Received: by 2002:a17:907:2d8b:b0:711:f167:c818 with SMTP id gt11-20020a1709072d8b00b00711f167c818mr20408003ejc.318.1655024752592; Sun, 12 Jun 2022 02:05:52 -0700 (PDT) Received: from strolchi.home.s3e.de (p3ee2bf2d.dip0.t-ipconnect.de. [62.226.191.45]) by smtp.gmail.com with ESMTPSA id o18-20020aa7c7d2000000b004335e08d6c9sm2860075eds.33.2022.06.12.02.05.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Jun 2022 02:05:52 -0700 (PDT) From: stefan.seyfried@googlemail.com To: kenneth.t.chan@gmail.com Cc: platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org, Stefan Seyfried Subject: [PATCH 1/2] platform/x86: panasonic-laptop: de-obfuscate button codes Date: Sun, 12 Jun 2022 11:05:06 +0200 Message-Id: <20220612090507.20648-2-stefan.seyfried@googlemail.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220612090507.20648-1-stefan.seyfried@googlemail.com> References: <20200821181433.17653-8-kenneth.t.chan@gmail.com> <20220612090507.20648-1-stefan.seyfried@googlemail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Stefan Seyfried In the definition of panasonic_keymap[] the key codes are given in decimal, later checks are done with hexadecimal values, which does not help in understanding the code. Additionally use two helper variables to shorten the code and make the logic more obvious. Signed-off-by: Stefan Seyfried --- drivers/platform/x86/panasonic-laptop.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/drivers/platform/x86/panasonic-laptop.c b/drivers/platform/x86= /panasonic-laptop.c index 37850d07987d..ca6137f4000f 100644 --- a/drivers/platform/x86/panasonic-laptop.c +++ b/drivers/platform/x86/panasonic-laptop.c @@ -762,6 +762,8 @@ static void acpi_pcc_generate_keyinput(struct pcc_acpi = *pcc) struct input_dev *hotk_input_dev =3D pcc->input_dev; int rc; unsigned long long result; + unsigned int key; + unsigned int updown; =20 rc =3D acpi_evaluate_integer(pcc->handle, METHOD_HKEY_QUERY, NULL, &result); @@ -770,18 +772,22 @@ static void acpi_pcc_generate_keyinput(struct pcc_acp= i *pcc) return; } =20 + key =3D result & 0xf; + updown =3D result & 0x80; /* 0x80 =3D=3D key down; 0x00 =3D key up */ + /* hack: some firmware sends no key down for sleep / hibernate */ - if ((result & 0xf) =3D=3D 0x7 || (result & 0xf) =3D=3D 0xa) { - if (result & 0x80) + if (key =3D=3D 7 || key =3D=3D 10) { + if (updown) sleep_keydown_seen =3D 1; if (!sleep_keydown_seen) sparse_keymap_report_event(hotk_input_dev, - result & 0xf, 0x80, false); + key, 0x80, false); } =20 - if ((result & 0xf) =3D=3D 0x7 || (result & 0xf) =3D=3D 0x9 || (result & 0= xf) =3D=3D 0xa) { + /* for the magic values, see panasonic_keymap[] above */ + if (key =3D=3D 7 || key =3D=3D 9 || key =3D=3D 10) { if (!sparse_keymap_report_event(hotk_input_dev, - result & 0xf, result & 0x80, false)) + key, updown, false)) pr_err("Unknown hotkey event: 0x%04llx\n", result); } } --=20 2.36.1 From nobody Mon Apr 27 14:50:23 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D28BFC43334 for ; Sun, 12 Jun 2022 09:06:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235474AbiFLJGC (ORCPT ); Sun, 12 Jun 2022 05:06:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36250 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235439AbiFLJF5 (ORCPT ); Sun, 12 Jun 2022 05:05:57 -0400 Received: from mail-ej1-x631.google.com (mail-ej1-x631.google.com [IPv6:2a00:1450:4864:20::631]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 60DFA517C1; Sun, 12 Jun 2022 02:05:56 -0700 (PDT) Received: by mail-ej1-x631.google.com with SMTP id u12so5729526eja.8; Sun, 12 Jun 2022 02:05:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=vu64RzOJf4/VV9twaNb7oWG1XNBPJ9un68Ks7Bwxb2o=; b=W8r7qgMsMG8np/sP2HU6tzocZ4b6xTTFF2Fgh2QyIRC6HLiAyNTX17FswpDu1bzEPk uXJigNkboNhsvXUK21u8ZaL09uTw4NGI3+GnV18zgByA1pEToT7B8ZM596GJgit8TmYT S4+VtWRuRrXt/p0g6pGQOPW4cMzFuWITSrbY3NlGrA9JTBPTkHXicnZMcs5KMjPUnCjX 0S5UjJ7ggLfLTThPGSfbiI6OdakNuXRmUMR7r6b3EAdVNZcZvjh72BmiH1gjo1CfzKIy IqVdXPuEeNJl8Euj5xPiAOjbq6QrlafDkNT0V/f+/wg7SOJlxJL7R1vZzneq5SR5zGZt 5T1Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=vu64RzOJf4/VV9twaNb7oWG1XNBPJ9un68Ks7Bwxb2o=; b=Uopu3u+Yh+I/gXZKiZi634tWlRaEld2/q0L2crkMUqgmoIfmf6DCn3olvHBLitmvkw i8Q7T4Z9G0U+UWhRAXf6C3aILlBGaD+KAElmzO7XcjQpAHKSEIhEQrerweNJqIV7kzef PdqLU6/6CkyF1+vf5d1gUnmr+eWvxc3MteBVqZga+H34GT3uhyk7Av1hYl6AsoBjQ37k 5agjKG9Xr8fFY113Ylzo71zBrsh3wznQhHJwE0lBwjUcrKrXspiyPm+Fzc3SXsBLPdVL K8kxEaysOQe82z4iD70Y6dmtRUTpZpjWrENiJ9IwnbKlISvlAcPN517DHd0WKYvDhoM+ TAXQ== X-Gm-Message-State: AOAM531vXgqYTl1lWwWY1M7O2SjWh4ZmlxulKPD6rD1cLICB99wqtFmE L2/hqSXW5yIeSb/p7IP5goI= X-Google-Smtp-Source: ABdhPJzfgdClY3PJtaOhWy1MXte40sNGkDjeFo0u2FxCME4MaEM6mWM9WjV42fx21PZlD4KO2AP6Xw== X-Received: by 2002:a17:906:2cc3:b0:70d:b6c8:f83b with SMTP id r3-20020a1709062cc300b0070db6c8f83bmr44230739ejr.770.1655024754991; Sun, 12 Jun 2022 02:05:54 -0700 (PDT) Received: from strolchi.home.s3e.de (p3ee2bf2d.dip0.t-ipconnect.de. [62.226.191.45]) by smtp.gmail.com with ESMTPSA id o18-20020aa7c7d2000000b004335e08d6c9sm2860075eds.33.2022.06.12.02.05.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Jun 2022 02:05:54 -0700 (PDT) From: stefan.seyfried@googlemail.com To: kenneth.t.chan@gmail.com Cc: platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org, Stefan Seyfried Subject: [PATCH 2/2] platform/x86: panasonic-laptop: allow to use all hotkeys Date: Sun, 12 Jun 2022 11:05:07 +0200 Message-Id: <20220612090507.20648-3-stefan.seyfried@googlemail.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220612090507.20648-1-stefan.seyfried@googlemail.com> References: <20200821181433.17653-8-kenneth.t.chan@gmail.com> <20220612090507.20648-1-stefan.seyfried@googlemail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Stefan Seyfried commit ed83c9171829 broke the hotkeys on my Toughbook CF-51. I'm questioning the general validity of that commit, but as I only have a single machine to test, add a module parameter to allow making it work at runtime. Fixes: ed83c9171829 platform/x86: panasonic-laptop: Resolve hotkey double t= rigger bug Signed-off-by: Stefan Seyfried Reviewed-by: Kenneth Chan --- drivers/platform/x86/panasonic-laptop.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/platform/x86/panasonic-laptop.c b/drivers/platform/x86= /panasonic-laptop.c index ca6137f4000f..83acae75aee2 100644 --- a/drivers/platform/x86/panasonic-laptop.c +++ b/drivers/platform/x86/panasonic-laptop.c @@ -141,6 +141,9 @@ MODULE_AUTHOR("Martin Lucina "); MODULE_AUTHOR("Kenneth Chan "); MODULE_DESCRIPTION("ACPI HotKey driver for Panasonic Let's Note laptops"); MODULE_LICENSE("GPL"); +static bool hotkey_input; +module_param(hotkey_input, bool, 0644); +MODULE_PARM_DESC(hotkey_input, "Send all hotkeys to the input subsystem"); =20 #define LOGPREFIX "pcc_acpi: " =20 @@ -785,7 +788,7 @@ static void acpi_pcc_generate_keyinput(struct pcc_acpi = *pcc) } =20 /* for the magic values, see panasonic_keymap[] above */ - if (key =3D=3D 7 || key =3D=3D 9 || key =3D=3D 10) { + if (hotkey_input || key =3D=3D 7 || key =3D=3D 9 || key =3D=3D 10) { if (!sparse_keymap_report_event(hotk_input_dev, key, updown, false)) pr_err("Unknown hotkey event: 0x%04llx\n", result); --=20 2.36.1