From patchwork Wed Jan 22 22:26:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 182924 Delivered-To: patches@linaro.org Received: by 2002:a92:1f12:0:0:0:0:0 with SMTP id i18csp31762ile; Wed, 22 Jan 2020 14:26:52 -0800 (PST) X-Received: by 2002:a65:56c9:: with SMTP id w9mr500192pgs.296.1579732012091; Wed, 22 Jan 2020 14:26:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1579732012; cv=none; d=google.com; s=arc-20160816; b=idJLjS9CbWPGnL6DPOugua3MjM/hDvcXTRJEK1hab301CkVk4Hgh/Uei8wzW72Be06 vCpsoP8Vkxb5Tpk3xjK/5p+oQgg0+RdDouflXtdtfOVebTSz7h2KUaaN4p67tETAbJ0A 840hoojAKcLzbEZv5UU0LgVWMWR6XNx+6JuRkowgN8nmt98G1T8DWmk1tHcWqH4yZJVn tK3GyluL4wv+G17x8AkRxZKxqvjz8GrfUgcVg5mZSZDSkqQ2Ywzt/DCGwy/fFqHW1WBO Ch0Bn+5h0PXQIudVnM7ALIvUE2dQPJyae/fm0fC+IyvcuGt0xXQzYLdOnLfPELeBgnZx 9nYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=JESjh6inBv92WxZqfb4czYKZ8FKdIT47e0CUpHsL9zw=; b=K1LgrFeU2ikrJXIntbdF9BMD/EqKAmn+uKNrRHleHgcw5VNfXXIAEOrEhMR0VX2MgU HQSBVcjZLDTpET6X8xyjKpVfsd56BJ5D+qRhxpqgRx8B3hSmTSLOwcUVvt6QJMo9J1+1 lgBUssf3bTBAUrZWIE5hRKePKr1YHXmf4lGAa9s0nhIGOTM3TpGYLZ6gKKky50HRMcW7 TwYAJXGmTmQcJ2sBcOLDQV93iUTdVCN2U8aoFMo3S9oEXXXVpHrsl3z41mWDbEVsMlzF xvOYLWl7uOInWKk7SC2Yg+lRdiFEZLQW1ITc/8A2Qm38N4LrXzCEYh8s4afBkFVJTMpT SbPQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=RsGmOvIt; spf=pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.stultz@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id v62sor47233622pgd.24.2020.01.22.14.26.51 for (Google Transport Security); Wed, 22 Jan 2020 14:26:52 -0800 (PST) Received-SPF: pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=RsGmOvIt; spf=pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.stultz@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=JESjh6inBv92WxZqfb4czYKZ8FKdIT47e0CUpHsL9zw=; b=RsGmOvIt+Bzr6i4aIVzintUFXr+6XX+aQJNI6juKMss4wBAunzxItSZlGbXw7ha+3c V5pNjplf1oyvhJV3/UY1eBclT7Bav7RGheW0wzEZ34ThAk5YhiMCUCN0jmmS1fz8i5Rq 3WBNsJe0+drVR3Fi8glb78/uzKQBNkHkind1gitZeqjlkXBg0eabjb5ILlDjiP473ux2 LZ5J1BPDiBf1L0IJfDdw5BDmpkkp2vVEuWl426uWWk4c+8E+pLHAJj5YK1M0M+OeLBsV MxdvsQOkXmBtkojh4QldDc4RcnkQiSuotRNJcvmGpFH5ESJmrVx/O4yKvoYr4dhdqkxW 1p0g== 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=JESjh6inBv92WxZqfb4czYKZ8FKdIT47e0CUpHsL9zw=; b=N0ehFIuPY4/9r4AKwGnV/WDxbleg98CH/rksWQpV0npFQnQArY6t/ag2XOsuBup25k v9uZEhhV/kZv3KJ+uG20fufV1e9IyTl7+ZPGvq8u0NN0fTaPqFilwhKoY4Sy1BuQ2uBy YTx43AWmkBdvTgS6BkOgNJA6BHF0zIjyE7JrDXXmydN0AhIQDTAi+Nq11W3bnxPQQPHw vCfTZ0Sx/bL7hxe9SK1x6yh/6xX5EoqEYUXdoNUX4MqyejI16E/UHHFdidFUyts3uYE5 iXUtyzJDpQNk1sicR99BroXOFJI9yn8+wW2WD8s5LCFU68d/yjrA8t2xtN4MxvbzXFb6 XChQ== X-Gm-Message-State: APjAAAWWSfsL41lMLZzdTTqfU9ydkA0PaP9cEuFfeTWH0HDZsvEPQLE0 3IWolYoKRV3/tf6dJZruxm8AhCTj X-Google-Smtp-Source: APXvYqyHFnzdcPwFmtLdIrSYOuAiwsCTGRIQwQ9Jlfx8tJ4RGPs5SBRmOuXWib6jnxyijCN3yYVuiA== X-Received: by 2002:a63:111e:: with SMTP id g30mr541062pgl.251.1579732011742; Wed, 22 Jan 2020 14:26:51 -0800 (PST) Return-Path: Received: from localhost.localdomain ([2601:1c2:680:1319:692:26ff:feda:3a81]) by smtp.gmail.com with ESMTPSA id a28sm47793509pfh.119.2020.01.22.14.26.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Jan 2020 14:26:51 -0800 (PST) From: John Stultz To: lkml Cc: Anurag Kumar Vulisha , Felipe Balbi , Yang Fei , Thinh Nguyen , Tejas Joglekar , Andrzej Pietrasiewicz , Jack Pham , Todd Kjos , Greg KH , Linux USB List , stable , John Stultz Subject: [RFC][PATCH 1/2] usb: dwc3: gadget: Check for IOC/LST bit in both event->status and TRB->ctrl fields Date: Wed, 22 Jan 2020 22:26:44 +0000 Message-Id: <20200122222645.38805-2-john.stultz@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200122222645.38805-1-john.stultz@linaro.org> References: <20200122222645.38805-1-john.stultz@linaro.org> From: Anurag Kumar Vulisha The present 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 makes the remaining TRBs left unhandled. To aviod this, changed the code to check for IOC/LST bits in both event->status & TRB->ctrl. This patch does the same. 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, added note to commit log] Signed-off-by: John Stultz --- drivers/usb/dwc3/gadget.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) -- 2.17.1 diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c index 154f3f3e8cff..1edce3bbb55c 100644 --- a/drivers/usb/dwc3/gadget.c +++ b/drivers/usb/dwc3/gadget.c @@ -2420,7 +2420,12 @@ 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 ((event->status & DEPEVT_STATUS_IOC) && + (trb->ctrl & DWC3_TRB_CTRL_IOC)) + return 1; + + if ((event->status & DEPEVT_STATUS_LST) && + (trb->ctrl & DWC3_TRB_CTRL_LST)) return 1; return 0;