From patchwork Mon Oct 23 21:32:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 116882 Delivered-To: patches@linaro.org Received: by 10.140.22.164 with SMTP id 33csp5100861qgn; Mon, 23 Oct 2017 14:32:58 -0700 (PDT) X-Received: by 10.99.111.197 with SMTP id k188mr13222091pgc.344.1508794377976; Mon, 23 Oct 2017 14:32:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508794377; cv=none; d=google.com; s=arc-20160816; b=NbG4g4mymRZDyzH07FPxVmd6NCe5uGX2xNlTKDwAtNWMNZhyqx0MMPdBWjXScdi9Lb atzkaTxMwB8BoNhV37XMfYnnHG7ojYkVwwy57GNbqMjByOm7wW747FuDss3P9vi0xHxT z8XFRj4dOtHujpmIeGNCV5ISBfGbbtzuzKs5fMM0CiYdsPhBmu3YPdmOrBdsKlkiuQwJ 8iwr+itJlRW37IE6GKD6yL71EZXuamLuFSJSLcYcvn9EYfK+NzB/vZ5UiKjyxnSuLrLu k9eqq0ohosf7ZMXLcB6GoOl8dKdTk2HONpWOPvM+B2RflH37UECyJmj5e1d3ibbJvhzA 0MeQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=MsB5pqxwEl7mT8S9AtfCVQXAslPmMEZsyYkPakhkrBk=; b=nvnsU/XvyH8xlMIc4LJw9ceM8YM+L1rjbmRUwRuKt++EJyE9R8QQm0jty0XKGFcA6P gSFMq5F/jB0lC8oY8t6YXTqaSwnNafiMiU6zB4mgQnsV6/q35NfoklmN0J5o/N1HelGs ZnlzbUFUYb9lxsxQt1co8GIt0aZSW1hLRTmWxCMY5ZyHNNKdE3C5VBZuAyZk7NvYfJzM mZb+EQC8e1uJtm4oY6Cx+x33pNmkhMfSKZQQdh/Un4oR6QPnIqmpzBDnVEUVInYUKf0s BLaxxxFEiCArylnXdMeN8C6vXzDkuKzF6sqwtsVCdH1aXxaM/L+NlRmz3CCejEUpsi1m dmyQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=eQAfQk7B; spf=pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.stultz@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id m13sor1990577pgt.374.2017.10.23.14.32.57 for (Google Transport Security); Mon, 23 Oct 2017 14:32:57 -0700 (PDT) Received-SPF: pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=eQAfQk7B; spf=pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.stultz@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org 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=MsB5pqxwEl7mT8S9AtfCVQXAslPmMEZsyYkPakhkrBk=; b=eQAfQk7BoJXXcglPN+fVAmtOVDaTHXTltrlUbcTP+HC6xgjBlNQfFoM9arkYcTznCs Gq4yPWsB3AUwvnUgio3F36ydVLtoh6LqWX65MfbbGqHVmmKaDyLDcDsKCCvZShLs7a4i 8CDj1TOMS/RdQIeFDl7y7Plm9GO8THs3mBDLY= 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=MsB5pqxwEl7mT8S9AtfCVQXAslPmMEZsyYkPakhkrBk=; b=GfDVhWmqQ6jO/+KXCC6pk30ji2wJGmvJQSInizZC++dfqthaiZEdq4Rq8+XXGOoDs0 X+Jd4U3v4FkSmekx6/oASA9K+emtyXVpuzwgTIUXHKnKzPD1poZb0xrkbrGhLbnc8Gd7 LjbZJ+2eNAt5qG0W9TNO0AoP7L46irrLLJdftJLyuRdGve2JdwRT0rOt2a9av8Xlt/43 HXsyDQ1Q0Ta15x5r6O2OT5Yq/TeEjK9HJ9506MKsA0CHKEgGcsoqqbfYElukG0I+81sU QGlpTcS2Xlghh3bpmXLqVO5UTb3Ejrhj4Q8nkbwQeD3TzJd+EdkroFuYwelIZbDLA5oG YFVQ== X-Gm-Message-State: AMCzsaXmnF6GMKyeXfWysOopcK9A3RicLaWl9bRFhAbGT6LtSCwKo1y/ osonnW4T8QYahOiCby+QtuMsYTX+ X-Google-Smtp-Source: ABhQp+TQmW+ORfBqGU+O63aVD9SDJaua1nIeo6gW5RqxZcqvLQmZ3IJWxmd6H8ksBk6VCHDUhSBD+A== X-Received: by 10.99.98.6 with SMTP id w6mr12881073pgb.189.1508794377617; Mon, 23 Oct 2017 14:32:57 -0700 (PDT) Return-Path: Received: from localhost.localdomain ([2601:1c2:1002:83f0:4e72:b9ff:fe99:466a]) by smtp.gmail.com with ESMTPSA id f11sm4518766pfd.82.2017.10.23.14.32.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 23 Oct 2017 14:32:56 -0700 (PDT) From: John Stultz To: lkml Cc: John Stultz , Wei Xu , Guodong Xu , Amit Pundir , YongQin Liu , John Youn , Minas Harutyunyan , Douglas Anderson , Chen Yu , Felipe Balbi , Greg Kroah-Hartman , linux-usb@vger.kernel.org Subject: [PATCH 1/3 v2] usb: dwc2: Improve gadget state disconnection handling Date: Mon, 23 Oct 2017 14:32:48 -0700 Message-Id: <1508794370-29982-2-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1508794370-29982-1-git-send-email-john.stultz@linaro.org> References: <1508794370-29982-1-git-send-email-john.stultz@linaro.org> In the earlier commit dad3f793f20f ("usb: dwc2: Make sure we disconnect the gadget state"), I was trying to fix up the fact that we somehow weren't disconnecting the gadget state, so that when the OTG port was plugged in the second time we would get warnings about the state tracking being wrong. (This seems to be due to a quirk of the HiKey board where we do not ever get any otg interrupts, particularly the session end detected signal. Instead we only see status change interrupt.) The fix there was somewhat simple, as it just made sure to call dwc2_hsotg_disconnect() before we connected things up in OTG mode, ensuring the state handling didn't throw errors. But in looking at a different issue I was seeing with UDC state handling, I realized that it would be much better to call dwc2_hsotg_disconnect when we get the state change signal moving to host mode. Thus, this patch removes the earlier disconnect call I added and moves it (and the needed locking) to the host mode transition. Cc: Wei Xu Cc: Guodong Xu Cc: Amit Pundir Cc: YongQin Liu Cc: John Youn Cc: Minas Harutyunyan Cc: Douglas Anderson Cc: Chen Yu Cc: Felipe Balbi Cc: Greg Kroah-Hartman Cc: linux-usb@vger.kernel.org Signed-off-by: John Stultz --- v2: Remove the extra dwc2_hsotg_core_init_disconnected() call I had added, as suggested by Minas. --- drivers/usb/dwc2/hcd.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) -- 2.7.4 Acked-by: Minas Harutyunyan Tested-by: Minas Harutyunyan diff --git a/drivers/usb/dwc2/hcd.c b/drivers/usb/dwc2/hcd.c index c263114..9bd60ec 100644 --- a/drivers/usb/dwc2/hcd.c +++ b/drivers/usb/dwc2/hcd.c @@ -3277,7 +3277,6 @@ static void dwc2_conn_id_status_change(struct work_struct *work) dwc2_core_init(hsotg, false); dwc2_enable_global_interrupts(hsotg); spin_lock_irqsave(&hsotg->lock, flags); - dwc2_hsotg_disconnect(hsotg); dwc2_hsotg_core_init_disconnected(hsotg, false); spin_unlock_irqrestore(&hsotg->lock, flags); dwc2_hsotg_core_connect(hsotg); @@ -3296,8 +3295,12 @@ static void dwc2_conn_id_status_change(struct work_struct *work) if (count > 250) dev_err(hsotg->dev, "Connection id status change timed out\n"); - hsotg->op_state = OTG_STATE_A_HOST; + spin_lock_irqsave(&hsotg->lock, flags); + dwc2_hsotg_disconnect(hsotg); + spin_unlock_irqrestore(&hsotg->lock, flags); + + hsotg->op_state = OTG_STATE_A_HOST; /* Initialize the Core for Host mode */ dwc2_core_init(hsotg, false); dwc2_enable_global_interrupts(hsotg);