From patchwork Tue Jan 3 19:52:35 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 89731 Delivered-To: patches@linaro.org Received: by 10.140.20.101 with SMTP id 92csp8169815qgi; Tue, 3 Jan 2017 11:52:45 -0800 (PST) X-Received: by 10.84.202.12 with SMTP id w12mr140248943pld.156.1483473165765; Tue, 03 Jan 2017 11:52:45 -0800 (PST) Return-Path: Received: from mail-pf0-x235.google.com (mail-pf0-x235.google.com. [2607:f8b0:400e:c00::235]) by mx.google.com with ESMTPS id t24si44256217pfe.197.2017.01.03.11.52.45 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 03 Jan 2017 11:52:45 -0800 (PST) Received-SPF: pass (google.com: domain of john.stultz@linaro.org designates 2607:f8b0:400e:c00::235 as permitted sender) client-ip=2607:f8b0:400e:c00::235; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: domain of john.stultz@linaro.org designates 2607:f8b0:400e:c00::235 as permitted sender) smtp.mailfrom=john.stultz@linaro.org; dmarc=pass (p=NONE dis=NONE) header.from=linaro.org Received: by mail-pf0-x235.google.com with SMTP id c4so78111375pfb.1 for ; Tue, 03 Jan 2017 11:52:45 -0800 (PST) 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; bh=5kNrRWNQWLOIc1G6STXMG28a4SUWbah8bzCC4gOziF4=; b=OXbg4Yad5A/sVghIC7MTCcdMRnvDVgaDFWK+9oAZgx7T9DpWkp894kyPdJyA3IRrLw Pa8b2Ulw+kS0Dtf83EDZ5mDq60dNYr6EgyZe4T7r3mb1rATihPCpLZPwRUOwS2XfiRHi XNxDDEOEgCQj1MjU7ekkVh0zVaJ3nBMLIaVMw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=5kNrRWNQWLOIc1G6STXMG28a4SUWbah8bzCC4gOziF4=; b=rkivsqAQv4OLccGDfaSPEbOfyI8kdyhJH45hazSVeR7A4/nuJIYURugvyOrb0Gl0Cr okamqXRySglbjiFusO7OS3aYwWnpTIhjDWkT403YqatMCK2EgkRRglrmTEe1HoclZ6dD WHX71AMROHCKO2TSrO84x4JaUJThzb62D2s9Lw6OVUNpFwsylCXnWXuTTC4BrZsVSBPM XMVBVxlKPuDChWGqmWSZnF8FSvccNEIVF6spiZM6uyC/GN67S/IMYkjQEDb3EpPIpeCW QPo6Y8h8CpfQywIRRBUdRMVkvsPH5J66v0tRZkLam4VUsGCxxX/jvg2wNENhpDITzNML ZzAw== X-Gm-Message-State: AIkVDXJGVl2hYZuUAnFGnwHAeliw5c8LUHuhwQiD3GozsTnmgG5dgh/EHMbXCY0advkHK4oC/gM= X-Received: by 10.84.164.106 with SMTP id m39mr137177361plg.97.1483473165484; Tue, 03 Jan 2017 11:52:45 -0800 (PST) Return-Path: Received: from localhost.localdomain ([2601:1c2:1002:83f0:4e72:b9ff:fe99:466a]) by smtp.gmail.com with ESMTPSA id r1sm93771794pgn.48.2017.01.03.11.52.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 03 Jan 2017 11:52:44 -0800 (PST) From: John Stultz To: lkml Cc: Chen Yu , Wei Xu , Guodong Xu , Amit Pundir , Rob Herring , John Youn , Douglas Anderson , Vardan Mikayelyan , Kishon Vijay Abraham I , Felipe Balbi , Greg Kroah-Hartman , linux-usb@vger.kernel.org, John Stultz Subject: [PATCH 3/5 v2] usb: dwc2: Force port resume on switching to device mode Date: Tue, 3 Jan 2017 11:52:35 -0800 Message-Id: <1483473157-16678-4-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1483473157-16678-1-git-send-email-john.stultz@linaro.org> References: <1483473157-16678-1-git-send-email-john.stultz@linaro.org> From: Chen Yu We've seen failures when switching between host and gadget mode, which was diagnosed as being caused due to the bus being auto-suspended when we switched. So this patch forces a port resume when switching to device mode if the bus is suspended. Cc: Wei Xu Cc: Guodong Xu Cc: Amit Pundir Cc: Rob Herring Cc: John Youn Cc: Douglas Anderson Cc: Chen Yu Cc: Vardan Mikayelyan Cc: Kishon Vijay Abraham I Cc: Felipe Balbi Cc: Greg Kroah-Hartman Cc: linux-usb@vger.kernel.org Signed-off-by: Chen Yu Signed-off-by: John Stultz --- drivers/usb/dwc2/hcd.c | 7 +++++++ 1 file changed, 7 insertions(+) -- 2.7.4 diff --git a/drivers/usb/dwc2/hcd.c b/drivers/usb/dwc2/hcd.c index b60307a..a089946 100644 --- a/drivers/usb/dwc2/hcd.c +++ b/drivers/usb/dwc2/hcd.c @@ -54,6 +54,8 @@ #include "core.h" #include "hcd.h" +static void dwc2_port_resume(struct dwc2_hsotg *hsotg); + /* * ========================================================================= * Host Core Layer Functions @@ -3235,6 +3237,11 @@ static void dwc2_conn_id_status_change(struct work_struct *work) if (gotgctl & GOTGCTL_CONID_B) { /* Wait for switch to device mode */ dev_dbg(hsotg->dev, "connId B\n"); + if (hsotg->bus_suspended) { + dev_info(hsotg->dev, + "Do port resume before switching to device mode\n"); + dwc2_port_resume(hsotg); + } while (!dwc2_is_device_mode(hsotg)) { dev_info(hsotg->dev, "Waiting for Peripheral Mode, Mode=%s\n",