From patchwork Thu Oct 1 20:57:22 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Rojtberg X-Patchwork-Id: 7311451 Return-Path: X-Original-To: patchwork-linux-input@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 4F272BEEA4 for ; Thu, 1 Oct 2015 20:58:15 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 130FF20815 for ; Thu, 1 Oct 2015 20:58:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3DFD920810 for ; Thu, 1 Oct 2015 20:58:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757177AbbJAU5u (ORCPT ); Thu, 1 Oct 2015 16:57:50 -0400 Received: from mail-wi0-f179.google.com ([209.85.212.179]:33916 "EHLO mail-wi0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757015AbbJAU5t (ORCPT ); Thu, 1 Oct 2015 16:57:49 -0400 Received: by wicfx3 with SMTP id fx3so7987192wic.1 for ; Thu, 01 Oct 2015 13:57:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=CEmj1ohgTOXR/Lmb1FTekafAi4CQCAGNop4rx+qCy1g=; b=rEW/u9P0Z0GxKwIFUFEGs1OcHcqJ0dbSVk1a4iRvddaL3wZThfRSoS9z6wBoFGtHf6 OvIjMayXUMp+/d5y3qJuWbElrV+d8OorglqO96IhWMIj/hYnHWEfVcEsa4S4uapzwA8M cbaFxxVmLaIK/iwayWAJ/ZsEEPiYZqlGzKvl9uthRsYxQlc713u59TojUY9PlqvQu1fD uEhBXpATnBbTExA/Yll3ymn+PZPKJ0M4zvaf7F9NCHB7dCJ+6vDHlpJLYvkIuZbQCmRb 4t+YjL4NDfwlh/rIlplH+ITADm2tg+g/znxTHSVWKZoNqTTvISLZY8qx6dOZGXdKCa55 9k1w== X-Received: by 10.194.123.2 with SMTP id lw2mr14351099wjb.48.1443733068523; Thu, 01 Oct 2015 13:57:48 -0700 (PDT) Received: from deepwhite.fritz.box (p5790B98A.dip0.t-ipconnect.de. [87.144.185.138]) by smtp.gmail.com with ESMTPSA id lb10sm7989698wjc.9.2015.10.01.13.57.47 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 01 Oct 2015 13:57:48 -0700 (PDT) From: Pavel Rojtberg X-Google-Original-From: Pavel Rojtberg < rojtberg@gmail.com > To: linux-input@vger.kernel.org, pgriffais@valvesoftware.com, dmitry.torokhov@gmail.com, gregkh@linuxfoundation.org Cc: Pavel Rojtberg Subject: [PATCH 11/15] Input: xpad: do not submit active URBs Date: Thu, 1 Oct 2015 22:57:22 +0200 Message-Id: <1443733046-29610-12-git-send-email-rojtberg@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1443733046-29610-1-git-send-email-rojtberg@gmail.com> References: <1443733046-29610-1-git-send-email-rojtberg@gmail.com> Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Pavel Rojtberg track the active status of the irq_out URB to prevent submission while it is active. Failure to do so results in the "URB submitted while active" warning/ stacktrace. Also add missing mutex locking around xpad->odata usages. Signed-off-by: Pavel Rojtberg --- drivers/input/joystick/xpad.c | 43 +++++++++++++++++++++++++++++++++++++++---- 1 file changed, 39 insertions(+), 4 deletions(-) diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c index 7d53e8e..5eec515 100644 --- a/drivers/input/joystick/xpad.c +++ b/drivers/input/joystick/xpad.c @@ -330,6 +330,7 @@ struct usb_xpad { dma_addr_t idata_dma; struct urb *irq_out; /* urb for interrupt out report */ + int irq_out_active; /* we must not use an active URB */ unsigned char *odata; /* output data */ dma_addr_t odata_dma; struct mutex odata_mutex; @@ -710,6 +711,7 @@ static void xpad_irq_out(struct urb *urb) switch (status) { case 0: /* success */ + xpad->irq_out_active = 0; return; case -ECONNRESET: @@ -718,6 +720,7 @@ static void xpad_irq_out(struct urb *urb) /* this urb is terminated, clean up */ dev_dbg(dev, "%s - urb shutting down with status: %d\n", __func__, status); + xpad->irq_out_active = 0; return; default: @@ -795,6 +798,7 @@ static int xpad_play_effect(struct input_dev *dev, void *data, struct ff_effect struct usb_xpad *xpad = input_get_drvdata(dev); __u16 strong; __u16 weak; + int retval; if (effect->type != FF_RUMBLE) return 0; @@ -802,6 +806,8 @@ static int xpad_play_effect(struct input_dev *dev, void *data, struct ff_effect strong = effect->u.rumble.strong_magnitude; weak = effect->u.rumble.weak_magnitude; + mutex_lock(&xpad->odata_mutex); + switch (xpad->xtype) { case XTYPE_XBOX: xpad->odata[0] = 0x00; @@ -858,13 +864,25 @@ static int xpad_play_effect(struct input_dev *dev, void *data, struct ff_effect break; default: + mutex_unlock(&xpad->odata_mutex); dev_dbg(&xpad->dev->dev, "%s - rumble command sent to unsupported xpad type: %d\n", __func__, xpad->xtype); return -EINVAL; } - return usb_submit_urb(xpad->irq_out, GFP_ATOMIC); + if (!xpad->irq_out_active) { + retval = usb_submit_urb(xpad->irq_out, GFP_ATOMIC); + xpad->irq_out_active = 1; + } else { + retval = -EIO; + dev_dbg(&xpad->dev->dev, "%s - dropped, irq_out is active\n", + __func__); + } + + mutex_unlock(&xpad->odata_mutex); + + return retval; } static int xpad_init_ff(struct usb_xpad *xpad) @@ -940,7 +958,13 @@ static void xpad_send_led_command(struct usb_xpad *xpad, int command) break; } - usb_submit_urb(xpad->irq_out, GFP_KERNEL); + if (!xpad->irq_out_active) { + usb_submit_urb(xpad->irq_out, GFP_KERNEL); + xpad->irq_out_active = 1; + } else + dev_dbg(&xpad->dev->dev, "%s - dropped, irq_out is active\n", + __func__); + mutex_unlock(&xpad->odata_mutex); } @@ -1028,6 +1052,7 @@ static void xpad_identify_controller(struct usb_xpad *xpad) { } static int xpad_open(struct input_dev *dev) { struct usb_xpad *xpad = input_get_drvdata(dev); + int retval; /* URB was submitted in probe */ if (xpad->xtype == XTYPE_XBOX360W) @@ -1038,11 +1063,14 @@ static int xpad_open(struct input_dev *dev) return -EIO; if (xpad->xtype == XTYPE_XBOXONE) { + mutex_lock(&xpad->odata_mutex); /* Xbox one controller needs to be initialized. */ xpad->odata[0] = 0x05; xpad->odata[1] = 0x20; xpad->irq_out->transfer_buffer_length = 2; - return usb_submit_urb(xpad->irq_out, GFP_KERNEL); + retval = usb_submit_urb(xpad->irq_out, GFP_KERNEL); + mutex_unlock(&xpad->odata_mutex); + return retval; } return 0; @@ -1300,7 +1328,14 @@ static int xpad_probe(struct usb_interface *intf, const struct usb_device_id *id xpad->odata[10] = 0x00; xpad->odata[11] = 0x00; xpad->irq_out->transfer_buffer_length = 12; - usb_submit_urb(xpad->irq_out, GFP_KERNEL); + + if (!xpad->irq_out_active) { + usb_submit_urb(xpad->irq_out, GFP_KERNEL); + xpad->irq_out_active = 1; + } else + dev_dbg(&xpad->dev->dev, + "%s - dropped, irq_out is active\n", __func__); + mutex_unlock(&xpad->odata_mutex); } else { xpad->pad_present = 1;