From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 81EA1C282C8 for ; Mon, 28 Jan 2019 17:18:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 377F62082E for ; Mon, 28 Jan 2019 17:18:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1548695902; bh=70RbbwzPpgq67y5WTaypyfqdLlmGeJeivE28I4UlsYM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=bG+dHsES6aRBX2KsEMvCi/1uuG0X2ALbA8gYVuBj3nCiAm2rSvC29f3V0ubACYuAR IP8w8NUI39uLthePPwAwXC4KiL1ExHcJylkl0QX6YkgcADh8+Fh4Y4msv1SMET5tEN FqduRxotuhmQ/BY7QP9K8Odr9QKonSjGpqqV0veI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731466AbfA1RSO (ORCPT ); Mon, 28 Jan 2019 12:18:14 -0500 Received: from mail.kernel.org ([198.145.29.99]:51926 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731803AbfA1QFW (ORCPT ); Mon, 28 Jan 2019 11:05:22 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id A329420989; Mon, 28 Jan 2019 16:05:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1548691522; bh=70RbbwzPpgq67y5WTaypyfqdLlmGeJeivE28I4UlsYM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iyPFJ2cNHdBR95DlC99jA9QJK6zVrwrpqUw/vWESmu8V9Hj0xruTQ1ybScyI8s7/k u5StqYS0mmZdR8Qvh0JPJIyweFkWhrfj/Kk8wu5kbuQlUY+RYzgqJKhvBft9Hd/+RQ TA6NTka02hR8pipxN/+F83obvCmv4PT792la4DaU= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Tejas Joglekar , Tejas Joglekar , Felipe Balbi , Sasha Levin , linux-usb@vger.kernel.org Subject: [PATCH AUTOSEL 4.19 127/258] usb: dwc3: gadget: Disable CSP for stream OUT ep Date: Mon, 28 Jan 2019 10:57:13 -0500 Message-Id: <20190128155924.51521-127-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190128155924.51521-1-sashal@kernel.org> References: <20190128155924.51521-1-sashal@kernel.org> MIME-Version: 1.0 X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Tejas Joglekar [ Upstream commit 244add8ebfb231c39db9e33b204bd0ce8f24f782 ] In stream mode, when fast-forwarding TRBs, the stream number is not cleared causing the new stream to not get assigned. So we don't want controller to carry on transfers when short packet is received. So disable the CSP for stream capable endpoint. This is based on the 3.30a Programming guide, where table 3-1 device descriptor structure field definitions says for CSP bit If this bit is 0, the controller generates an XferComplete event and remove the stream. So if we keep CSP as 1 then switching between streams would not happen as in stream mode, when fast-forwarding TRBs, the stream number is not cleared causing the new stream to not get assigned. Signed-off-by: Tejas Joglekar Signed-off-by: Felipe Balbi Signed-off-by: Sasha Levin --- drivers/usb/dwc3/gadget.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c index a9f22a0a3462..e82be2ec859a 100644 --- a/drivers/usb/dwc3/gadget.c +++ b/drivers/usb/dwc3/gadget.c @@ -979,9 +979,13 @@ static void __dwc3_prepare_one_trb(struct dwc3_ep *dep, struct dwc3_trb *trb, usb_endpoint_type(dep->endpoint.desc)); } - /* always enable Continue on Short Packet */ + /* + * Enable Continue on Short Packet + * when endpoint is not a stream capable + */ if (usb_endpoint_dir_out(dep->endpoint.desc)) { - trb->ctrl |= DWC3_TRB_CTRL_CSP; + if (!dep->stream_capable) + trb->ctrl |= DWC3_TRB_CTRL_CSP; if (short_not_ok) trb->ctrl |= DWC3_TRB_CTRL_ISP_IMI; -- 2.19.1