From patchwork Thu Aug 10 02:50:52 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 109774 Delivered-To: patches@linaro.org Received: by 10.140.95.78 with SMTP id h72csp1735459qge; Wed, 9 Aug 2017 19:51:00 -0700 (PDT) X-Received: by 10.98.130.206 with SMTP id w197mr10307684pfd.310.1502333460815; Wed, 09 Aug 2017 19:51:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1502333460; cv=none; d=google.com; s=arc-20160816; b=wf0Mu2rY2FbCkBy6L/nur1KyJu7rUtmvcGBsw9KtkrBv1J0kekkRGTJlFQAx73gyDU ktktmEw0BpBnfbx7ifj9X4zHOVJSYR0LNBShMItdhv8d4BrgOiPgvMGg1ZnI3gyQ5yA7 q/rZdDxzfh553FgMDfiBKUXSQt3ffq4/yF3TgnB5thjJcO1WaDDAxGjX+F69sJR3gGj7 2kazAQGznSJ+U3ekYSL0X7QnWbeK5GMJZ5MIPikk2Pxwf98OSGVgqyCZfgs8oLjm/h2a 8n77f2/byTqMBTSjxXiGoe6hDsKKICCXykmAZdKrleZW2be7Nc91ZcJjXsaWZT1yduXl CssQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:date:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=DW15wru0KxaOhAwro+wGNyfuWqK+WqV+JYz115CekOI=; b=l8ITucv3u78zJQuSStbYMDg/Tkqfoc/9tHXZMghryn/0G2fcTYSKmxVLh9UnS4zG6h kx/sqSMG1SdEoYDavar4w1qkYN9I4eeA6gMCeFqXASDeZepwgum3GeX05nztsbMQ0Dxl TOcYsnQJa4lUWx2VrFiK6x4X80QaQ08Idlh70MRXE93gxmlrg26oyOqNjHIIRpy9JYu+ cw8ZhgvF65zF73K+4tgJzcS1h8euUsHEQqCajq4ED6kXfDHEiiBki1HzmY1+LXzvxDe0 26swz9LwC7F8NbrUNd7QaKOrObRkTb844uoESiE0wU31ZbSkGBybLOMD0tqIPRAXH5vR gp/w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=KEhrSMq7; spf=pass (google.com: domain of john.stultz@linaro.org designates 2607:f8b0:400e:c05::233 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-pg0-x233.google.com (mail-pg0-x233.google.com. [2607:f8b0:400e:c05::233]) by mx.google.com with ESMTPS id f5si3773737plf.725.2017.08.09.19.51.00 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 09 Aug 2017 19:51:00 -0700 (PDT) Received-SPF: pass (google.com: domain of john.stultz@linaro.org designates 2607:f8b0:400e:c05::233 as permitted sender) client-ip=2607:f8b0:400e:c05::233; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=KEhrSMq7; spf=pass (google.com: domain of john.stultz@linaro.org designates 2607:f8b0:400e:c05::233 as permitted sender) smtp.mailfrom=john.stultz@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by mail-pg0-x233.google.com with SMTP id y129so35627691pgy.4 for ; Wed, 09 Aug 2017 19:51:00 -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; bh=DW15wru0KxaOhAwro+wGNyfuWqK+WqV+JYz115CekOI=; b=KEhrSMq78s/shPSGJpA2CTT9WilViEqIQC2gAhjTpBu0mqixK0Gn4+DneHXNJGMQDa U0eTfqyRMSIFCn3YG5ddq+zM6xEFmzjfoDCXtqVMbFv0pdwVreJ8qjTPN298Qowc/DRV Z8RHNDgAzeMTbeCBcvVI1kovmKSrOhq5NpdY0= 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; bh=DW15wru0KxaOhAwro+wGNyfuWqK+WqV+JYz115CekOI=; b=LBgsEv7ZbhDfmmcf9yUs3cXSYdaeFK3FtcXz6j/XqmlG6CiJNxV8DZBIAB/5RlIw8t xE52Bar/cmRy7ADqWRgtZQIUR2TAvl8TRnf3obdVe77N794iCeCsBYGmZCgR+CgFrZnx dup+CCvtaWFbW6q2ScC9FhsHwd/8qLsAAy6PpWHheuTAzY+gLqnYQv/wMEG/POlnP6W+ SLqq1YhGRUTR3JTXdCUhYy6Z9sEpqK1ct24jp8FUNz0Ozc0+Dq9j6AgnvmHaSzYkOmMK Vt+eMFo0F+wNLQZwwb9sOAsws2cMLA3rgQOVJeO4SF+/uJ3JWvsxOHmIKQOAlZH6CcWs QiyA== X-Gm-Message-State: AHYfb5jh9+nedax7xXsvPQNjd9HPcbQgbbGAhxzVaftwTnm8aSG9DwDH ++2evP5/WijuaY7Co0E= X-Received: by 10.99.47.1 with SMTP id v1mr9657191pgv.306.1502333460402; Wed, 09 Aug 2017 19:51:00 -0700 (PDT) Return-Path: Received: from localhost.localdomain ([2601:1c2:1002:83f0:4e72:b9ff:fe99:466a]) by smtp.gmail.com with ESMTPSA id r70sm9735453pfk.158.2017.08.09.19.50.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 09 Aug 2017 19:50:59 -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: [RFC][PATCH] usb: dwc2: Error out of dwc2_hsotg_ep_disable() if we're in host mode Date: Wed, 9 Aug 2017 19:50:52 -0700 Message-Id: <1502333452-17830-1-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 2.7.4 We've found that while in host mode on HiKey using Android, if one runs the command: stop adbd The existing usb devices being utilized in host mode are disconnected. This is most visible with usb networking devices. This seems to be due to adbd closing the file: /dev/usb-ffs/adb/ep0 Which calls ffs_ep0_release() and the following backtrace: [] dwc2_hsotg_ep_disable+0x148/0x150 [] dwc2_hsotg_udc_stop+0x60/0x110 [] usb_gadget_remove_driver+0x58/0x78 [] usb_gadget_unregister_driver+0x74/0xe8 [] unregister_gadget+0x28/0x58 [] unregister_gadget_item+0x2c/0x40 [] ffs_data_clear+0xe8/0xf8 [] ffs_data_reset+0x20/0x58 [] ffs_data_closed+0x98/0xe8 [] ffs_ep0_release+0x20/0x30 Then when dwc2_hsotg_ep_disable() is called, we call kill_all_requests() which causes a bunch of the following messages: dwc2 f72c0000.usb: Mode Mismatch Interrupt: currently in Host mode dwc2 f72c0000.usb: Mode Mismatch Interrupt: currently in Host mode dwc2 f72c0000.usb: Mode Mismatch Interrupt: currently in Host mode dwc2 f72c0000.usb: Mode Mismatch Interrupt: currently in Host mode dwc2 f72c0000.usb: Mode Mismatch Interrupt: currently in Host mode dwc2 f72c0000.usb: Mode Mismatch Interrupt: currently in Host mode dwc2 f72c0000.usb: Mode Mismatch Interrupt: currently in Host mode dwc2 f72c0000.usb: Mode Mismatch Interrupt: currently in Host mode init: Service 'adbd' (pid 1915) killed by signal 9 init: Sending signal 9 to service 'adbd' (pid 1915) process group... init: Successfully killed process cgroup uid 0 pid 1915 in 0ms init: processing action (init.svc.adbd=stopped) from (/init.usb.configfs.rc:15) dwc2 f72c0000.usb: dwc2_hc_chhltd_intr_dma: Channel 8 - ChHltd set, but reason is unknown dwc2 f72c0000.usb: hcint 0x00000002, intsts 0x04200029 dwc2 f72c0000.usb: dwc2_hc_chhltd_intr_dma: Channel 12 - ChHltd set, but reason is unknown dwc2 f72c0000.usb: hcint 0x00000002, intsts 0x04200029 dwc2 f72c0000.usb: dwc2_hc_chhltd_intr_dma: Channel 15 - ChHltd set, but reason is unknown dwc2 f72c0000.usb: hcint 0x00000002, intsts 0x04200029 dwc2 f72c0000.usb: dwc2_hc_chhltd_intr_dma: Channel 3 - ChHltd set, but reason is unknown dwc2 f72c0000.usb: hcint 0x00000002, intsts 0x04200029 dwc2 f72c0000.usb: dwc2_hc_chhltd_intr_dma: Channel 4 - ChHltd set, but reason is unknown dwc2 f72c0000.usb: hcint 0x00000002, intsts 0x04200029 dwc2 f72c0000.usb: dwc2_update_urb_state_abn(): trimming xfer length And the usb devices connected are basically hung at this point. It seems like if we're in host mode, we probably shouldn't run the dwc2_hostg_ep_disable logic, so this patch returns an error in that case. With this patch (along with the two previous patches mailed out earlier: https://lkml.org/lkml/2017/8/3/1008 https://lkml.org/lkml/2017/8/3/1010 ), we avoid the mismatched interrupts and connected usb devices continue to function. I'm not sure if some other solution would be better here, but this seems to work, so I wanted to send it out for input on what the right approach should be. 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 Reported-by: YongQin Liu Signed-off-by: John Stultz --- drivers/usb/dwc2/gadget.c | 5 +++++ 1 file changed, 5 insertions(+) -- 2.7.4 diff --git a/drivers/usb/dwc2/gadget.c b/drivers/usb/dwc2/gadget.c index e6f2cd8..61fb76f 100644 --- a/drivers/usb/dwc2/gadget.c +++ b/drivers/usb/dwc2/gadget.c @@ -4006,6 +4006,11 @@ static int dwc2_hsotg_ep_disable(struct usb_ep *ep) return -EINVAL; } + if (hsotg->op_state != OTG_STATE_B_PERIPHERAL) { + dev_err(hsotg->dev, "%s: called in host mode?\n", __func__); + return -EINVAL; + } + epctrl_reg = dir_in ? DIEPCTL(index) : DOEPCTL(index); spin_lock_irqsave(&hsotg->lock, flags);