From patchwork Fri Sep 9 07:16:36 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "\(Exiting\) Baolin Wang" X-Patchwork-Id: 75842 Delivered-To: patch@linaro.org Received: by 10.140.106.11 with SMTP id d11csp205400qgf; Fri, 9 Sep 2016 00:17:58 -0700 (PDT) X-Received: by 10.98.102.148 with SMTP id s20mr969177pfj.79.1473405477870; Fri, 09 Sep 2016 00:17:57 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id r83si2563779pfb.132.2016.09.09.00.17.57; Fri, 09 Sep 2016 00:17:57 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-usb-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-usb-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-usb-owner@vger.kernel.org; dmarc=fail (p=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752582AbcIIHRf (ORCPT + 4 others); Fri, 9 Sep 2016 03:17:35 -0400 Received: from mail-pf0-f173.google.com ([209.85.192.173]:35219 "EHLO mail-pf0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752564AbcIIHRd (ORCPT ); Fri, 9 Sep 2016 03:17:33 -0400 Received: by mail-pf0-f173.google.com with SMTP id w87so26696030pfk.2 for ; Fri, 09 Sep 2016 00:17:33 -0700 (PDT) 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 :in-reply-to:references; bh=9FekG1jkvPURdKgt14vB6Wik2q+ujm33/xFVOuZcThk=; b=HwOVJuj8YlYDSgz6WxB3WrGXSN1m6mkHOKXax8KcQPYQWy7Zjtk/8aAgjR+T2zKdGy r1pAUsxLqOdeE2uHqas+mIeKWXGr0omOs4PLT53prSddtk8J+qDO10cWzcCue8Aj5CNo 89wkXPiuV+iU3gVp/vOBWyv/xJmkYFRTTKIQQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=9FekG1jkvPURdKgt14vB6Wik2q+ujm33/xFVOuZcThk=; b=d8W7NDrF9MVsYojB2AT1lVRTPWSp424rjW3v3ovuIZmDF1qQHXICRIpjDnaLYp2yFU Zear2KZFKSra+JH7gNsjTHo/ojcsaTIQPNgB4EA+DBc1SkF9W7W2O46xBUOyAorM5nQ7 Z46Z7JHUyVMgbKKqlzRdh5yWyfo/toXsGOEeRslVjYdTmF1xHVrMUMoVhInAWMZ47wmD FCnpB/KGrFCaKv6NhM33uaq84xPN3D18wWy19Jdn0OIkmE3sukLbLiG/Sx4Xw8g1t8vg x26ZLFwwQ49kn6hyagudN20Iporlk2BHuJCcxQEp1RiD0hzeeRClRLvPfBBCPCwy2aFZ wYsA== X-Gm-Message-State: AE9vXwMXvwZ4hffwhlRBb/86nFWsFSrKYEILhgU8lxXNEcQhJsijSaHSAUMi5mbuoMEKOX1M X-Received: by 10.98.92.65 with SMTP id q62mr3955702pfb.70.1473405452601; Fri, 09 Sep 2016 00:17:32 -0700 (PDT) Received: from baolinwangubtpc.spreadtrum.com ([175.111.195.49]) by smtp.gmail.com with ESMTPSA id hs7sm2577789pad.24.2016.09.09.00.17.29 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 09 Sep 2016 00:17:32 -0700 (PDT) From: Baolin Wang To: balbi@kernel.org, gregkh@linuxfoundation.org Cc: broonie@kernel.org, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, baolin.wang@linaro.org Subject: [PATCH v2 2/2] usb: dwc3: Wait for control tranfer completed when stopping gadget Date: Fri, 9 Sep 2016 15:16:36 +0800 Message-Id: <3a4c91231787d31e82874161aa2ef9351f1c4b73.1473405255.git.baolin.wang@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: References: In-Reply-To: References: Sender: linux-usb-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org When we change the USB function with configfs dynamically, we possibly met this situation: one core is doing the control transfer, another core is trying to unregister the USB gadget from userspace, we must wait for completing this control tranfer, or it will hang the controller to set the DEVCTRLHLT flag. Signed-off-by: Baolin Wang --- drivers/usb/dwc3/core.c | 1 + drivers/usb/dwc3/core.h | 2 ++ drivers/usb/dwc3/ep0.c | 2 ++ drivers/usb/dwc3/gadget.c | 21 +++++++++++++++++++++ 4 files changed, 26 insertions(+) -- 1.7.9.5 -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c index 057739d..22787b6 100644 --- a/drivers/usb/dwc3/core.c +++ b/drivers/usb/dwc3/core.c @@ -999,6 +999,7 @@ static int dwc3_probe(struct platform_device *pdev) goto err0; spin_lock_init(&dwc->lock); + init_completion(&dwc->ep0_completed); if (!dev->dma_mask) { dev->dma_mask = dev->parent->dma_mask; diff --git a/drivers/usb/dwc3/core.h b/drivers/usb/dwc3/core.h index b2317e7..858e661 100644 --- a/drivers/usb/dwc3/core.h +++ b/drivers/usb/dwc3/core.h @@ -745,6 +745,7 @@ struct dwc3_scratchpad_array { * @ep0_usb_req: dummy req used while handling STD USB requests * @ep0_bounce_addr: dma address of ep0_bounce * @scratch_addr: dma address of scratchbuf + * @ep0_completed: One control tranfer is completed * @lock: for synchronizing * @dev: pointer to our struct device * @xhci: pointer to our xHCI child @@ -843,6 +844,7 @@ struct dwc3 { dma_addr_t ep0_bounce_addr; dma_addr_t scratch_addr; struct dwc3_request ep0_usb_req; + struct completion ep0_completed; /* device lock */ spinlock_t lock; diff --git a/drivers/usb/dwc3/ep0.c b/drivers/usb/dwc3/ep0.c index 632e5a4..baf932d 100644 --- a/drivers/usb/dwc3/ep0.c +++ b/drivers/usb/dwc3/ep0.c @@ -286,6 +286,7 @@ static void dwc3_ep0_stall_and_restart(struct dwc3 *dwc) dwc->ep0state = EP0_SETUP_PHASE; dwc3_ep0_out_start(dwc); + complete(&dwc->ep0_completed); } int __dwc3_gadget_ep0_set_halt(struct usb_ep *ep, int value) @@ -935,6 +936,7 @@ static void dwc3_ep0_complete_status(struct dwc3 *dwc, dwc->ep0state = EP0_SETUP_PHASE; dwc3_ep0_out_start(dwc); + complete(&dwc->ep0_completed); } static void dwc3_ep0_xfer_complete(struct dwc3 *dwc, diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c index 1a33308..c9026ce 100644 --- a/drivers/usb/dwc3/gadget.c +++ b/drivers/usb/dwc3/gadget.c @@ -1441,6 +1441,15 @@ static int dwc3_gadget_run_stop(struct dwc3 *dwc, int is_on, int suspend) if (pm_runtime_suspended(dwc->dev)) return 0; + /* + * Per databook, when we want to stop the gadget, if a control transfer + * is still in process, complete it and get the core into setup phase. + */ + if (!is_on && dwc->ep0state != EP0_SETUP_PHASE) { + reinit_completion(&dwc->ep0_completed); + return -EBUSY; + } + reg = dwc3_readl(dwc->regs, DWC3_DCTL); if (is_on) { if (dwc->revision <= DWC3_REVISION_187A) { @@ -1491,10 +1500,22 @@ static int dwc3_gadget_pullup(struct usb_gadget *g, int is_on) is_on = !!is_on; +try_again: spin_lock_irqsave(&dwc->lock, flags); ret = dwc3_gadget_run_stop(dwc, is_on, false); spin_unlock_irqrestore(&dwc->lock, flags); + if (ret == -EBUSY) { + ret = wait_for_completion_timeout(&dwc->ep0_completed, + msecs_to_jiffies(100)); + if (ret == 0) { + dev_err(dwc->dev, "timeout to stop gadget.\n"); + return -ETIMEDOUT; + } else { + goto try_again; + } + } + return ret; }