From patchwork Fri Nov 8 01:17:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 178840 Delivered-To: patches@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp1924229ilf; Thu, 7 Nov 2019 17:17:29 -0800 (PST) X-Received: by 2002:a63:eb08:: with SMTP id t8mr8637958pgh.49.1573175848825; Thu, 07 Nov 2019 17:17:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1573175848; cv=none; d=google.com; s=arc-20160816; b=cdG6WGx1xZbY8FrerqO1sHzlnKLEA6L9J+8sUcAsOVlPxfR1CgrO3nbpu2OC7bv35K +t79b2FUSkGGmccFPxs7H37tUHylQy+wYBZjHmUM9Pc7jSKLHM+ydG9SJhHXjdkaR3TK bTJDsraKCzZPHWN8hN/nIJFFpHB1EZb/F1zdyf18QkTFucSGCiuJokdwkLLN7lJbEwcE hD/9anu6nN5qPHA+m5/3vgw/C16KT/nn31wI58XgprTxQd3UOnA0g7Ff7UaNvDHLMVOB uLIl9HhvIKf3CX8iAo1FGImTWDKPJUloEu/u0RIzb7kfuxPuwcnYssjDIke5D/uFX8Gk 5+NA== 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=OkKRy5y8eyF3IUkqSp9qwVY1typargMwIHR68X5ogBg=; b=Gkmd4dF+0lnSL+I9Y8Ar70MP4Hry4HPKAz08uEhalY7cLbt4p2mW2Y6fZ24RFCg3Pb JbWbRoXKPKEEZ/3gTh3Z+uiS55Y84LH1aYSP9vVC95eWuI8FJy+xwXwIe+Lem8F1Cx0n LCvjTyz8XYXAPcMWdf/FHJmaghd3fN9MMlpHitylrmRyK6vZw3IzT0Wi4qCtktLrpzj7 hIrLLcidyqzgV/cTYLNtGSTqdFS/h7upj9+8SonEc8BchPVCy8L2MCOYUCUiy4oMBeig EqqjdcWO2NwsUTkBSQ5V34RmBRwgYRkw5kby0Bq729p0mJzqO54H2eXzJILOVk9RA7zX 4qfg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=bKADj403; 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 x19sor5366678pfc.24.2019.11.07.17.17.28 for (Google Transport Security); Thu, 07 Nov 2019 17:17:28 -0800 (PST) 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=bKADj403; 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=OkKRy5y8eyF3IUkqSp9qwVY1typargMwIHR68X5ogBg=; b=bKADj403sq2wgRxhLTB0jzzEUBQtuwtF4yInOpHLvRlI3FA+MUSvA8qERETwg3iPGV hbus0BGgRczNiiZjHp+pf12C1sV37/RAmAODn4l4dVL4ndXNlaOWRZn558921G82oZ2B 7vU6osMkXDbl3l6Ip3HvQUauWegpW3gdcgLeiAzUILpm6aH9msqtIMBSA/5WcyBa5PAC OBFPXwJturmtlRhDgXilUz09yZVNcBDfG9hq8i3ORtX4f9aUBKMKesAStlY/GMBICzIe bjNYiyUI/qX83c9O+zu63GCz3ktjHkZ/V8Im/t3UkNbxGkJBpd6af+JY2IYRizXISDGq /RGg== 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=OkKRy5y8eyF3IUkqSp9qwVY1typargMwIHR68X5ogBg=; b=ctF39dv6bjW1J+b3VFjw1PeBzhqCEanZrs3liydSJjlHZudASN+2IGziIthZj5tliM +4Y1yL8h1EOBT9HZN8ONGnWnUdQrHwFxQAedOUPKBPakz++kutu9jo13JM4DaWKP+KQv 8dHIph3KNHek/sVkFlJfwusfV6Ey0iPrBBJyNIdV/9UPRh9WrdqxOL5akgi6dGsdNSkf raDVJSCminJWEsGKR96f50Dm5rbIH6PKD4ZXCfxjv9qJnmTM/+DQ4gnmxwZ6mUgCv+PQ pyubZ3FvH0NUJjuWut/liPQDc4knnrtI1y1wM0rGnuUOhBp55e2LDOLgyMyxMBR+s82G 2cBw== X-Gm-Message-State: APjAAAVXZxfAEBrvymg6oSIw4qvG2QYvc9Cc4cyC4DENF/3U8hd8L/ij F4bLl3bxNFGrOLsjfCgINZ0fOYmN X-Google-Smtp-Source: APXvYqz0GcFhjlba4rgNNP0k3FvzkjxCStNTLxMvkwPwrcGQff21L6hAhhwiV+9ykGe69+IWAbqNPg== X-Received: by 2002:a63:cf45:: with SMTP id b5mr8364414pgj.36.1573175848197; Thu, 07 Nov 2019 17:17:28 -0800 (PST) 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 s23sm3801627pgh.21.2019.11.07.17.17.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Nov 2019 17:17:27 -0800 (PST) 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 v5 1/3] usb: dwc3: Registering a role switch in the DRD code. Date: Fri, 8 Nov 2019 01:17:21 +0000 Message-Id: <20191108011723.32390-2-john.stultz@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191108011723.32390-1-john.stultz@linaro.org> References: <20191108011723.32390-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 v5: Drop selecting CONFIG_USB_ROLE_SWITCH & ifdef dependent code --- drivers/usb/dwc3/core.h | 3 ++ drivers/usb/dwc3/drd.c | 77 ++++++++++++++++++++++++++++++++++++++++- 2 files changed, 79 insertions(+), 1 deletion(-) -- 2.17.1 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..cd43dc2a96c6 100644 --- a/drivers/usb/dwc3/drd.c +++ b/drivers/usb/dwc3/drd.c @@ -476,6 +476,73 @@ static struct extcon_dev *dwc3_get_extcon(struct dwc3 *dwc) return edev; } +#ifdef CONFIG_USB_ROLE_SWITCH +#define ROLE_SWITCH 1 +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; +} + +static int dwc3_setup_role_switch(struct dwc3 *dwc) +{ + struct usb_role_switch_desc dwc3_role_switch = {NULL}; + + 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, DWC3_GCTL_PRTCAP_DEVICE); + return 0; +} +#else +#define ROLE_SWITCH 0 +#define dwc3_setup_role_switch(x) +#endif + int dwc3_drd_init(struct dwc3 *dwc) { int ret, irq; @@ -484,7 +551,12 @@ int dwc3_drd_init(struct dwc3 *dwc) if (IS_ERR(dwc->edev)) return PTR_ERR(dwc->edev); - if (dwc->edev) { + if (ROLE_SWITCH && + device_property_read_bool(dwc->dev, "usb-role-switch")) { + ret = dwc3_setup_role_switch(dwc); + if (ret < 0) + return ret; + } 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 +603,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);