From patchwork Wed Sep 2 14:24:16 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roger Quadros X-Patchwork-Id: 7112271 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 9F65D9F32B for ; Wed, 2 Sep 2015 14:27:55 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0023D20681 for ; Wed, 2 Sep 2015 14:27:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DCF0720680 for ; Wed, 2 Sep 2015 14:27:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755081AbbIBO1g (ORCPT ); Wed, 2 Sep 2015 10:27:36 -0400 Received: from bear.ext.ti.com ([192.94.94.41]:56848 "EHLO bear.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753553AbbIBOYi (ORCPT ); Wed, 2 Sep 2015 10:24:38 -0400 Received: from dlelxv90.itg.ti.com ([172.17.2.17]) by bear.ext.ti.com (8.13.7/8.13.7) with ESMTP id t82EOWoU014480; Wed, 2 Sep 2015 09:24:32 -0500 Received: from DFLE73.ent.ti.com (dfle73.ent.ti.com [128.247.5.110]) by dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id t82EOWW9004923; Wed, 2 Sep 2015 09:24:32 -0500 Received: from dflp32.itg.ti.com (10.64.6.15) by DFLE73.ent.ti.com (128.247.5.110) with Microsoft SMTP Server id 14.3.224.2; Wed, 2 Sep 2015 09:24:32 -0500 Received: from rockdesk.ti.com (ileax41-snat.itg.ti.com [10.172.224.153]) by dflp32.itg.ti.com (8.14.3/8.13.8) with ESMTP id t82EOPFO024150; Wed, 2 Sep 2015 09:24:29 -0500 From: Roger Quadros To: CC: , , , , , , , , Roger Quadros Subject: [PATCH v4 1/9] usb: dwc3: add dual-role support Date: Wed, 2 Sep 2015 17:24:16 +0300 Message-ID: <1441203864-15786-2-git-send-email-rogerq@ti.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1441203864-15786-1-git-send-email-rogerq@ti.com> References: <1441203864-15786-1-git-send-email-rogerq@ti.com> MIME-Version: 1.0 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Register with the USB OTG core. Since we don't support OTG yet we just work as a dual-role device even if device tree says "otg". Use extcon framework to get VBUS/ID cable events and kick the OTG state machine. Signed-off-by: Roger Quadros Signed-off-by: Roger Quadros --- drivers/usb/dwc3/core.c | 174 ++++++++++++++++++++++++++++++++++++++- drivers/usb/dwc3/core.h | 7 ++ drivers/usb/dwc3/platform_data.h | 1 + 3 files changed, 181 insertions(+), 1 deletion(-) diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c index 064123e..2e36a9b 100644 --- a/drivers/usb/dwc3/core.c +++ b/drivers/usb/dwc3/core.c @@ -704,6 +704,152 @@ static int dwc3_core_get_phy(struct dwc3 *dwc) return 0; } +/* --------------------- Dual-Role management ------------------------------- */ + +static void dwc3_drd_fsm_sync(struct dwc3 *dwc) +{ + int id, vbus; + + /* get ID */ + id = extcon_get_cable_state(dwc->edev, "USB-HOST"); + /* Host means ID == 0 */ + id = !id; + + /* get VBUS */ + vbus = extcon_get_cable_state(dwc->edev, "USB"); + dev_dbg(dwc->dev, "id %d vbus %d\n", id, vbus); + + dwc->fsm->id = id; + dwc->fsm->b_sess_vld = vbus; + usb_otg_sync_inputs(dwc->fsm); +} + +static int dwc3_drd_start_host(struct otg_fsm *fsm, int on) +{ + struct device *dev = usb_otg_fsm_to_dev(fsm); + struct dwc3 *dwc = dev_get_drvdata(dev); + + dev_dbg(dwc->dev, "%s: %d\n", __func__, on); + if (on) { + dwc3_set_mode(dwc, DWC3_GCTL_PRTCAP_HOST); + /* start the HCD */ + usb_otg_start_host(fsm, true); + } else { + /* stop the HCD */ + usb_otg_start_host(fsm, false); + } + + return 0; +} + +static int dwc3_drd_start_gadget(struct otg_fsm *fsm, int on) +{ + struct device *dev = usb_otg_fsm_to_dev(fsm); + struct dwc3 *dwc = dev_get_drvdata(dev); + + dev_dbg(dwc->dev, "%s: %d\n", __func__, on); + if (on) { + dwc3_set_mode(dwc, DWC3_GCTL_PRTCAP_DEVICE); + dwc3_event_buffers_setup(dwc); + + /* start the UDC */ + usb_otg_start_gadget(fsm, true); + } else { + /* stop the UDC */ + usb_otg_start_gadget(fsm, false); + } + + return 0; +} + +static struct otg_fsm_ops dwc3_drd_ops = { + .start_host = dwc3_drd_start_host, + .start_gadget = dwc3_drd_start_gadget, +}; + +static int dwc3_drd_notifier(struct notifier_block *nb, + unsigned long event, void *ptr) +{ + struct dwc3 *dwc = container_of(nb, struct dwc3, otg_nb); + + dwc3_drd_fsm_sync(dwc); + + return NOTIFY_DONE; +} + +static int dwc3_drd_init(struct dwc3 *dwc) +{ + int ret, id, vbus; + struct usb_otg_caps *otgcaps = &dwc->otg_config.otg_caps; + + otgcaps->otg_rev = 0; + otgcaps->hnp_support = false; + otgcaps->srp_support = false; + otgcaps->adp_support = false; + dwc->otg_config.fsm_ops = &dwc3_drd_ops; + + if (!dwc->edev) { + dev_err(dwc->dev, "No extcon device found for OTG mode\n"); + return -ENODEV; + } + + dwc->otg_nb.notifier_call = dwc3_drd_notifier; + ret = extcon_register_notifier(dwc->edev, EXTCON_USB, &dwc->otg_nb); + if (ret < 0) { + dev_err(dwc->dev, "Couldn't register USB cable notifier\n"); + return -ENODEV; + } + + ret = extcon_register_notifier(dwc->edev, EXTCON_USB_HOST, + &dwc->otg_nb); + if (ret < 0) { + dev_err(dwc->dev, "Couldn't register USB-HOST cable notifier\n"); + ret = -ENODEV; + goto extcon_fail; + } + + /* sanity check id & vbus states */ + id = extcon_get_cable_state(dwc->edev, "USB-HOST"); + vbus = extcon_get_cable_state(dwc->edev, "USB"); + if (id < 0 || vbus < 0) { + dev_err(dwc->dev, "Invalid USB cable state. id %d, vbus %d\n", + id, vbus); + ret = -ENODEV; + goto fail; + } + + /* register as DRD device with OTG core */ + dwc->fsm = usb_otg_register(dwc->dev, &dwc->otg_config); + if (IS_ERR(dwc->fsm)) { + ret = PTR_ERR(dwc->fsm); + if (ret == -ENOTSUPP) + dev_err(dwc->dev, "CONFIG_USB_OTG needed for dual-role\n"); + else + dev_err(dwc->dev, "Failed to register with OTG core\n"); + + goto fail; + } + + dwc3_drd_fsm_sync(dwc); + + return 0; +fail: + extcon_unregister_notifier(dwc->edev, EXTCON_USB_HOST, &dwc->otg_nb); +extcon_fail: + extcon_unregister_notifier(dwc->edev, EXTCON_USB, &dwc->otg_nb); + + return ret; +} + +static void dwc3_drd_exit(struct dwc3 *dwc) +{ + usb_otg_unregister(dwc->dev); + extcon_unregister_notifier(dwc->edev, EXTCON_USB_HOST, &dwc->otg_nb); + extcon_unregister_notifier(dwc->edev, EXTCON_USB, &dwc->otg_nb); +} + +/* -------------------------------------------------------------------------- */ + static int dwc3_core_init_mode(struct dwc3 *dwc) { struct device *dev = dwc->dev; @@ -727,13 +873,21 @@ static int dwc3_core_init_mode(struct dwc3 *dwc) } break; case USB_DR_MODE_OTG: - dwc3_set_mode(dwc, DWC3_GCTL_PRTCAP_OTG); + ret = dwc3_drd_init(dwc); + if (ret) { + dev_err(dev, "limiting to peripheral only\n"); + dwc->dr_mode = USB_DR_MODE_PERIPHERAL; + dwc3_set_mode(dwc, DWC3_GCTL_PRTCAP_DEVICE); + goto gadget_init; + } + ret = dwc3_host_init(dwc); if (ret) { dev_err(dev, "failed to initialize host\n"); return ret; } +gadget_init: ret = dwc3_gadget_init(dwc); if (ret) { dev_err(dev, "failed to initialize gadget\n"); @@ -760,6 +914,7 @@ static void dwc3_core_exit_mode(struct dwc3 *dwc) case USB_DR_MODE_OTG: dwc3_host_exit(dwc); dwc3_gadget_exit(dwc); + dwc3_drd_exit(dwc); break; default: /* do nothing */ @@ -843,6 +998,16 @@ static int dwc3_probe(struct platform_device *pdev) hird_threshold = 12; if (node) { + if (of_property_read_bool(node, "extcon")) + dwc->edev = extcon_get_edev_by_phandle(dev, 0); + else if (of_property_read_bool(dev->parent->of_node, "extcon")) + dwc->edev = extcon_get_edev_by_phandle(dev->parent, 0); + + if (IS_ERR(dwc->edev)) { + dev_vdbg(dev, "couldn't get extcon device\n"); + return -EPROBE_DEFER; + } + dwc->maximum_speed = of_usb_get_maximum_speed(node); dwc->has_lpm_erratum = of_property_read_bool(node, "snps,has-lpm-erratum"); @@ -887,6 +1052,13 @@ static int dwc3_probe(struct platform_device *pdev) of_property_read_string(node, "snps,hsphy_interface", &dwc->hsphy_interface); } else if (pdata) { + if (pdata->extcon) { + dwc->edev = extcon_get_extcon_dev(pdata->extcon); + if (!dwc->edev) { + dev_vdbg(dev, "couldn't get extcon device\n"); + return -EPROBE_DEFER; + } + } dwc->maximum_speed = pdata->maximum_speed; dwc->has_lpm_erratum = pdata->has_lpm_erratum; if (pdata->lpm_nyet_threshold) diff --git a/drivers/usb/dwc3/core.h b/drivers/usb/dwc3/core.h index 0447788..5ca2b25 100644 --- a/drivers/usb/dwc3/core.h +++ b/drivers/usb/dwc3/core.h @@ -31,8 +31,10 @@ #include #include #include +#include #include +#include #define DWC3_MSG_MAX 500 @@ -753,6 +755,11 @@ struct dwc3 { struct ulpi *ulpi; + struct extcon_dev *edev; /* USB cable events ID & VBUS */ + struct notifier_block otg_nb; /* notifier for USB cable events */ + struct otg_fsm *fsm; + struct usb_otg_config otg_config; + void __iomem *regs; size_t regs_size; diff --git a/drivers/usb/dwc3/platform_data.h b/drivers/usb/dwc3/platform_data.h index d3614ec..b3b245c 100644 --- a/drivers/usb/dwc3/platform_data.h +++ b/drivers/usb/dwc3/platform_data.h @@ -47,4 +47,5 @@ struct dwc3_platform_data { unsigned tx_de_emphasis:2; const char *hsphy_interface; + const char *extcon; /* extcon name for USB cable events ID/VBUS */ };