From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.3 required=3.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6BB93C43613 for ; Thu, 20 Jun 2019 11:51:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3A4222080C for ; Thu, 20 Jun 2019 11:51:53 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="I6R2Opdo" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731708AbfFTLvw (ORCPT ); Thu, 20 Jun 2019 07:51:52 -0400 Received: from mail-wm1-f66.google.com ([209.85.128.66]:36340 "EHLO mail-wm1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731670AbfFTLvu (ORCPT ); Thu, 20 Jun 2019 07:51:50 -0400 Received: by mail-wm1-f66.google.com with SMTP id u8so2865560wmm.1; Thu, 20 Jun 2019 04:51:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ORab8cFgeuwHnA+7pmkFs/ZlJ8ccsngeYWedgpASCHk=; b=I6R2Opdo9zbRnHRKSoyLtt8UAbKgYaQ60ecuTP81tZixYrtwCl99zRz2gwrnA2zXIh GEoYQyyHTeX5PNcdQ2DMGayxJqyRKAJTqMGYImJC8gcY3GvTLeE1uKQ3a4Xu2lw9a8Ec 68E31KHU8D6SDLjzLgOh6vtsPqxpTV0OXO31NR/gbZpcTfQdN4yvbdhADHUXJcc3xFSB xXyIcHkTSYOPqvf9ZngXqMMSWZw7O7CzMco6eyBKdL9aHR69oW+dSPcU2UMX2W6sxQ7R XvLIOXccSA7GvMQjk7gpJOhj/gb36fsqvPcoOev8yC3e/lOyeLZjSGhaIDD8q3aXa/Lt F8WQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ORab8cFgeuwHnA+7pmkFs/ZlJ8ccsngeYWedgpASCHk=; b=OSFyK2a0FsjzvvGJCYNZu8IeZWMQDLxNs0019tuz3YmoMl9AqUnEq9q2SCzvn/bhI3 YZaieLnL90OQY+uFiSFGP1K+DzdGsjEBMMpj435K3EkUehH75XB1xhm2FV9sy4rdFxwe bV8NEdQw49zuZXUO5zU9ro5mkGu/ImZ6H+K22dMqjzcuMT/TDDPvUvsXFdvWwcE1bp90 ntBPjBVMFa0vrGNFdUVJSI237UJR1F+MlmlTpYplmbZpzLgY0OuwVv/qXTdjYdyE+qgB as42ZCIwtUnxWQ5SBRMSz1C0tIENOTZ4F9qJ5GlF5J7j39kKY4vONTzgZMe8Z/LC/77e F2gA== X-Gm-Message-State: APjAAAUnL0saxLgINrNEIXOiNRNKQamZiTzw14m0wv51aAiVHl+M5m7N ewYzUHlCXKpOJTxKy7CgGWNfBWkM X-Google-Smtp-Source: APXvYqxvJMS5+kvCfoIiJYNPo5pWG/4WPldX2JmydiO7a24R68REIABaduaKJRN9BwrkSreMIAvSIw== X-Received: by 2002:a1c:1947:: with SMTP id 68mr2588474wmz.171.1561031507422; Thu, 20 Jun 2019 04:51:47 -0700 (PDT) Received: from xws.fritz.box (pD9E5A621.dip0.t-ipconnect.de. [217.229.166.33]) by smtp.gmail.com with ESMTPSA id s7sm7918213wmc.2.2019.06.20.04.51.46 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 20 Jun 2019 04:51:46 -0700 (PDT) From: Maximilian Luz Cc: linux-kernel@vger.kernel.org, linux-input@vger.kernel.org, platform-driver-x86@vger.kernel.org, Dmitry Torokhov , Hans de Goede , Chen Yu , Darren Hart , Andy Shevchenko , Benjamin Tissoires , Maximilian Luz Subject: [PATCH 2/2] input: soc_button_array for newer surface devices Date: Thu, 20 Jun 2019 13:50:56 +0200 Message-Id: <20190620115056.4169-3-luzmaximilian@gmail.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190620115056.4169-1-luzmaximilian@gmail.com> References: <20190620115056.4169-1-luzmaximilian@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit To: unlisted-recipients:; (no To-header on input) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Power and volume button support for 5th and 6th genration Microsoft Surface devices via soc_button_array. Note that these devices use the same MSHW0040 device as on the Surface Pro 4, however the implementation is different (GPIOs vs. ACPI notifications). Thus some checking is required to ensure we only load this driver on the correct devices. Signed-off-by: Maximilian Luz --- drivers/input/misc/soc_button_array.c | 134 +++++++++++++++++++++++--- 1 file changed, 122 insertions(+), 12 deletions(-) diff --git a/drivers/input/misc/soc_button_array.c b/drivers/input/misc/soc_button_array.c index 5e59f8e57f8e..157f53a2bd51 100644 --- a/drivers/input/misc/soc_button_array.c +++ b/drivers/input/misc/soc_button_array.c @@ -25,6 +25,17 @@ struct soc_button_info { bool wakeup; }; +/** + * struct soc_device_data - driver data for different device types + * @button_info: specifications of buttons, if NULL specification is assumed to + * be present in _DSD + * @check: device-specific check (NULL means all will be accepted) + */ +struct soc_device_data { + struct soc_button_info *button_info; + int (*check)(struct device *dev); +}; + /* * Some of the buttons like volume up/down are auto repeat, while others * are not. To support both, we register two platform devices, and put @@ -310,6 +321,7 @@ static int soc_button_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; const struct acpi_device_id *id; + struct soc_device_data *device_data; struct soc_button_info *button_info; struct soc_button_data *priv; struct platform_device *pd; @@ -320,18 +332,20 @@ static int soc_button_probe(struct platform_device *pdev) if (!id) return -ENODEV; - if (!id->driver_data) { + device_data = (struct soc_device_data *)id->driver_data; + if (device_data && device_data->check) { + error = device_data->check(dev); + if (error) + return error; + } + + if (device_data && device_data->button_info) { + button_info = (struct soc_button_info *) + device_data->button_info; + } else { button_info = soc_button_get_button_info(dev); if (IS_ERR(button_info)) return PTR_ERR(button_info); - } else { - button_info = (struct soc_button_info *)id->driver_data; - } - - error = gpiod_count(dev, NULL); - if (error < 0) { - dev_dbg(dev, "no GPIO attached, ignoring...\n"); - return -ENODEV; } priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); @@ -357,12 +371,32 @@ static int soc_button_probe(struct platform_device *pdev) if (!priv->children[0] && !priv->children[1]) return -ENODEV; - if (!id->driver_data) + if (!device_data || !device_data->button_info) devm_kfree(dev, button_info); return 0; } + +static int soc_device_check_generic(struct device *dev) +{ + int gpios; + + gpios = gpiod_count(dev, NULL); + if (gpios < 0) { + dev_dbg(dev, "no GPIO attached, ignoring...\n"); + return -ENODEV; + } + + return 0; +} + +static struct soc_device_data soc_device_ACPI0011 = { + .button_info = NULL, + .check = soc_device_check_generic, +}; + + /* * Definition of buttons on the tablet. The ACPI index of each button * is defined in section 2.8.7.2 of "Windows ACPI Design Guide for SoC @@ -377,9 +411,85 @@ static struct soc_button_info soc_button_PNP0C40[] = { { } }; +static struct soc_device_data soc_device_PNP0C40 = { + .button_info = soc_button_PNP0C40, + .check = soc_device_check_generic, +}; + + +/* + * Special device check for Surface Book 2 and Surface Pro (2017). + * Both, the Surface Pro 4 (surfacepro3_button.c) and the above mentioned + * devices use MSHW0040 for power and volume buttons, however the way they + * have to be addressed differs. Make sure that we only load this drivers + * for the correct devices by checking the OEM Platform Revision provided by + * the _DSM method. + */ +#define MSHW0040_DSM_REVISION 0x01 +#define MSHW0040_DSM_GET_OMPR 0x02 // get OEM Platform Revision +static const guid_t MSHW0040_DSM_UUID = + GUID_INIT(0x6fd05c69, 0xcde3, 0x49f4, 0x95, 0xed, 0xab, 0x16, 0x65, + 0x49, 0x80, 0x35); + +static int soc_device_check_MSHW0040(struct device *dev) +{ + acpi_handle handle = ACPI_HANDLE(dev); + union acpi_object *result; + u64 oem_platform_rev = 0; + int gpios; + + // get OEM platform revision + result = acpi_evaluate_dsm_typed(handle, &MSHW0040_DSM_UUID, + MSHW0040_DSM_REVISION, + MSHW0040_DSM_GET_OMPR, NULL, + ACPI_TYPE_INTEGER); + + if (result) { + oem_platform_rev = result->integer.value; + ACPI_FREE(result); + } + + if (oem_platform_rev == 0) + return -ENODEV; + + dev_dbg(dev, "OEM Platform Revision %llu\n", oem_platform_rev); + + /* + * We are _really_ expecting GPIOs here. If we do not get any, this + * means the GPIO driver has not been loaded yet (which can happen). + * Try again later. + */ + gpios = gpiod_count(dev, NULL); + if (gpios < 0) + return -EAGAIN; + + return 0; +} + +/* + * Button infos for Microsoft Surface Book 2 and Surface Pro (2017). + * Obtained from DSDT/testing. + */ +static struct soc_button_info soc_button_MSHW0040[] = { + { "power", 0, EV_KEY, KEY_POWER, false, true }, + { "volume_up", 2, EV_KEY, KEY_VOLUMEUP, true, false }, + { "volume_down", 4, EV_KEY, KEY_VOLUMEDOWN, true, false }, + { } +}; + +static struct soc_device_data soc_device_MSHW0040 = { + .button_info = soc_button_MSHW0040, + .check = soc_device_check_MSHW0040, +}; + + static const struct acpi_device_id soc_button_acpi_match[] = { - { "PNP0C40", (unsigned long)soc_button_PNP0C40 }, - { "ACPI0011", 0 }, + { "PNP0C40", (unsigned long)&soc_device_PNP0C40 }, + { "ACPI0011", (unsigned long)&soc_device_ACPI0011 }, + + /* Microsoft Surface Devices (5th and 6th generation) */ + { "MSHW0040", (unsigned long)&soc_device_MSHW0040 }, + { } }; -- 2.22.0