From patchwork Thu Aug 16 02:44:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Smirnov X-Patchwork-Id: 10566929 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 5DC2A139A for ; Thu, 16 Aug 2018 02:45:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3AF2A29CD6 for ; Thu, 16 Aug 2018 02:45:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2F5B02ACB8; Thu, 16 Aug 2018 02:45:27 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1EA7029CD6 for ; Thu, 16 Aug 2018 02:45:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387800AbeHPFkU (ORCPT ); Thu, 16 Aug 2018 01:40:20 -0400 Received: from mail-pl0-f67.google.com ([209.85.160.67]:38133 "EHLO mail-pl0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726473AbeHPFkU (ORCPT ); Thu, 16 Aug 2018 01:40:20 -0400 Received: by mail-pl0-f67.google.com with SMTP id u11-v6so1330580plq.5; Wed, 15 Aug 2018 19:45:09 -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; bh=WB5YLAG5F5y6IWxFhlAGC/WdNvOpGjLb+B1NuNsthz4=; b=a+VKeV7NXBEL2KPZTXJNleHRkuESXsYwLTRJ1zp/GULzkMFscHxrl/bKS4fKXAwUE/ 7BVtMA5vjTbfDSKzWJd6PhVTpP734d9BiFCn3eHGEQjInuoEkvQ/bkxpEwkVPt5pzAi6 nBdNm+3pzK94G+mhDpn2RWZOuWXVe6gGYbTceHJSuN/zW7J3tbcy2ZGbOdDzUYRssLzG fIfoGaS6aoE0oFMRgin+7bjjucB9AKvEvYKqiPdmvr4YWkIJqj5oUklVrV0/SgmmcRCa vaYdQopz/KGq6P4+zEt0d4BfsuZtUbH/YliSki0ddjEG57A6c2xSd4yxa/4nv4FVjLtm u7ew== 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; bh=WB5YLAG5F5y6IWxFhlAGC/WdNvOpGjLb+B1NuNsthz4=; b=IPYkEZO/3g7KcbOUfFPph4QLdWtkv0JwaCqIx5/EMRhBdZehE15IEUYxMB+D9ZXEWV K9XVCNtWICDDS654AnfZMdKylljK5pROecM9X2ENxMH4uqk1G3SCEYWCptgIjvo3psfs yWEuKqdG/Aof0bYR0ipJDKKXjy9r4b5UCHmlsIcJjGuxMtPsTiHpBsQ9jUY/YSrm7HvS z1xzpZVZ6wlfnDk96DkYFvxdd5SYCQJ0+wYCzSPO+w+a0CklydRMva8nzsCy8HqTeHZP iU4KuszJkrgRkI2LH2yN6iJHnHz6hSgCqNVHhiW7VYL/pN/nogGtedD1PppGEd+5Kp22 7ZKQ== X-Gm-Message-State: AOUpUlG2A14iMfOZLTIIzOg5DqJ0C/2ZzoyXYRAZw8NMo3ujnkoc3zxc zLKQM0W9XkU9TcufqI+JOFg= X-Google-Smtp-Source: AA+uWPylMHLDmF4sO0+whtbua2tnZoWE8dxYwK+rG15okff4g7fRo77hDtXTdQ24QBQ/UtjyL1liFg== X-Received: by 2002:a17:902:32a4:: with SMTP id z33-v6mr27192975plb.226.1534387508705; Wed, 15 Aug 2018 19:45:08 -0700 (PDT) Received: from squirtle.lan (c-24-22-235-96.hsd1.wa.comcast.net. [24.22.235.96]) by smtp.gmail.com with ESMTPSA id t15-v6sm37823323pfa.158.2018.08.15.19.45.07 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 15 Aug 2018 19:45:07 -0700 (PDT) From: Andrey Smirnov To: Jiri Kosina Cc: Andrey Smirnov , Dmitry Torokhov , Benjamin Tissoires , linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, "Pierre-Loup A . Griffais" , Juha Kuikka Subject: [PATCH v2 1/2] hid: microsoft: Convert private data to be a proper struct Date: Wed, 15 Aug 2018 19:44:09 -0700 Message-Id: <20180816024410.29218-2-andrew.smirnov@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180816024410.29218-1-andrew.smirnov@gmail.com> References: <20180816024410.29218-1-andrew.smirnov@gmail.com> Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP In order to be able to have more than just an unsigned long worth of private data, convert the code to allocate and use a dedicated struct. Cc: Dmitry Torokhov Cc: Jiri Kosina Cc: Benjamin Tissoires Cc: linux-input@vger.kernel.org Cc: linux-kernel@vger.kernel.org Cc: Pierre-Loup A. Griffais Signed-off-by: Juha Kuikka Signed-off-by: Andrey Smirnov --- drivers/hid/hid-microsoft.c | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/drivers/hid/hid-microsoft.c b/drivers/hid/hid-microsoft.c index 96e7d3231d2f..f8868d96c0c7 100644 --- a/drivers/hid/hid-microsoft.c +++ b/drivers/hid/hid-microsoft.c @@ -29,10 +29,15 @@ #define MS_NOGET 0x10 #define MS_DUPLICATE_USAGES 0x20 +struct ms_data { + unsigned long quirks; +}; + static __u8 *ms_report_fixup(struct hid_device *hdev, __u8 *rdesc, unsigned int *rsize) { - unsigned long quirks = (unsigned long)hid_get_drvdata(hdev); + struct ms_data *ms = hid_get_drvdata(hdev); + unsigned long quirks = ms->quirks; /* * Microsoft Wireless Desktop Receiver (Model 1028) has @@ -134,7 +139,8 @@ static int ms_input_mapping(struct hid_device *hdev, struct hid_input *hi, struct hid_field *field, struct hid_usage *usage, unsigned long **bit, int *max) { - unsigned long quirks = (unsigned long)hid_get_drvdata(hdev); + struct ms_data *ms = hid_get_drvdata(hdev); + unsigned long quirks = ms->quirks; if (quirks & MS_ERGONOMY) { int ret = ms_ergonomy_kb_quirk(hi, usage, bit, max); @@ -153,7 +159,8 @@ static int ms_input_mapped(struct hid_device *hdev, struct hid_input *hi, struct hid_field *field, struct hid_usage *usage, unsigned long **bit, int *max) { - unsigned long quirks = (unsigned long)hid_get_drvdata(hdev); + struct ms_data *ms = hid_get_drvdata(hdev); + unsigned long quirks = ms->quirks; if (quirks & MS_DUPLICATE_USAGES) clear_bit(usage->code, *bit); @@ -164,7 +171,8 @@ static int ms_input_mapped(struct hid_device *hdev, struct hid_input *hi, static int ms_event(struct hid_device *hdev, struct hid_field *field, struct hid_usage *usage, __s32 value) { - unsigned long quirks = (unsigned long)hid_get_drvdata(hdev); + struct ms_data *ms = hid_get_drvdata(hdev); + unsigned long quirks = ms->quirks; struct input_dev *input; if (!(hdev->claimed & HID_CLAIMED_INPUT) || !field->hidinput || @@ -222,9 +230,16 @@ static int ms_event(struct hid_device *hdev, struct hid_field *field, static int ms_probe(struct hid_device *hdev, const struct hid_device_id *id) { unsigned long quirks = id->driver_data; + struct ms_data *ms; int ret; - hid_set_drvdata(hdev, (void *)quirks); + ms = devm_kzalloc(&hdev->dev, sizeof(*ms), GFP_KERNEL); + if (ms == NULL) + return -ENOMEM; + + ms->quirks = quirks; + + hid_set_drvdata(hdev, ms); if (quirks & MS_NOGET) hdev->quirks |= HID_QUIRK_NOGET; From patchwork Thu Aug 16 02:44:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Smirnov X-Patchwork-Id: 10566927 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D1948921 for ; Thu, 16 Aug 2018 02:45:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AD73929CD6 for ; Thu, 16 Aug 2018 02:45:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A00012ACB8; Thu, 16 Aug 2018 02:45:23 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DAB3629CD6 for ; Thu, 16 Aug 2018 02:45:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387814AbeHPFkW (ORCPT ); Thu, 16 Aug 2018 01:40:22 -0400 Received: from mail-pl0-f68.google.com ([209.85.160.68]:34344 "EHLO mail-pl0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387802AbeHPFkV (ORCPT ); Thu, 16 Aug 2018 01:40:21 -0400 Received: by mail-pl0-f68.google.com with SMTP id f6-v6so1337634plo.1; Wed, 15 Aug 2018 19:45:10 -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; bh=EKUZVPR7XnLZOsjr5K2KoU6Was7+ha87cagi1tAlF+w=; b=LOM9MV87hNrcw+foIY/qnW56+bTm5PRSiQxRbRM5Y4EG76KMCUGShWuQZUE9OPataA ayJad1dQ7PxUFhAmyqgk+yLpP0KPqqktpIQbHSMvyz2Ved/EJvdhYXyhjrM56kSRo0lh PH3g/Mlm6bkqKVpq/J9Etll6l4K9jZ2L5BaTKmjFqpGhUdI2CF+zLU/1EESdJPg2Cp5u uAYZBucoKf+uS7oMWx4QBM01XYSlb5scD7Y7x9GwzpIpFTBHpq8PLa/JQBvu350ebTpH THQ5CqWM+/JCaCQFhc32+2uinAyi9wrQOHgMZvVuHjD1Yxnj66BX5HpLY1SMx3CvKbIb KsiA== 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; bh=EKUZVPR7XnLZOsjr5K2KoU6Was7+ha87cagi1tAlF+w=; b=NuMtou86JmW5ZJa/1A3Uaz5UcDysDwxn9WmxRG/K8BXVComNBsOZXbQRB8pGpoz0P6 CruFMx3EXYpIL/fXsC98kxrGKTZq3t6AjBKspSyEZJJhbSUxrm2rwCRFxDIctCi1u6f/ ozuMrBbb/GwWvCQkvgBbGHNrYqa9Aw8dSUks5BRIa9t5WAgxDBJ289WQ+DOEhD1Wor/l ePgx1rUhvKcurvHB58QPTAmt81om3C1JaeqZI/PU5R0yMSQH6SAsOMm/XRfYWalqLblR OEFFbcbj7UYguYDv3bz/BwUKGzbbvbbRWXO34yK1vdYJq3+sTxlHfw3VkjCF9yOPf5CB OVyA== X-Gm-Message-State: AOUpUlHH4Ma2U3GxM/zWzEX75asWF8Zx1lGH1cuo/XvTgEH0NzsRGyCh BEY+JOFyoUkQbk3jhH3FEwE= X-Google-Smtp-Source: AA+uWPxsymLlyfoMaHA6nOrf1JLvaPWEdkYh4mHP3Ons9LYNbrspMa+DLHR5aHR+hjqEuU1Bnno16Q== X-Received: by 2002:a17:902:b60b:: with SMTP id b11-v6mr26803370pls.301.1534387509944; Wed, 15 Aug 2018 19:45:09 -0700 (PDT) Received: from squirtle.lan (c-24-22-235-96.hsd1.wa.comcast.net. [24.22.235.96]) by smtp.gmail.com with ESMTPSA id t15-v6sm37823323pfa.158.2018.08.15.19.45.08 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 15 Aug 2018 19:45:09 -0700 (PDT) From: Andrey Smirnov To: Jiri Kosina Cc: Andrey Smirnov , Dmitry Torokhov , Benjamin Tissoires , linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, "Pierre-Loup A . Griffais" , Juha Kuikka Subject: [PATCH v2 2/2] hid: microsoft: Add rumble support for Xbox One S controller Date: Wed, 15 Aug 2018 19:44:10 -0700 Message-Id: <20180816024410.29218-3-andrew.smirnov@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180816024410.29218-1-andrew.smirnov@gmail.com> References: <20180816024410.29218-1-andrew.smirnov@gmail.com> Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Add HID quirk driver for Xbox One S controller over bluetooth. This driver only adds support for rumble. Standard controller functionality is exposed by default HID driver. Cc: Dmitry Torokhov Cc: Jiri Kosina Cc: Benjamin Tissoires Cc: linux-input@vger.kernel.org Cc: linux-kernel@vger.kernel.org Cc: Pierre-Loup A. Griffais Signed-off-by: Juha Kuikka Signed-off-by: Andrey Smirnov --- drivers/hid/hid-ids.h | 1 + drivers/hid/hid-microsoft.c | 117 ++++++++++++++++++++++++++++++++++++ 2 files changed, 118 insertions(+) diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index c7981ddd8776..c8b4bc7fe053 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h @@ -798,6 +798,7 @@ #define USB_DEVICE_ID_MS_TOUCH_COVER_2 0x07a7 #define USB_DEVICE_ID_MS_TYPE_COVER_2 0x07a9 #define USB_DEVICE_ID_MS_POWER_COVER 0x07da +#define USB_DEVICE_ID_MS_XBOX_ONE_S_CONTROLLER 0x02fd #define USB_VENDOR_ID_MOJO 0x8282 #define USB_DEVICE_ID_RETRO_ADAPTER 0x3201 diff --git a/drivers/hid/hid-microsoft.c b/drivers/hid/hid-microsoft.c index f8868d96c0c7..3bbef16d876a 100644 --- a/drivers/hid/hid-microsoft.c +++ b/drivers/hid/hid-microsoft.c @@ -28,11 +28,36 @@ #define MS_RDESC 0x08 #define MS_NOGET 0x10 #define MS_DUPLICATE_USAGES 0x20 +#define MS_QUIRK_FF 0x40 struct ms_data { unsigned long quirks; + struct hid_device *hdev; + struct work_struct ff_worker; + __u8 strong; + __u8 weak; + void *output_report_dmabuf; }; +#define XB1S_FF_REPORT 3 +#define ENABLE_WEAK BIT(0) +#define ENABLE_STRONG BIT(1) + +enum { + MAGNITUDE_STRONG = 2, + MAGNITUDE_WEAK, + MAGNITUDE_NUM +}; + +struct xb1s_ff_report { + __u8 report_id; + __u8 enable; + __u8 magnitude[MAGNITUDE_NUM]; + __u8 duration_10ms; + __u8 start_delay_10ms; + __u8 loop_count; +} __packed; + static __u8 *ms_report_fixup(struct hid_device *hdev, __u8 *rdesc, unsigned int *rsize) { @@ -227,6 +252,84 @@ static int ms_event(struct hid_device *hdev, struct hid_field *field, return 0; } +static void ms_ff_worker(struct work_struct *work) +{ + struct ms_data *ms = container_of(work, struct ms_data, ff_worker); + struct hid_device *hdev = ms->hdev; + struct xb1s_ff_report *r = ms->output_report_dmabuf; + int ret; + + memset(r, 0, sizeof(*r)); + + r->report_id = XB1S_FF_REPORT; + r->enable = ENABLE_WEAK | ENABLE_STRONG; + /* + * Specifying maximum duration and maximum loop count should + * cover maximum duration of a single effect, which is 65536 + * ms + */ + r->duration_10ms = U8_MAX; + r->loop_count = U8_MAX; + r->magnitude[MAGNITUDE_STRONG] = ms->strong; /* left actuator */ + r->magnitude[MAGNITUDE_WEAK] = ms->weak; /* right actuator */ + + ret = hid_hw_output_report(hdev, (__u8 *)r, sizeof(*r)); + if (ret) + hid_warn(hdev, "failed to send FF report\n"); +} + +static int ms_play_effect(struct input_dev *dev, void *data, + struct ff_effect *effect) +{ + struct hid_device *hid = input_get_drvdata(dev); + struct ms_data *ms = hid_get_drvdata(hid); + + if (effect->type != FF_RUMBLE) + return 0; + + /* + * Magnitude is 0..100 so scale the 16-bit input here + */ + ms->strong = ((u32) effect->u.rumble.strong_magnitude * 100) / U16_MAX; + ms->weak = ((u32) effect->u.rumble.weak_magnitude * 100) / U16_MAX; + + schedule_work(&ms->ff_worker); + return 0; +} + +static int ms_init_ff(struct hid_device *hdev) +{ + struct hid_input *hidinput = list_entry(hdev->inputs.next, + struct hid_input, list); + struct input_dev *input_dev = hidinput->input; + struct ms_data *ms = hid_get_drvdata(hdev); + + if (!(ms->quirks & MS_QUIRK_FF)) + return 0; + + ms->hdev = hdev; + INIT_WORK(&ms->ff_worker, ms_ff_worker); + + ms->output_report_dmabuf = devm_kzalloc(&hdev->dev, + sizeof(struct xb1s_ff_report), + GFP_KERNEL); + if (ms->output_report_dmabuf == NULL) + return -ENOMEM; + + input_set_capability(input_dev, EV_FF, FF_RUMBLE); + return input_ff_create_memless(input_dev, NULL, ms_play_effect); +} + +static void ms_remove_ff(struct hid_device *hdev) +{ + struct ms_data *ms = hid_get_drvdata(hdev); + + if (!(ms->quirks & MS_QUIRK_FF)) + return; + + cancel_work_sync(&ms->ff_worker); +} + static int ms_probe(struct hid_device *hdev, const struct hid_device_id *id) { unsigned long quirks = id->driver_data; @@ -257,11 +360,21 @@ static int ms_probe(struct hid_device *hdev, const struct hid_device_id *id) goto err_free; } + ret = ms_init_ff(hdev); + if (ret) + hid_err(hdev, "could not initialize ff, continuing anyway"); + return 0; err_free: return ret; } +static void ms_remove(struct hid_device *hdev) +{ + hid_hw_stop(hdev); + ms_remove_ff(hdev); +} + static const struct hid_device_id ms_devices[] = { { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_SIDEWINDER_GV), .driver_data = MS_HIDINPUT }, @@ -296,6 +409,9 @@ static const struct hid_device_id ms_devices[] = { { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_PRESENTER_8K_BT), .driver_data = MS_PRESENTER }, + + { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_XBOX_ONE_S_CONTROLLER), + .driver_data = MS_QUIRK_FF }, { } }; MODULE_DEVICE_TABLE(hid, ms_devices); @@ -308,6 +424,7 @@ static struct hid_driver ms_driver = { .input_mapped = ms_input_mapped, .event = ms_event, .probe = ms_probe, + .remove = ms_remove, }; module_hid_driver(ms_driver);