From patchwork Mon Oct 28 21:59:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 177975 Delivered-To: patches@linaro.org Received: by 2002:a92:409a:0:0:0:0:0 with SMTP id d26csp3978397ill; Mon, 28 Oct 2019 14:59:32 -0700 (PDT) X-Received: by 2002:a65:6492:: with SMTP id e18mr23637401pgv.111.1572299972152; Mon, 28 Oct 2019 14:59:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1572299972; cv=none; d=google.com; s=arc-20160816; b=QnXjeP5i/ud3DeH5NNStTYdvINPvI2EKTlwpAxWNO6wjGto6RfSpKnFWBis4NylwcN DG5JXS2xwOjfWXmq1X2mtH+8ayXQk3DDEWKwBhkOupErjdUTOk1gxi797uV+qtkstrpf ioIxzr88qa192MwIjIRJue7N3Q1BL1wKs3kV8bIVKfEOJ5fHPg4xjRcT0eoH6hEIOdQZ 6fqbIbEoiK4D5iK4Tr8cPqhrnrbjdcJYoTjjYbq9izOJPtxw/sRNU232nGAH78qABknI nCZw5qY0jjxEoTPrx6VV6WJi3AL6oxSmIy7vMLbIQvI/7Uxnee9mUNLi+aWE/Ds3S5wo nK8Q== 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; bh=2PoKh0+SG7fHxZLJh2y0Lp0GiZzbHmOzaEb4WWk+/NM=; b=rJRddzmp0GY0op9Ysm48Y8v4Z9iKApju4JVQvUEs01bRZUpneSor2vyYnmsm4JWcAe s+gbWrnDM0orG91wf4aCP7O42aLScDqjQH8U8D+YjGHiX3dVsyiRNY9kyKFj2EbYSI05 7Gjnnr+pgxyz+ofG6HXNpWfYnETlGgBKo/MPSqpS/eiTsiusuFjcikSQ1+oICTHR363U jPoa8RDGNYOfmSkeJor4cg3MDVFCV30L/J4x2kyAsFyHbGKQcSRvP+LJOVQiJBEPEpMX ORqLqUsfZLxKo1B0hHdMF6jDcvpne6ArrJniuiDfQ3/KJv8fUHVRt5b6TaR4aP+CDpz6 J/tA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=jtq8DkDU; 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 x125sor12918959pfx.15.2019.10.28.14.59.32 for (Google Transport Security); Mon, 28 Oct 2019 14:59:32 -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=jtq8DkDU; 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=2PoKh0+SG7fHxZLJh2y0Lp0GiZzbHmOzaEb4WWk+/NM=; b=jtq8DkDU85+tWa5fMiuxfSrNXrOQgEmC8+IDRnrHBezQLj247d9yekLtAIznO6Prie wPUz7MSxEShqqeJSanC/nCU7uStI9N8Lk2om8Wh/BJaRZjP3HAaB3BOi97vojCn5RFy2 KGz5xu43Vt0XSePO993dqP8VwNOOdXzgk+0ycp50RguFNhXcYWqitoF0HNR1fCs4kQqi a3f+DCBzla+HnfQ5FoKqIZdnXYXfT3ZNnMcMSqukeWLdSdO/9HkMXPeUATZ5LIDj6Fgz lGFxZWIKIK+ipsTqIe4ZZI/MHbNgC6Tvq991FpdeTZVkp8uAmWhOJ0WoXrFpvsnYyMVw 3jsw== 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=2PoKh0+SG7fHxZLJh2y0Lp0GiZzbHmOzaEb4WWk+/NM=; b=JSi10wZQG/264Z/GLwd72jJxvbV+MvE4HwSHU+JutxKMLQbvqk0+LSfJFkAwmSz5OF y0hFhCMiYQBozqSCkNC3pZf0wXx4/Att1cj+DSUzmFeSMF4oL0HmVwVL7k64wcHoUQks gyiuUZM8LyTp8gv4DxoMVOFA5L+uKKwT0VfLi/C9/+L8A7QCi2BeSfczirdndfQj05kp KA1OlrfotAZaw2bGZUgsllSt7OpEFnK/p9BUb+dXVYITa+CcrzwNuAdDaFWaPJu7GwE7 zWfybkj4tJ9pkQ5kOllA+aPvF3S6XiKf5KtquOfn2n8CEa6SohTX87UAD5Oe+JLU2ASU EUEg== X-Gm-Message-State: APjAAAUvb52MD+7iFS9mhwoNVuz0FwtoPL2rSfM0Q4r6AGyJZNe9IQmk 91UJ++uakKnFrGG10I3GS7g4FONk X-Google-Smtp-Source: APXvYqyB0veo2JoPN5PQxtdCEJGuF1tkFG2bXoqpXtYA4SKF7I8LnvDDhFJGFXhzdbKdmtPQDJMhkA== X-Received: by 2002:a62:e10c:: with SMTP id q12mr13903809pfh.248.1572299971714; Mon, 28 Oct 2019 14:59:31 -0700 (PDT) Return-Path: Received: from localhost.localdomain (c-67-170-172-113.hsd1.or.comcast.net. [67.170.172.113]) by smtp.gmail.com with ESMTPSA id f12sm10880612pfn.152.2019.10.28.14.59.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Oct 2019 14:59:31 -0700 (PDT) From: John Stultz To: lkml Cc: Yu Chen , Greg Kroah-Hartman , Rob Herring , Mark Rutland , ShuFan Lee , Heikki Krogerus , Suzuki K Poulose , Chunfeng Yun , Felipe Balbi , Hans de Goede , Andy Shevchenko , Jun Li , Valentin Schneider , Jack Pham , linux-usb@vger.kernel.org, devicetree@vger.kernel.org, John Stultz Subject: [PATCH v4 7/9] usb: dwc3: Registering a role switch in the DRD code. Date: Mon, 28 Oct 2019 21:59:17 +0000 Message-Id: <20191028215919.83697-8-john.stultz@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191028215919.83697-1-john.stultz@linaro.org> References: <20191028215919.83697-1-john.stultz@linaro.org> From: Yu Chen The Type-C drivers use USB role switch API to inform the system about the negotiated data role, so registering a role switch in the DRD code in order to support platforms with USB Type-C connectors. Cc: Greg Kroah-Hartman Cc: Rob Herring Cc: Mark Rutland CC: ShuFan Lee Cc: Heikki Krogerus Cc: Suzuki K Poulose Cc: Chunfeng Yun Cc: Yu Chen Cc: Felipe Balbi Cc: Hans de Goede Cc: Andy Shevchenko Cc: Jun Li Cc: Valentin Schneider Cc: Jack Pham Cc: linux-usb@vger.kernel.org Cc: devicetree@vger.kernel.org Suggested-by: Heikki Krogerus Signed-off-by: Yu Chen Signed-off-by: John Stultz --- v2: Fix role_sw and role_switch_default_mode descriptions as reported by kbuild test robot v3: Split out the role-switch-default-host logic into its own patch --- drivers/usb/dwc3/Kconfig | 1 + drivers/usb/dwc3/core.h | 3 ++ drivers/usb/dwc3/drd.c | 66 +++++++++++++++++++++++++++++++++++++++- 3 files changed, 69 insertions(+), 1 deletion(-) -- 2.17.1 diff --git a/drivers/usb/dwc3/Kconfig b/drivers/usb/dwc3/Kconfig index 89abc6078703..1104745c41a9 100644 --- a/drivers/usb/dwc3/Kconfig +++ b/drivers/usb/dwc3/Kconfig @@ -44,6 +44,7 @@ config USB_DWC3_DUAL_ROLE bool "Dual Role mode" depends on ((USB=y || USB=USB_DWC3) && (USB_GADGET=y || USB_GADGET=USB_DWC3)) depends on (EXTCON=y || EXTCON=USB_DWC3) + select USB_ROLE_SWITCH help This is the default mode of working of DWC3 controller where both host and gadget features are enabled. diff --git a/drivers/usb/dwc3/core.h b/drivers/usb/dwc3/core.h index 1c8b349379af..6f19e9891767 100644 --- a/drivers/usb/dwc3/core.h +++ b/drivers/usb/dwc3/core.h @@ -25,6 +25,7 @@ #include #include #include +#include #include #include @@ -951,6 +952,7 @@ struct dwc3_scratchpad_array { * @hsphy_mode: UTMI phy mode, one of following: * - USBPHY_INTERFACE_MODE_UTMI * - USBPHY_INTERFACE_MODE_UTMIW + * @role_sw: usb_role_switch handle * @usb2_phy: pointer to USB2 PHY * @usb3_phy: pointer to USB3 PHY * @usb2_generic_phy: pointer to USB2 PHY @@ -1084,6 +1086,7 @@ struct dwc3 { struct extcon_dev *edev; struct notifier_block edev_nb; enum usb_phy_interface hsphy_mode; + struct usb_role_switch *role_sw; u32 fladj; u32 irq_gadget; diff --git a/drivers/usb/dwc3/drd.c b/drivers/usb/dwc3/drd.c index c946d64142ad..61d4fd8aead4 100644 --- a/drivers/usb/dwc3/drd.c +++ b/drivers/usb/dwc3/drd.c @@ -476,6 +476,52 @@ static struct extcon_dev *dwc3_get_extcon(struct dwc3 *dwc) return edev; } +static int dwc3_usb_role_switch_set(struct device *dev, enum usb_role role) +{ + struct dwc3 *dwc = dev_get_drvdata(dev); + u32 mode; + + switch (role) { + case USB_ROLE_HOST: + mode = DWC3_GCTL_PRTCAP_HOST; + break; + case USB_ROLE_DEVICE: + mode = DWC3_GCTL_PRTCAP_DEVICE; + break; + default: + mode = DWC3_GCTL_PRTCAP_DEVICE; + break; + } + + dwc3_set_mode(dwc, mode); + return 0; +} + +static enum usb_role dwc3_usb_role_switch_get(struct device *dev) +{ + struct dwc3 *dwc = dev_get_drvdata(dev); + unsigned long flags; + enum usb_role role; + + spin_lock_irqsave(&dwc->lock, flags); + switch (dwc->current_dr_role) { + case DWC3_GCTL_PRTCAP_HOST: + role = USB_ROLE_HOST; + break; + case DWC3_GCTL_PRTCAP_DEVICE: + role = USB_ROLE_DEVICE; + break; + case DWC3_GCTL_PRTCAP_OTG: + role = dwc->current_otg_role; + break; + default: + role = USB_ROLE_DEVICE; + break; + } + spin_unlock_irqrestore(&dwc->lock, flags); + return role; +} + int dwc3_drd_init(struct dwc3 *dwc) { int ret, irq; @@ -484,7 +530,22 @@ int dwc3_drd_init(struct dwc3 *dwc) if (IS_ERR(dwc->edev)) return PTR_ERR(dwc->edev); - if (dwc->edev) { + if (device_property_read_bool(dwc->dev, "usb-role-switch")) { + struct usb_role_switch_desc dwc3_role_switch = {NULL}; + u32 mode; + + mode = DWC3_GCTL_PRTCAP_DEVICE; + + dwc3_role_switch.fwnode = dev_fwnode(dwc->dev); + dwc3_role_switch.set = dwc3_usb_role_switch_set; + dwc3_role_switch.get = dwc3_usb_role_switch_get; + dwc->role_sw = usb_role_switch_register(dwc->dev, + &dwc3_role_switch); + if (IS_ERR(dwc->role_sw)) + return PTR_ERR(dwc->role_sw); + + dwc3_set_mode(dwc, mode); + } else if (dwc->edev) { dwc->edev_nb.notifier_call = dwc3_drd_notifier; ret = extcon_register_notifier(dwc->edev, EXTCON_USB_HOST, &dwc->edev_nb); @@ -531,6 +592,9 @@ void dwc3_drd_exit(struct dwc3 *dwc) { unsigned long flags; + if (dwc->role_sw) + usb_role_switch_unregister(dwc->role_sw); + if (dwc->edev) extcon_unregister_notifier(dwc->edev, EXTCON_USB_HOST, &dwc->edev_nb);