Received: by 10.223.185.116 with SMTP id b49csp4171564wrg; Mon, 26 Feb 2018 12:30:16 -0800 (PST) X-Google-Smtp-Source: AH8x226xGzyTFyVzoapa5wiOfobpEKGdeg7Tzne7FAZ7kykEc4Mn5j3UfN8IGNKA/bYsR4RNbk2D X-Received: by 10.98.171.24 with SMTP id p24mr11760746pff.71.1519677016530; Mon, 26 Feb 2018 12:30:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519677016; cv=none; d=google.com; s=arc-20160816; b=eOeTtO/F/QcE7XjzVCLKgNXHWJHoBSXiJQWp5BxoXAdxO/f4NY90ZXzByIkYL98E7j SNJ2tmAifVIv95jzTqvDOc1ZpVan/dFEVyqYXkM0bTzPRh8yjM6nz15tNCrTCFwteyv1 hm8xdIPl2exdZGmWTajvmVj9A1Bj2/cqerWDuJBovJ+nvHW8o02RWBDPqep8CAsY5Pad BlMn9/jzXCbPXPcv8VcvgzPSVa88fRIvRyQeSgC+XxbyvNARtPvhGIaXzhriss0gefym mvq1pjhc7YxkBEgzN1YHDgfPQvEfWdZZUEV4kury03TmHNswsmFbIppCShm1wFNtVAcS daTA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=LEY2rx1nlnRYLhmdK969GB2O1P4v38WE2hbcpfkiZZk=; b=SEnjRdFTq+D2TtxfkdIj8JPVTbmSS68Qk3IkqCWHUwfdLrG3KHPi0QSl797cf966lH /c9adV0+lrMSuOifZQ6+/dosMNhehF72LvalhtJfYt9jjpGVM2sRoU1450oCKF9Ye3hU 1yJbEgGEQxxUrUnw6EuX8RKvxYQx+VZVR2AX0Nr1QIL+XGdXTWRjQTa6xV2UWcI7E9/d ESCxdfyiWbSXVLSK63gmTQfYTP6dbkM8Vt0hNP17XUo4fXKjih7PnWfuFOfS0mnjKafT f/i75ZAG+QJS/gsMphpfJ9TMYh7mBR0Ba7GOdHfiDDgUxn2Tq9JM8qdGjhbOxBWjomxD cfSA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f10si5962008pge.494.2018.02.26.12.29.59; Mon, 26 Feb 2018 12:30:16 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753868AbeBZU2F (ORCPT + 99 others); Mon, 26 Feb 2018 15:28:05 -0500 Received: from mail.linuxfoundation.org ([140.211.169.12]:37004 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752442AbeBZU2C (ORCPT ); Mon, 26 Feb 2018 15:28:02 -0500 Received: from localhost (clnet-b04-243.ikbnet.co.at [83.175.124.243]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id 3B263E88; Mon, 26 Feb 2018 20:28:01 +0000 (UTC) From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Thinh Nguyen , Felipe Balbi Subject: [PATCH 4.15 46/64] usb: dwc3: ep0: Reset TRB counter for ep0 IN Date: Mon, 26 Feb 2018 21:22:23 +0100 Message-Id: <20180226202155.420348783@linuxfoundation.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180226202153.453363333@linuxfoundation.org> References: <20180226202153.453363333@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Thinh Nguyen commit f035d139ffece7b6a7b8bfb17bd0ba715ee57a04 upstream. DWC3 tracks TRB counter for each ep0 direction separately. In control read transfer completion handler, the driver needs to reset the TRB enqueue counter for ep0 IN direction. Currently the driver only resets the TRB counter for control OUT endpoint. Check for the data direction and properly reset the TRB counter from correct control endpoint. Cc: stable@vger.kernel.org Fixes: c2da2ff00606 ("usb: dwc3: ep0: don't use ep0in for transfers") Signed-off-by: Thinh Nguyen Signed-off-by: Felipe Balbi Signed-off-by: Greg Kroah-Hartman --- drivers/usb/dwc3/ep0.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) --- a/drivers/usb/dwc3/ep0.c +++ b/drivers/usb/dwc3/ep0.c @@ -858,7 +858,12 @@ static void dwc3_ep0_complete_data(struc trb++; trb->ctrl &= ~DWC3_TRB_CTRL_HWO; trace_dwc3_complete_trb(ep0, trb); - ep0->trb_enqueue = 0; + + if (r->direction) + dwc->eps[1]->trb_enqueue = 0; + else + dwc->eps[0]->trb_enqueue = 0; + dwc->ep0_bounced = false; }