Received: by 2002:a05:6a10:1d13:0:0:0:0 with SMTP id pp19csp1699619pxb; Mon, 23 Aug 2021 02:25:47 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyujmN/k/EAJL/OY+l2bXq0XvKl5aShb4GT3O6U6g+WcMsEB6EmOyRuJp4gks6JreyqxLuk X-Received: by 2002:a17:906:720e:: with SMTP id m14mr34300699ejk.500.1629710746956; Mon, 23 Aug 2021 02:25:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1629710746; cv=none; d=google.com; s=arc-20160816; b=Kpd7CpV5vXKm4G/r6bo0zMAhZl+7EewrNOak0X2cEh85bOCmROon2rvLltaLVxQxei l2ZoZipT/l1u979/mziFFArgZC63BD3uheuczuxSjWcq7taV7Cciv4sVO97Bdeh7eDUk c/ibj0R6DzRqYLutwSo6hDJO6GFYk0wuAjvWDfhzsN0utTJ1wnfYhUSF6bQUfU36Bmm/ DS0KqJvwyk3eyI+YFBEHTtWEM8pn/ywFag91/96MLKNjTFK7hTfD+NQwEcQCN3sU5ncJ aSxENyV6O7piFJNjytBCiS3ZyGVuc5MlV0BbFepM/U70SSDaYTTsOpvi4zYmrzHndNH4 TQoA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dmarc-filter:sender :dkim-signature; bh=MjYmf7oiJyLSzVo8N7rBJa6X/ztbSYljOWQSaoNgkVk=; b=QZFcd+YXV9B9sKSo30sIwsAW7C2eBP2o1ocGoIy4Y6I7pqaXGHO06SuQWXEYaJuA5n XO/JWag0jdZvyuT4hI7nSJ1ZvBBfLpN876GxAwDiu4igqKIuu1Ig8hX/aQe+zTMJHnXU 3hBXVEq+ZDYHNf717lQmTnI1Yy/3fbzHlaa2Hhz7bBwYTxDNISfHTwYlXbEQlyeEKHRk Jnf83LjbhVTIxGbPeyaYVVG08faKC4PMyq79MWYuZnoTIYXNKq5rn+0vJKHOmOiGDWq8 Nza1NrX3OiNWWXSsvsfAsiBSmdxH/K3t7VS4eGBdewWESMh+uN32x3SgkzsLY/fcAi+K oUoQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@mg.codeaurora.org header.s=smtp header.b=HCClVbro; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id cn3si14848341edb.298.2021.08.23.02.25.23; Mon, 23 Aug 2021 02:25:46 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@mg.codeaurora.org header.s=smtp header.b=HCClVbro; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231258AbhHWJYP (ORCPT + 99 others); Mon, 23 Aug 2021 05:24:15 -0400 Received: from so254-9.mailgun.net ([198.61.254.9]:10895 "EHLO so254-9.mailgun.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235833AbhHWJYN (ORCPT ); Mon, 23 Aug 2021 05:24:13 -0400 DKIM-Signature: a=rsa-sha256; v=1; c=relaxed/relaxed; d=mg.codeaurora.org; q=dns/txt; s=smtp; t=1629710611; h=Content-Transfer-Encoding: MIME-Version: Message-Id: Date: Subject: Cc: To: From: Sender; bh=MjYmf7oiJyLSzVo8N7rBJa6X/ztbSYljOWQSaoNgkVk=; b=HCClVbroTPliZmZkjIEovCdVVkmhVBmm+uSVC7IS+0aJ8jhzKYtiuCI+GfbbsEgJxvg5gqRj P7h9VRfyTm4T1EN90n0S/7D2zirWVHgiKxcRFnh4lumS42luwmtTfrGiBn064abSh2VW44Qm yyE9YrhcmHdDneEvC1ExscQmgN8= X-Mailgun-Sending-Ip: 198.61.254.9 X-Mailgun-Sid: WyI0MWYwYSIsICJsaW51eC1rZXJuZWxAdmdlci5rZXJuZWwub3JnIiwgImJlOWU0YSJd Received: from smtp.codeaurora.org (ec2-35-166-182-171.us-west-2.compute.amazonaws.com [35.166.182.171]) by smtp-out-n06.prod.us-east-1.postgun.com with SMTP id 6123691189fbdf3ffe64ebd5 (version=TLS1.2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256); Mon, 23 Aug 2021 09:23:29 GMT Sender: wcheng=codeaurora.org@mg.codeaurora.org Received: by smtp.codeaurora.org (Postfix, from userid 1001) id 1D318C43618; Mon, 23 Aug 2021 09:23:29 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-caf-mail-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=ALL_TRUSTED,BAYES_00,SPF_FAIL autolearn=no autolearn_force=no version=3.4.0 Received: from wcheng-linux.qualcomm.com (i-global254.qualcomm.com [199.106.103.254]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: wcheng) by smtp.codeaurora.org (Postfix) with ESMTPSA id E9E89C4338F; Mon, 23 Aug 2021 09:23:27 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 smtp.codeaurora.org E9E89C4338F Authentication-Results: aws-us-west-2-caf-mail-1.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: aws-us-west-2-caf-mail-1.web.codeaurora.org; spf=fail smtp.mailfrom=codeaurora.org From: Wesley Cheng To: balbi@kernel.org, gregkh@linuxfoundation.org, Thinh.Nguyen@synopsys.com Cc: linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, jackp@codeaurora.org, Wesley Cheng Subject: [PATCH v2] usb: dwc3: gadget: Stop EP0 transfers during pullup disable Date: Mon, 23 Aug 2021 02:23:24 -0700 Message-Id: <20210823092324.1949-1-wcheng@codeaurora.org> X-Mailer: git-send-email 2.33.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org During a USB cable disconnect, or soft disconnect scenario, a pending SETUP transaction may not be completed, leading to the following error: dwc3 a600000.dwc3: timed out waiting for SETUP phase If this occurs, then the entire pullup disable routine is skipped and proper cleanup and halting of the controller does not complete. Instead of returning an error (which is ignored from the UDC perspective), allow the pullup disable to routine to continue, which will also handle disabling of EP0/1. This will end any active transfers as well. Ensure to clear any delayed_status as well, as the timeout could happen within the STATUS stage. Signed-off-by: Wesley Cheng --- Changes in v2: - Removed calls to dwc3_ep0_end_control_data() and just allow the ep disables on EP0 handle the proper ending of transfers. - Ensure that delayed_status is cleared, as ran into enumeration issues if the SETUP transaction fails on a STATUS stage. Saw delayed_status == TRUE on the next connect, which blocked further SETUP transactions to be handled. drivers/usb/dwc3/gadget.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c index 5d084542718d..8b6a95c35741 100644 --- a/drivers/usb/dwc3/gadget.c +++ b/drivers/usb/dwc3/gadget.c @@ -2430,7 +2430,6 @@ static int dwc3_gadget_pullup(struct usb_gadget *g, int is_on) msecs_to_jiffies(DWC3_PULL_UP_TIMEOUT)); if (ret == 0) { dev_err(dwc->dev, "timed out waiting for SETUP phase\n"); - return -ETIMEDOUT; } } @@ -2643,6 +2642,7 @@ static int __dwc3_gadget_start(struct dwc3 *dwc) /* begin to receive SETUP packets */ dwc->ep0state = EP0_SETUP_PHASE; dwc->link_state = DWC3_LINK_STATE_SS_DIS; + dwc->delayed_status = false; dwc3_ep0_out_start(dwc); dwc3_gadget_enable_irq(dwc); -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project