From patchwork Thu Sep 7 00:30:54 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 111844 Delivered-To: patches@linaro.org Received: by 10.140.94.239 with SMTP id g102csp54609qge; Wed, 6 Sep 2017 17:31:12 -0700 (PDT) X-Received: by 10.84.131.100 with SMTP id 91mr970880pld.247.1504744272754; Wed, 06 Sep 2017 17:31:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1504744272; cv=none; d=google.com; s=arc-20160816; b=mrf2RQlNqGC4BLosnFLsHcpX8vWtvQxPZe+JVE2akBwYSx8qWqpKcGlioSvSXoMs6h 8Jkp2kY4et33qV254Gv7JDgiqqkuM1Yda5JpmAerUJ0GSl8bQO1fnqMy54qD1ow8S3xT et9f8miSea7izhCLcXF5xqAtWLYIYM5qkL2wLPpxyhGs2CURBaC+MWKSdBlMP8JXEszL HgCprbGcMZTVcLLc64Ix1xryywJ51KapO/ArTElw9zB9IV52TBAqpzLR7mtTTmyyoR19 NxywN+/CfwOYo9zINNFb9uYo5nkPffQdS3Yd7oJUde/1Pzx3iNunQCaUrx2SLh+i1wBY R8Fw== 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=QMQJfVjGhCqQeebsMU/4Yes5HlBi27BS34HjyHfo2gM=; b=jZEVX/zpIFC3AYeWMyvCQQwrMmeFSCRtzuZcFOENntYNL1bk7wpIW35M0b//ybGXl0 eg7rEt5weuz7RGt1pxbVEaW5GlvDM/OmmfRt7QmTHnbPTw8MU+YYVqTeIadkVR4cFlrg PE2TsVkw/ioRj2YA1omm8rSYzraoboCxtaxOPZfFJDGPFdA7nCJQF88KAk38+AHxQ8bz cz4LUq8SMzB58JeA4syqYHRPcNMUsvBE9lQfB0Ktbfq8MkV+0ObhdEJZFvgCyIjkHwKI NbfIiuGj8pkSBd8iviaWr30+P08ePuDEKaIcX+/j3Grjsgij2wF782NxW4A1Oo0Wd919 3SgQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=fyH0yCjD; spf=pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.41 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-f41.google.com (mail-sor-f41.google.com. [209.85.220.41]) by mx.google.com with SMTPS id y79sor544170pfb.107.2017.09.06.17.31.12 for (Google Transport Security); Wed, 06 Sep 2017 17:31:12 -0700 (PDT) Received-SPF: pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=fyH0yCjD; spf=pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.41 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=QMQJfVjGhCqQeebsMU/4Yes5HlBi27BS34HjyHfo2gM=; b=fyH0yCjDK3xjc450Xr/bsa1e1PU9nQHxb0ypvAE3Zht5q48uSDtAXqsEmD/TIDQi8I 5r4dmV6C7hQJ48B8Cq7QIBOPxi8fxUvbliUAJZA3sv7JuKMF1waZcpSraRMsRoummjVR GtvaJ/g8wXmnzc23ZG+TSLoRs1dPjwz8q546s= 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=QMQJfVjGhCqQeebsMU/4Yes5HlBi27BS34HjyHfo2gM=; b=imPxB0cn6X1V2Uo0HDHReE4zFblDy8AU5K3mpJyIb8q8PVNk9U+5rTlLG03zmfs5hB JoGTUw4SRIF9j461wzMviudqAqUAhQK/t6MFm+il+nKpP/EEfvr2u8aUrf4hG/TNlAsi Iqr4o37lEbxP3i1gtsYY5b66uNQGSkq0jx3EdTMmlZTqrCMBuUYZSagmYrHxuTXLgRW4 hH1p+J2cvX74ReaCSJYBkyInuHUxTsLM83n8K1E+bHHVyYWNbwgcqX9F4CcfH32ejsr1 1k2ZaiDDspw2DGjGT1ttYSXKty+SJ2m6ST273WKWwp0LLtfnCqRUIrHeKq7syIpQKhjo DQcw== X-Gm-Message-State: AHPjjUhVpTcXlR6+U2ifH5962igmfL3qDV3SNnDMOaIWsQppWH0DLdo0 x7oUxms13tK7G3okBFI= X-Google-Smtp-Source: ADKCNb7uiBOet+4danWCAv4I4fU2LQwlU6bB+CZwVAUKv1Xrh4OZfhPYB/Q04gY3myLhwI4AQbPnAQ== X-Received: by 10.98.215.18 with SMTP id b18mr938849pfh.25.1504744272427; Wed, 06 Sep 2017 17:31:12 -0700 (PDT) Return-Path: Received: from localhost.localdomain ([2601:1c2:1002:83f0:4e72:b9ff:fe99:466a]) by smtp.gmail.com with ESMTPSA id o19sm987378pgn.76.2017.09.06.17.31.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 06 Sep 2017 17:31:10 -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: [RESEND][PATCH 2/3] usb: dwc2: Error out of dwc2_hsotg_ep_disable() if we're in host mode Date: Wed, 6 Sep 2017 17:30:54 -0700 Message-Id: <1504744255-25281-3-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1504744255-25281-1-git-send-email-john.stultz@linaro.org> References: <1504744255-25281-1-git-send-email-john.stultz@linaro.org> We've found that while in host mode, 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 0d8e09c..7fd0e38 100644 --- a/drivers/usb/dwc2/gadget.c +++ b/drivers/usb/dwc2/gadget.c @@ -4004,6 +4004,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);