From patchwork Wed Aug 9 00:01:35 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cameron Gutman X-Patchwork-Id: 9889311 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 3CF8A60352 for ; Wed, 9 Aug 2017 00:02:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2F27F28A2A for ; Wed, 9 Aug 2017 00:02:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 238B428A2D; Wed, 9 Aug 2017 00:02:11 +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=-6.3 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID 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 A63FC28A1D for ; Wed, 9 Aug 2017 00:02:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752419AbdHIACJ (ORCPT ); Tue, 8 Aug 2017 20:02:09 -0400 Received: from mail-pf0-f195.google.com ([209.85.192.195]:34225 "EHLO mail-pf0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751970AbdHIACI (ORCPT ); Tue, 8 Aug 2017 20:02:08 -0400 Received: by mail-pf0-f195.google.com with SMTP id t86so4509274pfe.1; Tue, 08 Aug 2017 17:02:08 -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; bh=8XIhX/nJa5FzjIjcnOX27TRz+hOBRnUvdqYTNszYwyI=; b=d8O7NVkjZeNrsnxp4rh3nBLXa7hNNTYwN69IRzxxFtTfAcATp6ksm+3wtVyB7rhOcR 6AJIdPyO6/MheLn8Hgh1qb+ccAr0o8A4FBuZ/cD2a/RPbc31NxQF22VDdaHqH8o+5IbH slodnBQBP/Bv4c8SqRJvtX8hYJJSx68MFWXsUjaZKdtSWB3M9ME0adz7mI8Gee1xfrP3 BuThmxyZGvF5UU1FIXEq6rflavfoEcBaVnoDGqKNLhMEZKDgq8dLbfhudtk1l1ydnK6H SqdvjyUq064yqISLEDvTuZfO6Dxijt9pWhgbqlPYJK6AV0SkzP+/9Q011zPqPA38Cret qHBw== 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; bh=8XIhX/nJa5FzjIjcnOX27TRz+hOBRnUvdqYTNszYwyI=; b=WrppXjZyQdHBLQr09KisqgaXNS0Rl572k0MScJPVnm2ogOQ07gPwRLVHAGO+yxW+sD coTJZl3aP0dKeta0tdlig9Rm1rotxehbl1msft/79G4GIGpp8M5z6wGF8a3i+PYL8U/i gK4VHI2YppEA1Y/TBDIvyXsUJEan56Ec0KzfF07k0NXRYcqGsl5lOqpECN0oeOylwx7c FLx4NmhK5GafbkvQilI8ljxm8CKZ1NVVz1kLdGmdKX0djmdu36SfcuSGstW+HBHkDXMm Y7HYqkSs5EqXOjrGTDBx4MNdLxu35sayjSpqIZr5j35ydbcxwhDRxcU9GCSOZWYvJtyP 7y5g== X-Gm-Message-State: AHYfb5jmSqysiCkQRD2AVo5PAndRn2yi6nS5GUF8mS658Sy9IuHcjYwu IWYp5ZVBi0SP7g/EIpc= X-Received: by 10.84.179.194 with SMTP id b60mr6976677plc.166.1502236927840; Tue, 08 Aug 2017 17:02:07 -0700 (PDT) Received: from JUPITER.localdomain ([174.127.240.150]) by smtp.gmail.com with ESMTPSA id g9sm4638925pfe.104.2017.08.08.17.02.06 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 08 Aug 2017 17:02:07 -0700 (PDT) From: Cameron Gutman To: dmitry.torokhov@gmail.com, rojtberg@gmail.com Cc: linux-input@vger.kernel.org, kyleabeauchamp@gmail.com, linux-kernel@vger.kernel.org, Cameron Gutman Subject: [PATCH RESEND] Input: xpad - fix PowerA init quirk for some gamepad models Date: Tue, 8 Aug 2017 17:01:35 -0700 Message-Id: <20170809000135.27359-1-aicommander@gmail.com> X-Mailer: git-send-email 2.13.4 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 The PowerA gamepad initialization quirk worked with the PowerA wired gamepad I had around (0x24c6:0x543a), but a user reported [0] that it didn't work for him, even though our gamepads shared the same vendor and product IDs. When I initially implemented the PowerA quirk, I wanted to avoid actually triggering the rumble action during init. My tests showed that my gamepad would work correctly even if it received a rumble of 0 intensity, so that's what I went with. Unfortunately, this apparently isn't true for all models (perhaps a firmware difference?). This non-working gamepad seems to require the real magic rumble packet that the Microsoft driver sends, which actually vibrates the gamepad. To counteract this effect, I still send the old zero-rumble PowerA quirk packet which cancels the rumble effect before the motors can spin up enough to vibrate. [0]: https://github.com/paroj/xpad/issues/48#issuecomment-313904867 Reported-by: Kyle Beauchamp Tested-by: Kyle Beauchamp Fixes: 81093c9848a7 ("Input: xpad - support some quirky Xbox One pads") Cc: stable@vger.kernel.org # v4.12 Signed-off-by: Cameron Gutman --- Forgot to CC LKML last time, resending to hit the testbots (and people) there. --- drivers/input/joystick/xpad.c | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c index 298a6ba51411..ca0e19ae7a90 100644 --- a/drivers/input/joystick/xpad.c +++ b/drivers/input/joystick/xpad.c @@ -476,10 +476,21 @@ static const u8 xboxone_hori_init[] = { }; /* - * A rumble packet is required for some PowerA pads to start + * A specific rumble packet is required for some PowerA pads to start * sending input reports. One of those pads is (0x24c6:0x543a). */ -static const u8 xboxone_zerorumble_init[] = { +static const u8 xboxone_rumblebegin_init[] = { + 0x09, 0x00, 0x00, 0x09, 0x00, 0x0F, 0x00, 0x00, + 0x1D, 0x1D, 0xFF, 0x00, 0x00 +}; + +/* + * A rumble packet with zero FF intensity will immediately + * terminate the rumbling required to init PowerA pads. + * This should happen fast enough that the motors don't + * spin up to enough speed to actually vibrate the gamepad. + */ +static const u8 xboxone_rumbleend_init[] = { 0x09, 0x00, 0x00, 0x09, 0x00, 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; @@ -494,9 +505,12 @@ static const struct xboxone_init_packet xboxone_init_packets[] = { XBOXONE_INIT_PKT(0x0e6f, 0x0165, xboxone_hori_init), XBOXONE_INIT_PKT(0x0f0d, 0x0067, xboxone_hori_init), XBOXONE_INIT_PKT(0x0000, 0x0000, xboxone_fw2015_init), - XBOXONE_INIT_PKT(0x24c6, 0x541a, xboxone_zerorumble_init), - XBOXONE_INIT_PKT(0x24c6, 0x542a, xboxone_zerorumble_init), - XBOXONE_INIT_PKT(0x24c6, 0x543a, xboxone_zerorumble_init), + XBOXONE_INIT_PKT(0x24c6, 0x541a, xboxone_rumblebegin_init), + XBOXONE_INIT_PKT(0x24c6, 0x542a, xboxone_rumblebegin_init), + XBOXONE_INIT_PKT(0x24c6, 0x543a, xboxone_rumblebegin_init), + XBOXONE_INIT_PKT(0x24c6, 0x541a, xboxone_rumbleend_init), + XBOXONE_INIT_PKT(0x24c6, 0x542a, xboxone_rumbleend_init), + XBOXONE_INIT_PKT(0x24c6, 0x543a, xboxone_rumbleend_init), }; struct xpad_output_packet {