From patchwork Tue Oct 20 00:15:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Pearson X-Patchwork-Id: 11845509 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 50A3A14B7 for ; Tue, 20 Oct 2020 00:16:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3A7902242C for ; Tue, 20 Oct 2020 00:16:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389311AbgJTAQ3 (ORCPT ); Mon, 19 Oct 2020 20:16:29 -0400 Received: from mail1.bemta24.messagelabs.com ([67.219.250.4]:12194 "EHLO mail1.bemta24.messagelabs.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727220AbgJTAQ3 (ORCPT ); Mon, 19 Oct 2020 20:16:29 -0400 Received: from [100.112.128.224] (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256 bits)) by server-4.bemta.az-a.us-west-2.aws.symcld.net id 96/23-21904-A5C2E8F5; Tue, 20 Oct 2020 00:16:26 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupileJIrShJLcpLzFFi42LJePGQVzdKpy/ e4NxuJYtD5w4wWxxe9ILR4uu32+wWb45PZ7I4c3shk8XNT99YLVbvecHswO4xq6GXzWPnrLvs Hr+2rWHxWH5wGpPH+31X2Tw+b5ILYItizcxLyq9IYM2Y2reHsWAGT8WhiduZGhgPcnUxcnEIC fxnlJj3/xsbhPOGUeLW+oOMXYycHGwC2hJbtvwCSnBwiAjISHxY6wlSwyxwm1Hi+a4GNpAaYY FwiTXbm9hBbBYBVYmDJ7uZQWxeARuJ/69awGokBOQlnvYuB4tzAtWc6XrMAmILCahI3H+whA2 iXlDi5MwnYHFmoPrmrbOZIWwJiYMvXjBDzFGQeDv3PtTMBIllL+8wT2AUmIWkfRaS9llI2hcw Mq9itEgqykzPKMlNzMzRNTQw0DU0NNI1NLLQNbQw10us0k3UKy3WLU8tLtE10kssL9YrrsxNz knRy0st2cQIjJaUgobdOxhfvv6gd4hRkoNJSZR3i3pfvBBfUn5KZUZicUZ8UWlOavEhRhkODi UJXmltoJxgUWp6akVaZg4wcmHSEhw8SiK8OVpAad7igsTc4sx0iNQpRl2OnUfnLWIWYsnLz0u VEuf1B5khAFKUUZoHNwKWRC4xykoJ8zIyMDAI8RSkFuVmlqDKv2IU52BUEuY9DrKKJzOvBG7T K6AjmICOsO3vATmiJBEhJdXAZG984OzEwM0N5/bMnq54j/n64aW+byR4l6RLlRySDVrhd+XX3 Jzz+4xfC71bdd+Ck1cw9N2SQ0z5WokGC/5LFN/xFNBNVuCU8vG23baP2f9Vv3fbdufVDfbPNW Z/XdhR/H27b+yudy7deoJGr+07L4splR4Q+H/jVew8Dsu+qvn+nZ8mSHIaFillrz2klHqwu69 /78kJtz3EwzOzQnJvVOW8mmbFHvzb1udZ347rHldYkix/enwJ3aR2+cDnVm/hoNOL2sR2XLQt PTxrU3nzvSel75bK3J+6fXahxwuP0PZljgVW7HV6836KyN8RC7m6u6g/8PbMXYtiDpWyf1Lb0 Mwc/3Iyg/hCJ5Udt6bUKrEUZyQaajEXFScCABxSaJqdAwAA X-Env-Sender: markpearson@lenovo.com X-Msg-Ref: server-24.tower-336.messagelabs.com!1603152985!159925!1 X-Originating-IP: [104.232.225.13] X-SYMC-ESS-Client-Auth: outbound-route-from=pass X-StarScan-Received: X-StarScan-Version: 9.60.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28762 invoked from network); 20 Oct 2020 00:16:26 -0000 Received: from unknown (HELO lenovo.com) (104.232.225.13) by server-24.tower-336.messagelabs.com with ECDHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 20 Oct 2020 00:16:26 -0000 Received: from reswpmail04.lenovo.com (unknown [10.62.32.23]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by Forcepoint Email with ESMTPS id 0F10044CF7B9B7A9F62B; Mon, 19 Oct 2020 20:16:25 -0400 (EDT) Received: from localhost.localdomain.com (10.64.93.219) by reswpmail04.lenovo.com (10.62.32.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2044.4; Mon, 19 Oct 2020 17:16:22 -0700 From: Mark Pearson To: CC: , , , , , , , Subject: [PATCH v2 1/3] Input: add event codes for lap and palmreset proximity switches Date: Mon, 19 Oct 2020 20:15:54 -0400 Message-ID: <20201020001556.388099-1-markpearson@lenovo.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: References: MIME-Version: 1.0 X-Originating-IP: [10.64.93.219] X-ClientProxiedBy: reswpmail04.lenovo.com (10.62.32.23) To reswpmail04.lenovo.com (10.62.32.23) Precedence: bulk List-ID: X-Mailing-List: platform-driver-x86@vger.kernel.org Add infrastructure needed to support lap and palmrest proximity sensors. These sensors are used for identifying thermal mode changes and modifying WWAN transmitter power. Signed-off-by: Mark Pearson --- include/linux/mod_devicetable.h | 2 +- include/uapi/linux/input-event-codes.h | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h index 5b08a473cdba..897f5a3e7721 100644 --- a/include/linux/mod_devicetable.h +++ b/include/linux/mod_devicetable.h @@ -320,7 +320,7 @@ struct pcmcia_device_id { #define INPUT_DEVICE_ID_LED_MAX 0x0f #define INPUT_DEVICE_ID_SND_MAX 0x07 #define INPUT_DEVICE_ID_FF_MAX 0x7f -#define INPUT_DEVICE_ID_SW_MAX 0x10 +#define INPUT_DEVICE_ID_SW_MAX 0x12 #define INPUT_DEVICE_ID_PROP_MAX 0x1f #define INPUT_DEVICE_ID_MATCH_BUS 1 diff --git a/include/uapi/linux/input-event-codes.h b/include/uapi/linux/input-event-codes.h index 0c2e27d28e0a..26f71a9a6936 100644 --- a/include/uapi/linux/input-event-codes.h +++ b/include/uapi/linux/input-event-codes.h @@ -889,7 +889,9 @@ #define SW_MUTE_DEVICE 0x0e /* set = device disabled */ #define SW_PEN_INSERTED 0x0f /* set = pen inserted */ #define SW_MACHINE_COVER 0x10 /* set = cover closed */ -#define SW_MAX 0x10 +#define SW_LAP_PROXIMITY 0x11 /* set = lap proximity sensor active */ +#define SW_PALMREST_PROXIMITY 0x12 /* set = palmrest proximity sensor active */ +#define SW_MAX 0x12 #define SW_CNT (SW_MAX+1) /* From patchwork Tue Oct 20 00:15:55 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Pearson X-Patchwork-Id: 11845513 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 93EAE14B2 for ; Tue, 20 Oct 2020 00:16:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7F35522400 for ; Tue, 20 Oct 2020 00:16:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389314AbgJTAQg (ORCPT ); Mon, 19 Oct 2020 20:16:36 -0400 Received: from mail1.bemta24.messagelabs.com ([67.219.250.3]:13188 "EHLO mail1.bemta24.messagelabs.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727220AbgJTAQf (ORCPT ); Mon, 19 Oct 2020 20:16:35 -0400 Received: from [100.112.128.224] (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256 bits)) by server-3.bemta.az-a.us-west-2.aws.symcld.net id 3A/2A-11747-16C2E8F5; Tue, 20 Oct 2020 00:16:33 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrDIsWRWlGSWpSXmKPExsWSLveKTTdRpy/ eYN4+YYtD5w4wWxxe9ILR4uu32+wWb45PZ7I4c3shk8XNT99YLVbvecHswO4xq6GXzWPnrLvs Hr+2rWHxWH5wGpPH+31X2Tw+b5ILYItizcxLyq9IYM04Of0be8EuhYr7938zNjD+ku5i5OIQE vjPKDHvzlZmCOcNo8SsWUuBHE4ONgFtiS1bfrF1MXJwiAjISHxY6wlSwyxwm1Hi+a4GNpAaYY FwiYbHW1lBbBYBVYkZC1rZQWxeARuJxZ3/mEBsCQF5iae9y5lB5nAK2Ep8WOwNEhYSCJM4fuQ +VLmgxMmZT1hAbGag8uats5khbAmJgy9eMEOMUZB4O/c+G4SdILHs5R3mCYwCs5C0z0LSPgtJ +wJG5lWM5klFmekZJbmJmTm6hgYGuoaGRrqGxga6JkZ6iVW6iXqlxbrlqcUlukBuebFecWVuc k6KXl5qySZGYKSkFDRp7WB89fqD3iFGSQ4mJVHeLep98UJ8SfkplRmJxRnxRaU5qcWHGGU4OJ QkeKW1gXKCRanpqRVpmTnAqIVJS3DwKInw5mgBpXmLCxJzizPTIVKnGBWlxHn9QfoEQBIZpXl wbbBEcYlRVkqYl5GBgUGIpyC1KDezBFX+FaM4B6OSMO9xkPE8mXklcNNfAS1mAlps298Dsrgk ESEl1cDk19i/P+TVnvSJqw8z53kevMDxIdV31nwz56pHErGfnmZWW7x7MOmEyDNb6/6bV6aE7 +G0OBvRc+P82WNXOWdZFrht+pWgv69ee8eCJe/PGm5/c+2k/1ODLyut76ks9dKJ7Ux91BNqee jEieyAmOjUCMs7d/0kH7+ds9XsrlS/ScC/dqd13bNLRQW/RC8uKzE5LiYwWX3tQk2P2x/cw85 cPvQjuqinKdo/6WheT71QZliD2pV5H5rlYg0LPF/pvX5RdLzwQijfhaaImLvT98hNDph7SZz5 jrnzug/F50uWbr513M1hfY/ykQP/tafGz7QL2sH78oS3wo6oVWtucW6v7nF5ZPPd7/TiSJ+95 04sVGIpzkg01GIuKk4EAAzacTOPAwAA X-Env-Sender: markpearson@lenovo.com X-Msg-Ref: server-15.tower-326.messagelabs.com!1603152991!35623!1 X-Originating-IP: [103.30.234.6] X-SYMC-ESS-Client-Auth: outbound-route-from=pass X-StarScan-Received: X-StarScan-Version: 9.60.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9420 invoked from network); 20 Oct 2020 00:16:33 -0000 Received: from unknown (HELO lenovo.com) (103.30.234.6) by server-15.tower-326.messagelabs.com with ECDHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 20 Oct 2020 00:16:33 -0000 Received: from reswpmail04.lenovo.com (unknown [10.62.32.23]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by Forcepoint Email with ESMTPS id 4ACE72EBD72DE1C2A7D1; Tue, 20 Oct 2020 08:16:29 +0800 (CST) Received: from localhost.localdomain.com (10.64.93.219) by reswpmail04.lenovo.com (10.62.32.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2044.4; Mon, 19 Oct 2020 17:16:25 -0700 From: Mark Pearson To: CC: , , , , , , , Subject: [PATCH v2 2/3] platform/x86: thinkpad_acpi: Add support for Lenovo palm sensor Date: Mon, 19 Oct 2020 20:15:55 -0400 Message-ID: <20201020001556.388099-2-markpearson@lenovo.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201020001556.388099-1-markpearson@lenovo.com> References: <20201020001556.388099-1-markpearson@lenovo.com> MIME-Version: 1.0 X-Originating-IP: [10.64.93.219] X-ClientProxiedBy: reswpmail04.lenovo.com (10.62.32.23) To reswpmail04.lenovo.com (10.62.32.23) Precedence: bulk List-ID: X-Mailing-List: platform-driver-x86@vger.kernel.org Use input device event support for notifying userspace of palm sensor state changes Signed-off-by: Mark Pearson --- drivers/platform/x86/thinkpad_acpi.c | 99 +++++++++++++++++++++++++++- 1 file changed, 97 insertions(+), 2 deletions(-) diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c index eae3579f106f..5ddf2775fb06 100644 --- a/drivers/platform/x86/thinkpad_acpi.c +++ b/drivers/platform/x86/thinkpad_acpi.c @@ -4013,6 +4013,7 @@ static bool hotkey_notify_usrevent(const u32 hkey, } static void thermal_dump_all_sensors(void); +static void proxsensor_refresh(void); static bool hotkey_notify_6xxx(const u32 hkey, bool *send_acpi_ev, @@ -4079,8 +4080,8 @@ static bool hotkey_notify_6xxx(const u32 hkey, case TP_HKEY_EV_PALM_DETECTED: case TP_HKEY_EV_PALM_UNDETECTED: - /* palm detected hovering the keyboard, forward to user-space - * via netlink for consumption */ + /* palm detected - pass on to event handler */ + proxsensor_refresh(); return true; default: @@ -9918,6 +9919,96 @@ static struct ibm_struct dytc_driver_data = { .exit = dytc_exit, }; +/************************************************************************* + * Proximity sensor subdriver + */ + +#define PALMSENSOR_PRESENT_BIT 0 /* Determine if psensor present */ +#define PALMSENSOR_ON_BIT 1 /* psensor status */ + +struct input_dev *tpacpi_sw_dev; +bool has_palmsensor; +bool palmsensor_state; + +static int palmsensor_get(bool *present, bool *state) +{ + acpi_handle psensor_handle; + int output; + + if (ACPI_FAILURE(acpi_get_handle(hkey_handle, "GPSS", &psensor_handle))) + return -ENODEV; + if (!acpi_evalf(psensor_handle, &output, NULL, "d")) + return -EIO; + + *present = output & BIT(PALMSENSOR_PRESENT_BIT) ? true : false; + *state = output & BIT(PALMSENSOR_ON_BIT) ? true : false; + return 0; +} + +static void proxsensor_refresh(void) +{ + bool new_state; + int err; + + if (has_palmsensor) { + err = palmsensor_get(&has_palmsensor, &new_state); + if (err) + return; + if (new_state != palmsensor_state) { + input_report_switch(tpacpi_sw_dev, SW_PALMREST_PROXIMITY, new_state); + input_sync(tpacpi_sw_dev); + palmsensor_state = new_state; + } + } +} + +static int tpacpi_proxsensor_init(struct ibm_init_struct *iibm) +{ + int palm_err; + + palm_err = palmsensor_get(&has_palmsensor, &palmsensor_state); + /* If support isn't available (ENODEV) then don't return an error */ + if (palm_err == -ENODEV) + return 0; + /* For all other errors we can flag the failure */ + if (palm_err) + return palm_err; + + if (has_palmsensor) { + tpacpi_sw_dev = input_allocate_device(); + if (!tpacpi_sw_dev) + return -ENOMEM; + tpacpi_sw_dev->name = "Thinkpad proximity switches"; + tpacpi_sw_dev->phys = TPACPI_DRVR_NAME "/input1"; + tpacpi_sw_dev->id.bustype = BUS_HOST; + tpacpi_sw_dev->id.vendor = thinkpad_id.vendor; + tpacpi_sw_dev->id.product = TPACPI_HKEY_INPUT_PRODUCT; + tpacpi_sw_dev->id.version = TPACPI_HKEY_INPUT_VERSION; + tpacpi_sw_dev->dev.parent = &tpacpi_pdev->dev; + + if (has_palmsensor) { + input_set_capability(tpacpi_sw_dev, EV_SW, SW_PALMREST_PROXIMITY); + input_report_switch(tpacpi_sw_dev, SW_PALMREST_PROXIMITY, palmsensor_state); + } + palm_err = input_register_device(tpacpi_sw_dev); + if (palm_err) { + input_free_device(tpacpi_sw_dev); + return palm_err; + } + } + return 0; +} + +static void proxsensor_exit(void) +{ + input_unregister_device(tpacpi_sw_dev); + input_free_device(tpacpi_sw_dev); +} + +static struct ibm_struct proxsensor_driver_data = { + .name = "proximity-sensor", + .exit = proxsensor_exit, +}; /**************************************************************************** **************************************************************************** * @@ -10411,6 +10502,10 @@ static struct ibm_init_struct ibms_init[] __initdata = { .init = tpacpi_dytc_init, .data = &dytc_driver_data, }, + { + .init = tpacpi_proxsensor_init, + .data = &proxsensor_driver_data, + }, }; static int __init set_ibm_param(const char *val, const struct kernel_param *kp) From patchwork Tue Oct 20 00:15:56 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Pearson X-Patchwork-Id: 11845517 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E500B14B7 for ; Tue, 20 Oct 2020 00:16:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CED4C2242A for ; Tue, 20 Oct 2020 00:16:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389315AbgJTAQj (ORCPT ); Mon, 19 Oct 2020 20:16:39 -0400 Received: from mail1.bemta23.messagelabs.com ([67.219.246.2]:61265 "EHLO mail1.bemta23.messagelabs.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727220AbgJTAQj (ORCPT ); Mon, 19 Oct 2020 20:16:39 -0400 Received: from [100.112.1.203] (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256 bits)) by server-2.bemta.az-b.us-east-1.aws.symcld.net id 6B/76-19530-56C2E8F5; Tue, 20 Oct 2020 00:16:37 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrFIsWRWlGSWpSXmKPExsWSLveKTTdFpy/ eoHGhkcWhcweYLQ4vesFo8fXbbXaLN8enM1mcub2QyeLmp2+sFqv3vGB2YPeY1dDL5rFz1l12 j1/b1rB4LD84jcnj/b6rbB6fN8kFsEWxZuYl5VcksGb8XtfBVNCpWrHlglYD4yz5LkYuDiGB/ 4wSCyddYIFw3jBKvFw8l62LkZODTUBbYsuWX0A2B4eIgIzEh7WeIDXMArcZJZ7vagCrERYIkz iwZzcziM0ioCpxufEhI4jNK2Ajse3CJiYQW0JAXuJp73JmkDmcArYSHxZ7g4SFgFqPH7nPDlE uKHFy5hMWEJsZqLx562xmCFtC4uCLF8wQYxQk3s69zwZhJ0gse3mHeQKjwCwk7bOQtM9C0r6A kXkVo1lSUWZ6RkluYmaOrqGBga6hoZGuka6hsaleYpVukl5psW5qYnGJrqFeYnmxXnFlbnJOi l5easkmRmCUpBQwte9gbH3zQe8QoyQHk5Io7xb1vnghvqT8lMqMxOKM+KLSnNTiQ4wyHBxKEr zS2kA5waLU9NSKtMwcYMTCpCU4eJREeHO0gNK8xQWJucWZ6RCpU4yKUuK8LzWBEgIgiYzSPLg 2WJK4xCgrJczLyMDAIMRTkFqUm1mCKv+KUZyDUUmY9zjIeJ7MvBK46a+AFjMBLbbt7wFZXJKI kJJqYPJJyO/5euZ1puQkVcaZps3X1GZ/aXAWZDz3VMZv70/brfvONKwRUZfu320cyt9Qf+zi1 hpBBRV/xtmThBxm/9D/HeGun2sSsO75v+v6/75OLFz84n0bf42h8c3kLonZ6xeXXrsx8ff5XP an/LwtuyU+2u/KMFpfluD5Wjd9xuQMy235HCZhCkr2okLnvffUVgXmbi7uqOrNeyeur5uYvWW DQWPYpduXaizPl5yYek3mVEhEgWa4hZ3E08tfPsmIOrl//Di1Jivpj87Wz6fSNl0xu1K87LVg 7Evt1J+KNp+r+37t3LlbiFljl5VNSVbnnyZZTuf/KtviLyfz6pp2b/trZL2IsVnrgJNR8smpS izFGYmGWsxFxYkAIPzOFI0DAAA= X-Env-Sender: markpearson@lenovo.com X-Msg-Ref: server-29.tower-386.messagelabs.com!1603152994!280886!1 X-Originating-IP: [103.30.234.6] X-SYMC-ESS-Client-Auth: outbound-route-from=pass X-StarScan-Received: X-StarScan-Version: 9.60.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8827 invoked from network); 20 Oct 2020 00:16:36 -0000 Received: from unknown (HELO lenovo.com) (103.30.234.6) by server-29.tower-386.messagelabs.com with ECDHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 20 Oct 2020 00:16:36 -0000 Received: from reswpmail04.lenovo.com (unknown [10.62.32.23]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by Forcepoint Email with ESMTPS id E3913BDF76B17A0CCB25; Tue, 20 Oct 2020 08:16:32 +0800 (CST) Received: from localhost.localdomain.com (10.64.93.219) by reswpmail04.lenovo.com (10.62.32.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2044.4; Mon, 19 Oct 2020 17:16:28 -0700 From: Mark Pearson To: CC: , , , , , , , Subject: [PATCH v2 3/3] platform/x86: thinkpad_acpi: Add support for Lenovo lap sensor Date: Mon, 19 Oct 2020 20:15:56 -0400 Message-ID: <20201020001556.388099-3-markpearson@lenovo.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201020001556.388099-1-markpearson@lenovo.com> References: <20201020001556.388099-1-markpearson@lenovo.com> MIME-Version: 1.0 X-Originating-IP: [10.64.93.219] X-ClientProxiedBy: reswpmail04.lenovo.com (10.62.32.23) To reswpmail04.lenovo.com (10.62.32.23) Precedence: bulk List-ID: X-Mailing-List: platform-driver-x86@vger.kernel.org Use input device event support for notifying userspace of lap mode sensor state changes. Signed-off-by: Mark Pearson --- drivers/platform/x86/thinkpad_acpi.c | 75 ++++++++++++++++++++++------ 1 file changed, 59 insertions(+), 16 deletions(-) diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c index 5ddf2775fb06..c20b9902270b 100644 --- a/drivers/platform/x86/thinkpad_acpi.c +++ b/drivers/platform/x86/thinkpad_acpi.c @@ -4013,7 +4013,7 @@ static bool hotkey_notify_usrevent(const u32 hkey, } static void thermal_dump_all_sensors(void); -static void proxsensor_refresh(void); +static void proxsensor_refresh(bool palm, bool lap); static bool hotkey_notify_6xxx(const u32 hkey, bool *send_acpi_ev, @@ -4081,7 +4081,7 @@ static bool hotkey_notify_6xxx(const u32 hkey, case TP_HKEY_EV_PALM_DETECTED: case TP_HKEY_EV_PALM_UNDETECTED: /* palm detected - pass on to event handler */ - proxsensor_refresh(); + proxsensor_refresh(true /* palm */, false /* lap */); return true; default: @@ -9929,6 +9929,23 @@ static struct ibm_struct dytc_driver_data = { struct input_dev *tpacpi_sw_dev; bool has_palmsensor; bool palmsensor_state; +bool has_lapsensor; +bool lapsensor_state; + +static int lapsensor_get(bool *present, bool *state) +{ + acpi_handle dytc_handle; + int output; + + *present = false; + if (ACPI_FAILURE(acpi_get_handle(hkey_handle, "DYTC", &dytc_handle))) + return -ENODEV; + if (!acpi_evalf(dytc_handle, &output, NULL, "dd", DYTC_CMD_GET)) + return -EIO; + *present = true; /*If we get his far, we have lapmode support*/ + *state = output & BIT(DYTC_GET_LAPMODE_BIT) ? true : false; + return 0; +} static int palmsensor_get(bool *present, bool *state) { @@ -9945,36 +9962,56 @@ static int palmsensor_get(bool *present, bool *state) return 0; } -static void proxsensor_refresh(void) +static void proxsensor_refresh(bool palm, bool lap) { bool new_state; int err; - if (has_palmsensor) { + if (palm && has_palmsensor) { err = palmsensor_get(&has_palmsensor, &new_state); - if (err) - return; - if (new_state != palmsensor_state) { + if (!err && (new_state != palmsensor_state)) { input_report_switch(tpacpi_sw_dev, SW_PALMREST_PROXIMITY, new_state); input_sync(tpacpi_sw_dev); palmsensor_state = new_state; } } + + if (lap && has_lapsensor) { + err = lapsensor_get(&has_lapsensor, &new_state); + if (!err && (new_state != lapsensor_state)) { + input_report_switch(tpacpi_sw_dev, SW_LAP_PROXIMITY, new_state); + input_sync(tpacpi_sw_dev); + lapsensor_state = new_state; + } + } } static int tpacpi_proxsensor_init(struct ibm_init_struct *iibm) { - int palm_err; + int palm_err, lap_err, err; + /* Make sure globals are set to a sensible initial value */ + has_palmsensor = false; + has_lapsensor = false; palm_err = palmsensor_get(&has_palmsensor, &palmsensor_state); + lap_err = lapsensor_get(&has_lapsensor, &lapsensor_state); + /* If support isn't available (ENODEV) then don't return an error */ - if (palm_err == -ENODEV) + if ((palm_err == -ENODEV) && (lap_err == -ENODEV)) return 0; - /* For all other errors we can flag the failure */ + /* If both sensors error out - return an error */ + if (palm_err && lap_err) + return palm_err ? palm_err : lap_err; + /* + * If just one sensor not available, we still want the input device, + * so just flag it and carry on + */ if (palm_err) - return palm_err; + pr_info("Palm sensor returned error %d", palm_err); + if (lap_err) + pr_info("Lap sensor returned error %d", lap_err); - if (has_palmsensor) { + if (has_palmsensor || has_lapsensor) { tpacpi_sw_dev = input_allocate_device(); if (!tpacpi_sw_dev) return -ENOMEM; @@ -9990,10 +10027,14 @@ static int tpacpi_proxsensor_init(struct ibm_init_struct *iibm) input_set_capability(tpacpi_sw_dev, EV_SW, SW_PALMREST_PROXIMITY); input_report_switch(tpacpi_sw_dev, SW_PALMREST_PROXIMITY, palmsensor_state); } - palm_err = input_register_device(tpacpi_sw_dev); - if (palm_err) { + if (has_lapsensor) { + input_set_capability(tpacpi_sw_dev, EV_SW, SW_LAP_PROXIMITY); + input_report_switch(tpacpi_sw_dev, SW_LAP_PROXIMITY, lapsensor_state); + } + err = input_register_device(tpacpi_sw_dev); + if (err) { input_free_device(tpacpi_sw_dev); - return palm_err; + return err; } } return 0; @@ -10057,8 +10098,10 @@ static void tpacpi_driver_event(const unsigned int hkey_event) mutex_unlock(&kbdlight_mutex); } - if (hkey_event == TP_HKEY_EV_THM_CSM_COMPLETED) + if (hkey_event == TP_HKEY_EV_THM_CSM_COMPLETED) { dytc_lapmode_refresh(); + proxsensor_refresh(false /* palm */, true /* lap */); + } }