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=ham 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 464ADC282C8 for ; Mon, 28 Jan 2019 15:50:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0E0192177E for ; Mon, 28 Jan 2019 15:50:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1548690649; bh=80fi5xl9S88PdQ3BbDlv8tKoXAhMzJ850I++OfqhjIg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=HGaoGzGQH1o4+g97xbm64GgM1JHiNV6p4z1hmXvkRwwRYZT73q7zrROINNFY1zhLU n+c+G4wD2ZBpO3iMQ2+WX/9WjkF6VbK1f1wRXMcf0bzvs/jU+MLXx53tfpmTb8oFQX C7Y5lQQVuAe3UmVE+z2jjKg43K/MWBP5yEMrfjeA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729010AbfA1Pus (ORCPT ); Mon, 28 Jan 2019 10:50:48 -0500 Received: from mail.kernel.org ([198.145.29.99]:37260 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728153AbfA1Pup (ORCPT ); Mon, 28 Jan 2019 10:50:45 -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 4604B2177E; Mon, 28 Jan 2019 15:50:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1548690644; bh=80fi5xl9S88PdQ3BbDlv8tKoXAhMzJ850I++OfqhjIg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=zzNgWS6Rh01y9pkiPUrOrBc3ozMsyNNkROC5y/dL/y1HQEOJUh74xkXpcLo6hh5Ne yfF4SAtlDelnjVyiCqfQ+1KV6d1+rXyH2kZxvPuXhl9DXQV8cpWBRXZ2RGl1SvDz/D 6KBbG8pZmBMaGm5AtQUcBy33ohuw1+5K6zrGZ9Xk= 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.20 151/304] usb: dwc3: gadget: Disable CSP for stream OUT ep Date: Mon, 28 Jan 2019 10:41:08 -0500 Message-Id: <20190128154341.47195-151-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190128154341.47195-1-sashal@kernel.org> References: <20190128154341.47195-1-sashal@kernel.org> MIME-Version: 1.0 X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 c2581374f57f..7c4f1eecd75e 100644 --- a/drivers/usb/dwc3/gadget.c +++ b/drivers/usb/dwc3/gadget.c @@ -988,9 +988,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