From patchwork Thu Feb 13 16:31:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 11380795 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 DC49C921 for ; Thu, 13 Feb 2020 16:31:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BAEE324671 for ; Thu, 13 Feb 2020 16:31:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1581611500; bh=Tod5NLHzzx9e+bpKgjkbb6MEjQ3Gx+HBHVo+zKPOdNI=; h=Subject:To:From:Date:List-ID:From; b=VvPHBcQkUApClN5zcLp7EgI6t+4yZYHy66qzEE/PeRQoRLPJ589IwC8ZqS1dnQ9vk lnUSq2C06nVkSGB4lg8OuYI91kg9s3tHV+rQtqDxDGSZN26b4YZ9wLgJ6yRNNPbqC7 oQxWcLNlmhv6o1ySiA8iu4N4HDa/H13s1HZo2Xcw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727926AbgBMQbk (ORCPT ); Thu, 13 Feb 2020 11:31:40 -0500 Received: from mail.kernel.org ([198.145.29.99]:35694 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727511AbgBMQbj (ORCPT ); Thu, 13 Feb 2020 11:31:39 -0500 Received: from localhost (unknown [104.132.1.104]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id DE5812082F; Thu, 13 Feb 2020 16:31:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1581611499; bh=Tod5NLHzzx9e+bpKgjkbb6MEjQ3Gx+HBHVo+zKPOdNI=; h=Subject:To:From:Date:From; b=Me7cJSfXwDnGTHqFsSXbEsUglsmqX3ydw72FE703xlWd6z1Ls8QGabDV4IrfV0XMf U/kMswA3b6a+5QrvFSREaoZrj1mVL+5o8f1lJQxXLbDyZieVtAxnnZ3qxfoNKYKtVt QZLI/r/63aD70zqvt2DI7y2PRgGXBWfr37QGw7LI= Subject: patch "usb: dwc3: gadget: Check for IOC/LST bit in TRB->ctrl fields" added to usb-linus To: anurag.kumar.vulisha@xilinx.com, andrzej.p@collabora.com, balbi@kernel.org, fei.yang@intel.com, gregkh@linuxfoundation.org, jackp@codeaurora.org, john.stultz@linaro.org, linux-usb@vger.kernel.org, stable@vger.kernel.org, tejas.joglekar@synopsys.com, thinhn@synopsys.com, tkjos@google.com From: Date: Thu, 13 Feb 2020 08:31:38 -0800 Message-ID: <1581611498166148@kroah.com> MIME-Version: 1.0 Sender: linux-usb-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org This is a note to let you know that I've just added the patch titled usb: dwc3: gadget: Check for IOC/LST bit in TRB->ctrl fields to my usb git tree which can be found at git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git in the usb-linus branch. The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.) The patch will hopefully also be merged in Linus's tree for the next -rc kernel release. If you have any questions about this process, please let me know. From 5ee858975b13a9b40db00f456989a689fdbb296c Mon Sep 17 00:00:00 2001 From: Anurag Kumar Vulisha Date: Mon, 27 Jan 2020 19:30:46 +0000 Subject: usb: dwc3: gadget: Check for IOC/LST bit in TRB->ctrl fields The current code in dwc3_gadget_ep_reclaim_completed_trb() will check for IOC/LST bit in the event->status and returns if IOC/LST bit is set. This logic doesn't work if multiple TRBs are queued per request and the IOC/LST bit is set on the last TRB of that request. Consider an example where a queued request has multiple queued TRBs and IOC/LST bit is set only for the last TRB. In this case, the core generates XferComplete/XferInProgress events only for the last TRB (since IOC/LST are set only for the last TRB). As per the logic in dwc3_gadget_ep_reclaim_completed_trb() event->status is checked for IOC/LST bit and returns on the first TRB. This leaves the remaining TRBs left unhandled. Similarly, if the gadget function enqueues an unaligned request with sglist already in it, it should fail the same way, since we will append another TRB to something that already uses more than one TRB. To aviod this, this patch changes the code to check for IOC/LST bits in TRB->ctrl instead. At a practical level, this patch resolves USB transfer stalls seen with adb on dwc3 based HiKey960 after functionfs gadget added scatter-gather support around v4.20. Cc: Felipe Balbi Cc: Yang Fei Cc: Thinh Nguyen Cc: Tejas Joglekar Cc: Andrzej Pietrasiewicz Cc: Jack Pham Cc: Todd Kjos Cc: Greg KH Cc: Linux USB List Cc: stable Tested-by: Tejas Joglekar Reviewed-by: Thinh Nguyen Signed-off-by: Anurag Kumar Vulisha [jstultz: forward ported to mainline, reworded commit log, reworked to only check trb->ctrl as suggested by Felipe] Signed-off-by: John Stultz Signed-off-by: Felipe Balbi --- drivers/usb/dwc3/gadget.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c index 1b8014ab0b25..1b7d2f9cb673 100644 --- a/drivers/usb/dwc3/gadget.c +++ b/drivers/usb/dwc3/gadget.c @@ -2429,7 +2429,8 @@ static int dwc3_gadget_ep_reclaim_completed_trb(struct dwc3_ep *dep, if (event->status & DEPEVT_STATUS_SHORT && !chain) return 1; - if (event->status & DEPEVT_STATUS_IOC) + if ((trb->ctrl & DWC3_TRB_CTRL_IOC) || + (trb->ctrl & DWC3_TRB_CTRL_LST)) return 1; return 0;