From patchwork Tue Mar 12 09:03:19 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Chen X-Patchwork-Id: 2254021 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id D5FB64006E for ; Tue, 12 Mar 2013 09:08:02 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UFL7u-0000qW-9E; Tue, 12 Mar 2013 09:04:06 +0000 Received: from mail-db8lp0185.outbound.messaging.microsoft.com ([213.199.154.185] helo=db8outboundpool.messaging.microsoft.com) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UFL7p-0000p4-V2 for linux-arm-kernel@lists.infradead.org; Tue, 12 Mar 2013 09:04:03 +0000 Received: from mail48-db8-R.bigfish.com (10.174.8.245) by DB8EHSOBE031.bigfish.com (10.174.4.94) with Microsoft SMTP Server id 14.1.225.23; Tue, 12 Mar 2013 09:03:53 +0000 Received: from mail48-db8 (localhost [127.0.0.1]) by mail48-db8-R.bigfish.com (Postfix) with ESMTP id 1C7D0D0012E; Tue, 12 Mar 2013 09:03:53 +0000 (UTC) X-Forefront-Antispam-Report: CIP:70.37.183.190; KIP:(null); UIP:(null); IPV:NLI; H:mail.freescale.net; RD:none; EFVD:NLI X-SpamScore: 1 X-BigFish: VS1(z551bizzz1f42h1ee6h1de0h1202h1e76h1d1ah1d2ahzz8275bhz2dh2a8h668h839hd24he5bhf0ah1288h12a5h12a9h12bdh12e5h1354h137ah139eh13b6h1441h1504h1537h162dh1631h1758h1898h18e1h1946h19b5h1ad9h1b0ah1155h) Received: from mail48-db8 (localhost.localdomain [127.0.0.1]) by mail48-db8 (MessageSwitch) id 1363079031148290_9459; Tue, 12 Mar 2013 09:03:51 +0000 (UTC) Received: from DB8EHSMHS003.bigfish.com (unknown [10.174.8.237]) by mail48-db8.bigfish.com (Postfix) with ESMTP id 15EB480045; Tue, 12 Mar 2013 09:03:51 +0000 (UTC) Received: from mail.freescale.net (70.37.183.190) by DB8EHSMHS003.bigfish.com (10.174.4.13) with Microsoft SMTP Server (TLS) id 14.1.225.23; Tue, 12 Mar 2013 09:03:50 +0000 Received: from tx30smr01.am.freescale.net (10.81.153.31) by 039-SN1MMR1-004.039d.mgd.msft.net (10.84.1.14) with Microsoft SMTP Server (TLS) id 14.2.328.11; Tue, 12 Mar 2013 09:03:48 +0000 Received: from localhost.localdomain (nchen-desktop.ap.freescale.net [10.192.242.40]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id r2C93Kaw024390; Tue, 12 Mar 2013 02:03:44 -0700 From: Peter Chen To: Subject: [RFC PATCH 3/3] usb: udc-core: add judgement logic for usb_gadget_connect Date: Tue, 12 Mar 2013 17:03:19 +0800 Message-ID: <1363078999-7361-3-git-send-email-peter.chen@freescale.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1363078999-7361-1-git-send-email-peter.chen@freescale.com> References: <1363078999-7361-1-git-send-email-peter.chen@freescale.com> MIME-Version: 1.0 X-OriginatorOrg: freescale.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130312_050402_361268_13B6E7E2 X-CRM114-Status: GOOD ( 11.77 ) X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [213.199.154.185 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: stigge@antcom.de, kgene.kim@samsung.com, eric.y.miao@gmail.com, alexander.shishkin@linux.intel.com, gregkh@linuxfoundation.org, linux-usb@vger.kernel.org, haojian.zhuang@gmail.com, chao.xie@marvell.com, ben-linux@fluff.org, yuxu@marvell.com, leoli@freescale.com, plagnioj@jcrosoft.com, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org - If there is no vbus control to indicate connection and disconnect, we can pullup dp when we load gadget module. - If we have vbus control logic, the dp is better pulled up when there is a vbus session. Signed-off-by: Peter Chen --- drivers/usb/gadget/udc-core.c | 24 ++++++++++++++++-------- 1 files changed, 16 insertions(+), 8 deletions(-) diff --git a/drivers/usb/gadget/udc-core.c b/drivers/usb/gadget/udc-core.c index 2a9cd36..4b56f7c 100644 --- a/drivers/usb/gadget/udc-core.c +++ b/drivers/usb/gadget/udc-core.c @@ -262,6 +262,7 @@ EXPORT_SYMBOL_GPL(usb_del_gadget_udc); static int udc_bind_to_driver(struct usb_udc *udc, struct usb_gadget_driver *driver) { int ret; + struct usb_gadget *gadget = udc->gadget; dev_dbg(&udc->dev, "registering UDC driver [%s]\n", driver->function); @@ -269,15 +270,18 @@ static int udc_bind_to_driver(struct usb_udc *udc, struct usb_gadget_driver *dri udc->driver = driver; udc->dev.driver = &driver->driver; - ret = driver->bind(udc->gadget, driver); + ret = driver->bind(gadget, driver); if (ret) goto err1; - ret = usb_gadget_udc_start(udc->gadget, driver); + ret = usb_gadget_udc_start(gadget, driver); if (ret) { - driver->unbind(udc->gadget); + driver->unbind(gadget); goto err1; } - usb_gadget_connect(udc->gadget); + if (!gadget->ops->vbus_session || + (gadget->ops->vbus_session + && gadget->vbus_active)) + usb_gadget_connect(gadget); kobject_uevent(&udc->dev.kobj, KOBJ_CHANGE); return 0; @@ -379,13 +383,17 @@ static ssize_t usb_udc_softconn_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t n) { struct usb_udc *udc = container_of(dev, struct usb_udc, dev); + struct usb_gadget *gadget = udc->gadget; if (sysfs_streq(buf, "connect")) { - usb_gadget_udc_start(udc->gadget, udc->driver); - usb_gadget_connect(udc->gadget); + usb_gadget_udc_start(gadget, udc->driver); + if (!gadget->ops->vbus_session || + (gadget->ops->vbus_session + && gadget->vbus_active)) + usb_gadget_connect(gadget); } else if (sysfs_streq(buf, "disconnect")) { - usb_gadget_disconnect(udc->gadget); - usb_gadget_udc_stop(udc->gadget, udc->driver); + usb_gadget_disconnect(gadget); + usb_gadget_udc_stop(gadget, udc->driver); } else { dev_err(dev, "unsupported command '%s'\n", buf); return -EINVAL;