From patchwork Tue Feb 25 17:52:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 183869 Delivered-To: patches@linaro.org Received: by 2002:a92:1f12:0:0:0:0:0 with SMTP id i18csp2041136ile; Tue, 25 Feb 2020 09:53:34 -0800 (PST) X-Received: by 2002:a17:90a:102:: with SMTP id b2mr176817pjb.64.1582653213900; Tue, 25 Feb 2020 09:53:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1582653213; cv=none; d=google.com; s=arc-20160816; b=B94d2rm3Ma1cCgQCoGNATgcTBVz3JzFfopjciGa8ElCe/Zgabw2IGqlCmXvMsfPZKn OuJdjofMdSAIKljEnYseBLs1zr0kbXRumYMadqo0H8hjwiJgjR7/yglEbOXpZECVmt3V Zqi99r0xsj3djkSSFCUzAkx9Y+hPnMgbPYFAK/djOfA2aEbZlTIsHIlXLBS5pwjyszzx 7+72rh9MIuYk77wauoac2MUejWfBH6FyobmeWiXCfYlZzySkvdIdSElXEfenWM/Xf0zn z3v1t2GC+FahjPKJ/s6wivSu5HWdunNg4CTwrDx5W3Fw2XrG800eB5fZCn4+V5eGbV/K wa3w== 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=WAV7i9DpkYyptymNiUj/uooXSddOTDPzEmF8/rLdzNA=; b=iGdYvYG6qx3j62hVXR367DuiRXOlbsekn2EcvzaZ0JWjttPHuw527f1W5I9wsNsoss tiZrF0vSNkXl8wQ7+jAAQWnxnvErBW7rrLVoHWV1ztXRUUq6k30d0XrIEX5OqLTaNqcr Ps1az6sdDrbEg2uFlcqa67CKcHtgvI+wya8Coh+66AbxSyrNaSqrCnJMh6zSIZ96Owv9 aTk3f/togmum2lWHXh4nwazLEKlOlgI0+7Vkw+avaq3wW3W14k4NVFfnErzn8SSH1zc+ E+ZvoorNSSpVPlDHyf1WBvEImk667b86NXuNzgjoLQ9JKBK7XoI2TbScDzYVdssi3zdJ 2zow== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=d+TgHQXB; 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 w3sor259432plq.36.2020.02.25.09.53.33 for (Google Transport Security); Tue, 25 Feb 2020 09:53:33 -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=d+TgHQXB; 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=WAV7i9DpkYyptymNiUj/uooXSddOTDPzEmF8/rLdzNA=; b=d+TgHQXBZ2fj6XhsaxC9E2hoQsUCLxnFHPnwEo6sgOuLEXduum3xsPaooFFHauzSVB muhHv3f59kZsioiKtKmx5BRfHkHXJyTdZRHpVxZ0FqMHIz5qfIjPSCghyork9+f68w7/ 5WBA0U7TdBf5Uw1ljyMHMHCHGBdWJ32oZY10Fn3dR4CIEWP/aAPkDNvyWwU8/zCUGEuS 8pBdp/I3O1ffy7TvB71P13R4S4SC6BT6hkFRm/+jr/XAUPKqMFLgkie0omQjiaWtohy4 JVHQnr7i2nEMB/5Mj/HVPN2ZkluthJFBCR5sQYygn8fQofWWo3wWY3mGwioSMWLInJCO xMGA== 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=WAV7i9DpkYyptymNiUj/uooXSddOTDPzEmF8/rLdzNA=; b=tTvO+NHpbin1bGjJHWxnZkgK4inTWIdMsy8CHd1/cubLnhTUA7cN5Da8gFwFIrWKjK +qp8xsE6MbtUsxPAxj6zJxGuzfzSKaHH8JofC38OeGbpD4w+VSMv9z3An2EqTIbVf2w6 HRd4gnxPJ6AfN4rV6Z8WCC3eCBgac9p2AyOJoMmPQDD84j3LknLA0QC5LH3/EKTTSzBQ /GrQmzyABA7kXD3MR0YCNPTKy4SRpOy3cwkDHPoQdG5y0E21qqrNWyutydfIOBX/Cy66 CuemGKm2uBDwxIWuHWkqa7Wl5QI1p3wVCchBoqKKT8P7glDm3AGci6/6jW3yDUa67HLI RaPg== X-Gm-Message-State: APjAAAVy9BaqiWTAd29syjpPecmeGXic8UCMIcij+THkh4K/nLVZS05a y9VspS5QSm0HADjHbRgovimXkeeH X-Google-Smtp-Source: APXvYqyqzh2Wh9kpkkh4/o+bVTS4si3nFIOu+ZMfqBQGNOyilHJUHwQZkihm64jlso6bjaZZmtzQiQ== X-Received: by 2002:a17:902:8549:: with SMTP id d9mr54945952plo.153.1582653213518; Tue, 25 Feb 2020 09:53:33 -0800 (PST) Return-Path: Received: from localhost.localdomain ([2601:1c2:680:1319:692:26ff:feda:3a81]) by smtp.gmail.com with ESMTPSA id v8sm18013291pgt.52.2020.02.25.09.53.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Feb 2020 09:53:33 -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 , Guillaume Gardet , Jack Pham , Bryan O'Donoghue , linux-usb@vger.kernel.org, devicetree@vger.kernel.org, John Stultz Subject: [PATCH v8 1/6] usb: dwc3: Registering a role switch in the DRD code. Date: Tue, 25 Feb 2020 17:52:59 +0000 Message-Id: <20200225175304.36406-2-john.stultz@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200225175304.36406-1-john.stultz@linaro.org> References: <20200225175304.36406-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: Guillaume Gardet Cc: Jack Pham Cc: Bryan O'Donoghue Cc: linux-usb@vger.kernel.org Cc: devicetree@vger.kernel.org Suggested-by: Heikki Krogerus Tested-by: Bryan O'Donoghue 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 v6: Fix build issue Reported-by: kbuild test robot v7: Minor fix for CONFIG_USB_ROLE_SWITCH=m case not building the role switch handling code, reported by Guillaume Gardet --- 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 77c4a9abe365..a99e57636172 100644 --- a/drivers/usb/dwc3/core.h +++ b/drivers/usb/dwc3/core.h @@ -25,6 +25,7 @@ #include #include #include +#include #include #include @@ -953,6 +954,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 @@ -1086,6 +1088,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..331c6e997f0c 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; } +#if IS_ENABLED(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) 0 +#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);