* [PATCH v3 0/3] Add USB role switch support to DWC2
@ 2020-07-24 10:47 ` Amelie Delaunay
0 siblings, 0 replies; 18+ messages in thread
From: Amelie Delaunay @ 2020-07-24 10:47 UTC (permalink / raw)
To: Minas Harutyunyan, Felipe Balbi, Greg Kroah-Hartman, Rob Herring,
Maxime Coquelin, Alexandre Torgue
Cc: linux-usb, devicetree, linux-kernel, linux-arm-kernel,
linux-stm32, Fabrice Gasnier, Amelie Delaunay,
Martin Blumenstingl
When using usb-c connector (but it can also be the case with a micro-b
connector), iddig, avalid, bvalid, vbusvalid input signals may not be
connected to the DWC2 OTG controller.
DWC2 OTG controller features an overriding control of the PHY voltage valid
and ID input signals.
So, missing signals can be forced using usb role from usb role switch and
this override feature.
This series adds support for usb role switch to dwc2, by using overriding
control of the PHY voltage valid and ID input signals.
It has been tested on stm32mp157c-dk2 [1], which has a Type-C connector
managed by a Type-C port controller, and connected to USB OTG controller.
[1] https://www.st.com/en/evaluation-tools/stm32mp157c-dk2.html
Amelie Delaunay (3):
usb: dwc2: override PHY input signals with usb role switch support
dt-bindings: usb: dwc2: add optional usb-role-switch property
usb: dwc2: don't use ID/Vbus detection if usb-role-switch on STM32MP15
SoCs
---
Changes in v3:
- Fix build issue reported by kernel test robot in drd.c
Changes in v2:
- Previous DT patch already in stm32-next branch so removed from v2 patchset
"ARM: dts: stm32: enable usb-role-switch on USB OTG on stm32mp15xx-dkx"
- DWC2 DT bindings update added
- Build issue reported by kernel test robot fixed
- Martin's comments taken into account
---
.../devicetree/bindings/usb/dwc2.yaml | 4 +
drivers/usb/dwc2/Kconfig | 1 +
drivers/usb/dwc2/Makefile | 2 +-
drivers/usb/dwc2/core.h | 9 +
drivers/usb/dwc2/drd.c | 181 ++++++++++++++++++
drivers/usb/dwc2/gadget.c | 2 +-
drivers/usb/dwc2/params.c | 4 +-
drivers/usb/dwc2/platform.c | 15 ++
8 files changed, 215 insertions(+), 3 deletions(-)
create mode 100644 drivers/usb/dwc2/drd.c
--
2.17.1
^ permalink raw reply [flat|nested] 18+ messages in thread* [PATCH v3 0/3] Add USB role switch support to DWC2 @ 2020-07-24 10:47 ` Amelie Delaunay 0 siblings, 0 replies; 18+ messages in thread From: Amelie Delaunay @ 2020-07-24 10:47 UTC (permalink / raw) To: Minas Harutyunyan, Felipe Balbi, Greg Kroah-Hartman, Rob Herring, Maxime Coquelin, Alexandre Torgue Cc: devicetree, Amelie Delaunay, Martin Blumenstingl, linux-usb, linux-kernel, Fabrice Gasnier, linux-stm32, linux-arm-kernel When using usb-c connector (but it can also be the case with a micro-b connector), iddig, avalid, bvalid, vbusvalid input signals may not be connected to the DWC2 OTG controller. DWC2 OTG controller features an overriding control of the PHY voltage valid and ID input signals. So, missing signals can be forced using usb role from usb role switch and this override feature. This series adds support for usb role switch to dwc2, by using overriding control of the PHY voltage valid and ID input signals. It has been tested on stm32mp157c-dk2 [1], which has a Type-C connector managed by a Type-C port controller, and connected to USB OTG controller. [1] https://www.st.com/en/evaluation-tools/stm32mp157c-dk2.html Amelie Delaunay (3): usb: dwc2: override PHY input signals with usb role switch support dt-bindings: usb: dwc2: add optional usb-role-switch property usb: dwc2: don't use ID/Vbus detection if usb-role-switch on STM32MP15 SoCs --- Changes in v3: - Fix build issue reported by kernel test robot in drd.c Changes in v2: - Previous DT patch already in stm32-next branch so removed from v2 patchset "ARM: dts: stm32: enable usb-role-switch on USB OTG on stm32mp15xx-dkx" - DWC2 DT bindings update added - Build issue reported by kernel test robot fixed - Martin's comments taken into account --- .../devicetree/bindings/usb/dwc2.yaml | 4 + drivers/usb/dwc2/Kconfig | 1 + drivers/usb/dwc2/Makefile | 2 +- drivers/usb/dwc2/core.h | 9 + drivers/usb/dwc2/drd.c | 181 ++++++++++++++++++ drivers/usb/dwc2/gadget.c | 2 +- drivers/usb/dwc2/params.c | 4 +- drivers/usb/dwc2/platform.c | 15 ++ 8 files changed, 215 insertions(+), 3 deletions(-) create mode 100644 drivers/usb/dwc2/drd.c -- 2.17.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH v3 1/3] usb: dwc2: override PHY input signals with usb role switch support 2020-07-24 10:47 ` Amelie Delaunay @ 2020-07-24 10:47 ` Amelie Delaunay -1 siblings, 0 replies; 18+ messages in thread From: Amelie Delaunay @ 2020-07-24 10:47 UTC (permalink / raw) To: Minas Harutyunyan, Felipe Balbi, Greg Kroah-Hartman, Rob Herring, Maxime Coquelin, Alexandre Torgue Cc: linux-usb, devicetree, linux-kernel, linux-arm-kernel, linux-stm32, Fabrice Gasnier, Amelie Delaunay, Martin Blumenstingl This patch adds support for usb role switch to dwc2, by using overriding control of the PHY voltage valid and ID input signals. iddig signal (ID) can be overridden: - when setting GUSBCFG_FORCEHOSTMODE, iddig input pin is overridden with 1; - when setting GUSBCFG_FORCEDEVMODE, iddig input pin is overridden with 0. avalid/bvalid/vbusvalid signals can be overridden respectively with: - GOTGCTL_AVALOEN + GOTGCTL_AVALOVAL - GOTGCTL_BVALOEN + GOTGCTL_BVALOVAL - GOTGCTL_VBVALEN + GOTGCTL_VBVALOVAL It is possible to determine valid sessions thanks to usb role switch: - if USB_ROLE_NONE then !avalid && !bvalid && !vbusvalid - if USB_ROLE_DEVICE then !avalid && bvalid && vbusvalid - if USB_ROLE_HOST then avalid && !bvalid && vbusvalid Cc: Martin Blumenstingl <martin.blumenstingl@googlemail.com> Signed-off-by: Amelie Delaunay <amelie.delaunay@st.com> --- Changes in v3: - Fix build issue reported by kernel test robot in drd.c Changes in v2: - Fix build issue reported by kernel test robot - Move call to dwc2_force_mode outside spinlock context - Add dwc2_drd_exit call in probe error path --- drivers/usb/dwc2/Kconfig | 1 + drivers/usb/dwc2/Makefile | 2 +- drivers/usb/dwc2/core.h | 9 ++ drivers/usb/dwc2/drd.c | 181 ++++++++++++++++++++++++++++++++++++ drivers/usb/dwc2/gadget.c | 2 +- drivers/usb/dwc2/platform.c | 15 +++ 6 files changed, 208 insertions(+), 2 deletions(-) create mode 100644 drivers/usb/dwc2/drd.c diff --git a/drivers/usb/dwc2/Kconfig b/drivers/usb/dwc2/Kconfig index 16e1aa304edc..dceb8f32414e 100644 --- a/drivers/usb/dwc2/Kconfig +++ b/drivers/usb/dwc2/Kconfig @@ -47,6 +47,7 @@ config USB_DWC2_PERIPHERAL config USB_DWC2_DUAL_ROLE bool "Dual Role mode" depends on (USB=y && USB_GADGET=y) || (USB_DWC2=m && USB && USB_GADGET) + select USB_ROLE_SWITCH help Select this option if you want the driver to work in a dual-role mode. In this mode both host and gadget features are enabled, and diff --git a/drivers/usb/dwc2/Makefile b/drivers/usb/dwc2/Makefile index 440320cc20a4..2bcd6945df46 100644 --- a/drivers/usb/dwc2/Makefile +++ b/drivers/usb/dwc2/Makefile @@ -3,7 +3,7 @@ ccflags-$(CONFIG_USB_DWC2_DEBUG) += -DDEBUG ccflags-$(CONFIG_USB_DWC2_VERBOSE) += -DVERBOSE_DEBUG obj-$(CONFIG_USB_DWC2) += dwc2.o -dwc2-y := core.o core_intr.o platform.o +dwc2-y := core.o core_intr.o platform.o drd.o dwc2-y += params.o ifneq ($(filter y,$(CONFIG_USB_DWC2_HOST) $(CONFIG_USB_DWC2_DUAL_ROLE)),) diff --git a/drivers/usb/dwc2/core.h b/drivers/usb/dwc2/core.h index 132d687f1590..471564e120c8 100644 --- a/drivers/usb/dwc2/core.h +++ b/drivers/usb/dwc2/core.h @@ -860,6 +860,7 @@ struct dwc2_hregs_backup { * - USB_DR_MODE_PERIPHERAL * - USB_DR_MODE_HOST * - USB_DR_MODE_OTG + * @role_sw: usb_role_switch handle * @hcd_enabled: Host mode sub-driver initialization indicator. * @gadget_enabled: Peripheral mode sub-driver initialization indicator. * @ll_hw_enabled: Status of low-level hardware resources. @@ -1054,6 +1055,7 @@ struct dwc2_hsotg { struct dwc2_core_params params; enum usb_otg_state op_state; enum usb_dr_mode dr_mode; + struct usb_role_switch *role_sw; unsigned int hcd_enabled:1; unsigned int gadget_enabled:1; unsigned int ll_hw_enabled:1; @@ -1376,6 +1378,11 @@ static inline int dwc2_is_device_mode(struct dwc2_hsotg *hsotg) return (dwc2_readl(hsotg, GINTSTS) & GINTSTS_CURMODE_HOST) == 0; } +int dwc2_drd_init(struct dwc2_hsotg *hsotg); +void dwc2_drd_suspend(struct dwc2_hsotg *hsotg); +void dwc2_drd_resume(struct dwc2_hsotg *hsotg); +void dwc2_drd_exit(struct dwc2_hsotg *hsotg); + /* * Dump core registers and SPRAM */ @@ -1392,6 +1399,7 @@ int dwc2_hsotg_resume(struct dwc2_hsotg *dwc2); int dwc2_gadget_init(struct dwc2_hsotg *hsotg); void dwc2_hsotg_core_init_disconnected(struct dwc2_hsotg *dwc2, bool reset); +void dwc2_hsotg_core_disconnect(struct dwc2_hsotg *hsotg); void dwc2_hsotg_core_connect(struct dwc2_hsotg *hsotg); void dwc2_hsotg_disconnect(struct dwc2_hsotg *dwc2); int dwc2_hsotg_set_test_mode(struct dwc2_hsotg *hsotg, int testmode); @@ -1417,6 +1425,7 @@ static inline int dwc2_gadget_init(struct dwc2_hsotg *hsotg) { return 0; } static inline void dwc2_hsotg_core_init_disconnected(struct dwc2_hsotg *dwc2, bool reset) {} +static inline void dwc2_hsotg_core_disconnect(struct dwc2_hsotg *hsotg) {} static inline void dwc2_hsotg_core_connect(struct dwc2_hsotg *hsotg) {} static inline void dwc2_hsotg_disconnect(struct dwc2_hsotg *dwc2) {} static inline int dwc2_hsotg_set_test_mode(struct dwc2_hsotg *hsotg, diff --git a/drivers/usb/dwc2/drd.c b/drivers/usb/dwc2/drd.c new file mode 100644 index 000000000000..c00073e2c48b --- /dev/null +++ b/drivers/usb/dwc2/drd.c @@ -0,0 +1,181 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * drd.c - DesignWare USB2 DRD Controller Dual-role support + * + * Copyright (C) 2020 STMicroelectronics + * + * Author(s): Amelie Delaunay <amelie.delaunay@st.com> + */ + +#include <linux/iopoll.h> +#include <linux/platform_device.h> +#include <linux/usb/role.h> +#include "core.h" + +static void dwc2_ovr_init(struct dwc2_hsotg *hsotg) +{ + unsigned long flags; + u32 gotgctl; + + spin_lock_irqsave(&hsotg->lock, flags); + + gotgctl = dwc2_readl(hsotg, GOTGCTL); + gotgctl |= GOTGCTL_BVALOEN | GOTGCTL_AVALOEN | GOTGCTL_VBVALOEN; + gotgctl |= GOTGCTL_DBNCE_FLTR_BYPASS; + gotgctl &= ~(GOTGCTL_BVALOVAL | GOTGCTL_AVALOVAL | GOTGCTL_VBVALOVAL); + dwc2_writel(hsotg, gotgctl, GOTGCTL); + + dwc2_force_mode(hsotg, false); + + spin_unlock_irqrestore(&hsotg->lock, flags); +} + +static int dwc2_ovr_avalid(struct dwc2_hsotg *hsotg, bool valid) +{ + u32 gotgctl = dwc2_readl(hsotg, GOTGCTL); + + /* Check if A-Session is already in the right state */ + if ((valid && (gotgctl & GOTGCTL_ASESVLD)) || + (!valid && !(gotgctl & GOTGCTL_ASESVLD))) + return -EALREADY; + + if (valid) + gotgctl |= GOTGCTL_AVALOVAL | GOTGCTL_VBVALOVAL; + else + gotgctl &= ~(GOTGCTL_AVALOVAL | GOTGCTL_VBVALOVAL); + dwc2_writel(hsotg, gotgctl, GOTGCTL); + + return 0; +} + +static int dwc2_ovr_bvalid(struct dwc2_hsotg *hsotg, bool valid) +{ + u32 gotgctl = dwc2_readl(hsotg, GOTGCTL); + + /* Check if B-Session is already in the right state */ + if ((valid && (gotgctl & GOTGCTL_BSESVLD)) || + (!valid && !(gotgctl & GOTGCTL_BSESVLD))) + return -EALREADY; + + if (valid) + gotgctl |= GOTGCTL_BVALOVAL | GOTGCTL_VBVALOVAL; + else + gotgctl &= ~(GOTGCTL_BVALOVAL | GOTGCTL_VBVALOVAL); + dwc2_writel(hsotg, gotgctl, GOTGCTL); + + return 0; +} + +static int dwc2_drd_role_sw_set(struct usb_role_switch *sw, enum usb_role role) +{ + struct dwc2_hsotg *hsotg = usb_role_switch_get_drvdata(sw); + unsigned long flags; + int already = 0; + + /* Skip session not in line with dr_mode */ + if ((role == USB_ROLE_DEVICE && hsotg->dr_mode == USB_DR_MODE_HOST) || + (role == USB_ROLE_HOST && hsotg->dr_mode == USB_DR_MODE_PERIPHERAL)) + return -EINVAL; + +#if IS_ENABLED(CONFIG_USB_DWC2_PERIPHERAL) || \ + IS_ENABLED(CONFIG_USB_DWC2_DUAL_ROLE) + /* Skip session if core is in test mode */ + if (role == USB_ROLE_NONE && hsotg->test_mode) { + dev_dbg(hsotg->dev, "Core is in test mode\n"); + return -EBUSY; + } +#endif + + spin_lock_irqsave(&hsotg->lock, flags); + + if (role == USB_ROLE_HOST) { + already = dwc2_ovr_avalid(hsotg, true); + } else if (role == USB_ROLE_DEVICE) { + already = dwc2_ovr_bvalid(hsotg, true); + /* This clear DCTL.SFTDISCON bit */ + dwc2_hsotg_core_connect(hsotg); + } else { + if (dwc2_is_device_mode(hsotg)) { + if (!dwc2_ovr_bvalid(hsotg, false)) + /* This set DCTL.SFTDISCON bit */ + dwc2_hsotg_core_disconnect(hsotg); + } else { + dwc2_ovr_avalid(hsotg, false); + } + } + + spin_unlock_irqrestore(&hsotg->lock, flags); + + if (!already && + role != USB_ROLE_NONE && hsotg->dr_mode == USB_DR_MODE_OTG) + /* This will raise a Connector ID Status Change Interrupt */ + dwc2_force_mode(hsotg, role == USB_ROLE_HOST); + + dev_dbg(hsotg->dev, "%s-session valid\n", + role == USB_ROLE_NONE ? "No" : + role == USB_ROLE_HOST ? "A" : "B"); + + return 0; +} + +int dwc2_drd_init(struct dwc2_hsotg *hsotg) +{ + struct usb_role_switch_desc role_sw_desc = {0}; + struct usb_role_switch *role_sw; + int ret; + + if (!device_property_read_bool(hsotg->dev, "usb-role-switch")) + return 0; + + role_sw_desc.driver_data = hsotg; + role_sw_desc.fwnode = dev_fwnode(hsotg->dev); + role_sw_desc.set = dwc2_drd_role_sw_set; + role_sw_desc.allow_userspace_control = true; + + role_sw = usb_role_switch_register(hsotg->dev, &role_sw_desc); + if (IS_ERR(role_sw)) { + ret = PTR_ERR(role_sw); + dev_err(hsotg->dev, + "failed to register role switch: %d\n", ret); + return ret; + } + + hsotg->role_sw = role_sw; + + /* Enable override and initialize values */ + dwc2_ovr_init(hsotg); + + return 0; +} + +void dwc2_drd_suspend(struct dwc2_hsotg *hsotg) +{ + u32 gintsts, gintmsk; + + if (hsotg->role_sw && !hsotg->params.external_id_pin_ctl) { + gintmsk = dwc2_readl(hsotg, GINTMSK); + gintmsk &= ~GINTSTS_CONIDSTSCHNG; + dwc2_writel(hsotg, gintmsk, GINTMSK); + gintsts = dwc2_readl(hsotg, GINTSTS); + dwc2_writel(hsotg, gintsts | GINTSTS_CONIDSTSCHNG, GINTSTS); + } +} + +void dwc2_drd_resume(struct dwc2_hsotg *hsotg) +{ + u32 gintsts, gintmsk; + + if (hsotg->role_sw && !hsotg->params.external_id_pin_ctl) { + gintsts = dwc2_readl(hsotg, GINTSTS); + dwc2_writel(hsotg, gintsts | GINTSTS_CONIDSTSCHNG, GINTSTS); + gintmsk = dwc2_readl(hsotg, GINTMSK); + gintmsk |= GINTSTS_CONIDSTSCHNG; + dwc2_writel(hsotg, gintmsk, GINTMSK); + } +} + +void dwc2_drd_exit(struct dwc2_hsotg *hsotg) +{ + if (hsotg->role_sw) + usb_role_switch_unregister(hsotg->role_sw); +} diff --git a/drivers/usb/dwc2/gadget.c b/drivers/usb/dwc2/gadget.c index 7faf5f8c056d..f069530110d9 100644 --- a/drivers/usb/dwc2/gadget.c +++ b/drivers/usb/dwc2/gadget.c @@ -3532,7 +3532,7 @@ void dwc2_hsotg_core_init_disconnected(struct dwc2_hsotg *hsotg, dwc2_readl(hsotg, DOEPCTL0)); } -static void dwc2_hsotg_core_disconnect(struct dwc2_hsotg *hsotg) +void dwc2_hsotg_core_disconnect(struct dwc2_hsotg *hsotg) { /* set the soft-disconnect bit */ dwc2_set_bit(hsotg, DCTL, DCTL_SFTDISCON); diff --git a/drivers/usb/dwc2/platform.c b/drivers/usb/dwc2/platform.c index c347d93eae64..1a5c196b8c8e 100644 --- a/drivers/usb/dwc2/platform.c +++ b/drivers/usb/dwc2/platform.c @@ -317,6 +317,8 @@ static int dwc2_driver_remove(struct platform_device *dev) if (hsotg->params.activate_stm_id_vb_detection) regulator_disable(hsotg->usb33d); + dwc2_drd_exit(hsotg); + if (hsotg->ll_hw_enabled) dwc2_lowlevel_hw_disable(hsotg); @@ -532,6 +534,13 @@ static int dwc2_driver_probe(struct platform_device *dev) dwc2_writel(hsotg, ggpio, GGPIO); } + retval = dwc2_drd_init(hsotg); + if (retval) { + if (retval != -EPROBE_DEFER) + dev_err(hsotg->dev, "failed to initialize dual-role\n"); + goto error_init; + } + if (hsotg->dr_mode != USB_DR_MODE_HOST) { retval = dwc2_gadget_init(hsotg); if (retval) @@ -589,6 +598,8 @@ static int dwc2_driver_probe(struct platform_device *dev) return 0; error_init: + dwc2_drd_exit(hsotg); + if (hsotg->params.activate_stm_id_vb_detection) regulator_disable(hsotg->usb33d); error: @@ -605,6 +616,8 @@ static int __maybe_unused dwc2_suspend(struct device *dev) if (is_device_mode) dwc2_hsotg_suspend(dwc2); + dwc2_drd_suspend(dwc2); + if (dwc2->params.activate_stm_id_vb_detection) { unsigned long flags; u32 ggpio, gotgctl; @@ -685,6 +698,8 @@ static int __maybe_unused dwc2_resume(struct device *dev) /* Need to restore FORCEDEVMODE/FORCEHOSTMODE */ dwc2_force_dr_mode(dwc2); + dwc2_drd_resume(dwc2); + if (dwc2_is_device_mode(dwc2)) ret = dwc2_hsotg_resume(dwc2); -- 2.17.1 ^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH v3 1/3] usb: dwc2: override PHY input signals with usb role switch support @ 2020-07-24 10:47 ` Amelie Delaunay 0 siblings, 0 replies; 18+ messages in thread From: Amelie Delaunay @ 2020-07-24 10:47 UTC (permalink / raw) To: Minas Harutyunyan, Felipe Balbi, Greg Kroah-Hartman, Rob Herring, Maxime Coquelin, Alexandre Torgue Cc: devicetree, Amelie Delaunay, Martin Blumenstingl, linux-usb, linux-kernel, Fabrice Gasnier, linux-stm32, linux-arm-kernel This patch adds support for usb role switch to dwc2, by using overriding control of the PHY voltage valid and ID input signals. iddig signal (ID) can be overridden: - when setting GUSBCFG_FORCEHOSTMODE, iddig input pin is overridden with 1; - when setting GUSBCFG_FORCEDEVMODE, iddig input pin is overridden with 0. avalid/bvalid/vbusvalid signals can be overridden respectively with: - GOTGCTL_AVALOEN + GOTGCTL_AVALOVAL - GOTGCTL_BVALOEN + GOTGCTL_BVALOVAL - GOTGCTL_VBVALEN + GOTGCTL_VBVALOVAL It is possible to determine valid sessions thanks to usb role switch: - if USB_ROLE_NONE then !avalid && !bvalid && !vbusvalid - if USB_ROLE_DEVICE then !avalid && bvalid && vbusvalid - if USB_ROLE_HOST then avalid && !bvalid && vbusvalid Cc: Martin Blumenstingl <martin.blumenstingl@googlemail.com> Signed-off-by: Amelie Delaunay <amelie.delaunay@st.com> --- Changes in v3: - Fix build issue reported by kernel test robot in drd.c Changes in v2: - Fix build issue reported by kernel test robot - Move call to dwc2_force_mode outside spinlock context - Add dwc2_drd_exit call in probe error path --- drivers/usb/dwc2/Kconfig | 1 + drivers/usb/dwc2/Makefile | 2 +- drivers/usb/dwc2/core.h | 9 ++ drivers/usb/dwc2/drd.c | 181 ++++++++++++++++++++++++++++++++++++ drivers/usb/dwc2/gadget.c | 2 +- drivers/usb/dwc2/platform.c | 15 +++ 6 files changed, 208 insertions(+), 2 deletions(-) create mode 100644 drivers/usb/dwc2/drd.c diff --git a/drivers/usb/dwc2/Kconfig b/drivers/usb/dwc2/Kconfig index 16e1aa304edc..dceb8f32414e 100644 --- a/drivers/usb/dwc2/Kconfig +++ b/drivers/usb/dwc2/Kconfig @@ -47,6 +47,7 @@ config USB_DWC2_PERIPHERAL config USB_DWC2_DUAL_ROLE bool "Dual Role mode" depends on (USB=y && USB_GADGET=y) || (USB_DWC2=m && USB && USB_GADGET) + select USB_ROLE_SWITCH help Select this option if you want the driver to work in a dual-role mode. In this mode both host and gadget features are enabled, and diff --git a/drivers/usb/dwc2/Makefile b/drivers/usb/dwc2/Makefile index 440320cc20a4..2bcd6945df46 100644 --- a/drivers/usb/dwc2/Makefile +++ b/drivers/usb/dwc2/Makefile @@ -3,7 +3,7 @@ ccflags-$(CONFIG_USB_DWC2_DEBUG) += -DDEBUG ccflags-$(CONFIG_USB_DWC2_VERBOSE) += -DVERBOSE_DEBUG obj-$(CONFIG_USB_DWC2) += dwc2.o -dwc2-y := core.o core_intr.o platform.o +dwc2-y := core.o core_intr.o platform.o drd.o dwc2-y += params.o ifneq ($(filter y,$(CONFIG_USB_DWC2_HOST) $(CONFIG_USB_DWC2_DUAL_ROLE)),) diff --git a/drivers/usb/dwc2/core.h b/drivers/usb/dwc2/core.h index 132d687f1590..471564e120c8 100644 --- a/drivers/usb/dwc2/core.h +++ b/drivers/usb/dwc2/core.h @@ -860,6 +860,7 @@ struct dwc2_hregs_backup { * - USB_DR_MODE_PERIPHERAL * - USB_DR_MODE_HOST * - USB_DR_MODE_OTG + * @role_sw: usb_role_switch handle * @hcd_enabled: Host mode sub-driver initialization indicator. * @gadget_enabled: Peripheral mode sub-driver initialization indicator. * @ll_hw_enabled: Status of low-level hardware resources. @@ -1054,6 +1055,7 @@ struct dwc2_hsotg { struct dwc2_core_params params; enum usb_otg_state op_state; enum usb_dr_mode dr_mode; + struct usb_role_switch *role_sw; unsigned int hcd_enabled:1; unsigned int gadget_enabled:1; unsigned int ll_hw_enabled:1; @@ -1376,6 +1378,11 @@ static inline int dwc2_is_device_mode(struct dwc2_hsotg *hsotg) return (dwc2_readl(hsotg, GINTSTS) & GINTSTS_CURMODE_HOST) == 0; } +int dwc2_drd_init(struct dwc2_hsotg *hsotg); +void dwc2_drd_suspend(struct dwc2_hsotg *hsotg); +void dwc2_drd_resume(struct dwc2_hsotg *hsotg); +void dwc2_drd_exit(struct dwc2_hsotg *hsotg); + /* * Dump core registers and SPRAM */ @@ -1392,6 +1399,7 @@ int dwc2_hsotg_resume(struct dwc2_hsotg *dwc2); int dwc2_gadget_init(struct dwc2_hsotg *hsotg); void dwc2_hsotg_core_init_disconnected(struct dwc2_hsotg *dwc2, bool reset); +void dwc2_hsotg_core_disconnect(struct dwc2_hsotg *hsotg); void dwc2_hsotg_core_connect(struct dwc2_hsotg *hsotg); void dwc2_hsotg_disconnect(struct dwc2_hsotg *dwc2); int dwc2_hsotg_set_test_mode(struct dwc2_hsotg *hsotg, int testmode); @@ -1417,6 +1425,7 @@ static inline int dwc2_gadget_init(struct dwc2_hsotg *hsotg) { return 0; } static inline void dwc2_hsotg_core_init_disconnected(struct dwc2_hsotg *dwc2, bool reset) {} +static inline void dwc2_hsotg_core_disconnect(struct dwc2_hsotg *hsotg) {} static inline void dwc2_hsotg_core_connect(struct dwc2_hsotg *hsotg) {} static inline void dwc2_hsotg_disconnect(struct dwc2_hsotg *dwc2) {} static inline int dwc2_hsotg_set_test_mode(struct dwc2_hsotg *hsotg, diff --git a/drivers/usb/dwc2/drd.c b/drivers/usb/dwc2/drd.c new file mode 100644 index 000000000000..c00073e2c48b --- /dev/null +++ b/drivers/usb/dwc2/drd.c @@ -0,0 +1,181 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * drd.c - DesignWare USB2 DRD Controller Dual-role support + * + * Copyright (C) 2020 STMicroelectronics + * + * Author(s): Amelie Delaunay <amelie.delaunay@st.com> + */ + +#include <linux/iopoll.h> +#include <linux/platform_device.h> +#include <linux/usb/role.h> +#include "core.h" + +static void dwc2_ovr_init(struct dwc2_hsotg *hsotg) +{ + unsigned long flags; + u32 gotgctl; + + spin_lock_irqsave(&hsotg->lock, flags); + + gotgctl = dwc2_readl(hsotg, GOTGCTL); + gotgctl |= GOTGCTL_BVALOEN | GOTGCTL_AVALOEN | GOTGCTL_VBVALOEN; + gotgctl |= GOTGCTL_DBNCE_FLTR_BYPASS; + gotgctl &= ~(GOTGCTL_BVALOVAL | GOTGCTL_AVALOVAL | GOTGCTL_VBVALOVAL); + dwc2_writel(hsotg, gotgctl, GOTGCTL); + + dwc2_force_mode(hsotg, false); + + spin_unlock_irqrestore(&hsotg->lock, flags); +} + +static int dwc2_ovr_avalid(struct dwc2_hsotg *hsotg, bool valid) +{ + u32 gotgctl = dwc2_readl(hsotg, GOTGCTL); + + /* Check if A-Session is already in the right state */ + if ((valid && (gotgctl & GOTGCTL_ASESVLD)) || + (!valid && !(gotgctl & GOTGCTL_ASESVLD))) + return -EALREADY; + + if (valid) + gotgctl |= GOTGCTL_AVALOVAL | GOTGCTL_VBVALOVAL; + else + gotgctl &= ~(GOTGCTL_AVALOVAL | GOTGCTL_VBVALOVAL); + dwc2_writel(hsotg, gotgctl, GOTGCTL); + + return 0; +} + +static int dwc2_ovr_bvalid(struct dwc2_hsotg *hsotg, bool valid) +{ + u32 gotgctl = dwc2_readl(hsotg, GOTGCTL); + + /* Check if B-Session is already in the right state */ + if ((valid && (gotgctl & GOTGCTL_BSESVLD)) || + (!valid && !(gotgctl & GOTGCTL_BSESVLD))) + return -EALREADY; + + if (valid) + gotgctl |= GOTGCTL_BVALOVAL | GOTGCTL_VBVALOVAL; + else + gotgctl &= ~(GOTGCTL_BVALOVAL | GOTGCTL_VBVALOVAL); + dwc2_writel(hsotg, gotgctl, GOTGCTL); + + return 0; +} + +static int dwc2_drd_role_sw_set(struct usb_role_switch *sw, enum usb_role role) +{ + struct dwc2_hsotg *hsotg = usb_role_switch_get_drvdata(sw); + unsigned long flags; + int already = 0; + + /* Skip session not in line with dr_mode */ + if ((role == USB_ROLE_DEVICE && hsotg->dr_mode == USB_DR_MODE_HOST) || + (role == USB_ROLE_HOST && hsotg->dr_mode == USB_DR_MODE_PERIPHERAL)) + return -EINVAL; + +#if IS_ENABLED(CONFIG_USB_DWC2_PERIPHERAL) || \ + IS_ENABLED(CONFIG_USB_DWC2_DUAL_ROLE) + /* Skip session if core is in test mode */ + if (role == USB_ROLE_NONE && hsotg->test_mode) { + dev_dbg(hsotg->dev, "Core is in test mode\n"); + return -EBUSY; + } +#endif + + spin_lock_irqsave(&hsotg->lock, flags); + + if (role == USB_ROLE_HOST) { + already = dwc2_ovr_avalid(hsotg, true); + } else if (role == USB_ROLE_DEVICE) { + already = dwc2_ovr_bvalid(hsotg, true); + /* This clear DCTL.SFTDISCON bit */ + dwc2_hsotg_core_connect(hsotg); + } else { + if (dwc2_is_device_mode(hsotg)) { + if (!dwc2_ovr_bvalid(hsotg, false)) + /* This set DCTL.SFTDISCON bit */ + dwc2_hsotg_core_disconnect(hsotg); + } else { + dwc2_ovr_avalid(hsotg, false); + } + } + + spin_unlock_irqrestore(&hsotg->lock, flags); + + if (!already && + role != USB_ROLE_NONE && hsotg->dr_mode == USB_DR_MODE_OTG) + /* This will raise a Connector ID Status Change Interrupt */ + dwc2_force_mode(hsotg, role == USB_ROLE_HOST); + + dev_dbg(hsotg->dev, "%s-session valid\n", + role == USB_ROLE_NONE ? "No" : + role == USB_ROLE_HOST ? "A" : "B"); + + return 0; +} + +int dwc2_drd_init(struct dwc2_hsotg *hsotg) +{ + struct usb_role_switch_desc role_sw_desc = {0}; + struct usb_role_switch *role_sw; + int ret; + + if (!device_property_read_bool(hsotg->dev, "usb-role-switch")) + return 0; + + role_sw_desc.driver_data = hsotg; + role_sw_desc.fwnode = dev_fwnode(hsotg->dev); + role_sw_desc.set = dwc2_drd_role_sw_set; + role_sw_desc.allow_userspace_control = true; + + role_sw = usb_role_switch_register(hsotg->dev, &role_sw_desc); + if (IS_ERR(role_sw)) { + ret = PTR_ERR(role_sw); + dev_err(hsotg->dev, + "failed to register role switch: %d\n", ret); + return ret; + } + + hsotg->role_sw = role_sw; + + /* Enable override and initialize values */ + dwc2_ovr_init(hsotg); + + return 0; +} + +void dwc2_drd_suspend(struct dwc2_hsotg *hsotg) +{ + u32 gintsts, gintmsk; + + if (hsotg->role_sw && !hsotg->params.external_id_pin_ctl) { + gintmsk = dwc2_readl(hsotg, GINTMSK); + gintmsk &= ~GINTSTS_CONIDSTSCHNG; + dwc2_writel(hsotg, gintmsk, GINTMSK); + gintsts = dwc2_readl(hsotg, GINTSTS); + dwc2_writel(hsotg, gintsts | GINTSTS_CONIDSTSCHNG, GINTSTS); + } +} + +void dwc2_drd_resume(struct dwc2_hsotg *hsotg) +{ + u32 gintsts, gintmsk; + + if (hsotg->role_sw && !hsotg->params.external_id_pin_ctl) { + gintsts = dwc2_readl(hsotg, GINTSTS); + dwc2_writel(hsotg, gintsts | GINTSTS_CONIDSTSCHNG, GINTSTS); + gintmsk = dwc2_readl(hsotg, GINTMSK); + gintmsk |= GINTSTS_CONIDSTSCHNG; + dwc2_writel(hsotg, gintmsk, GINTMSK); + } +} + +void dwc2_drd_exit(struct dwc2_hsotg *hsotg) +{ + if (hsotg->role_sw) + usb_role_switch_unregister(hsotg->role_sw); +} diff --git a/drivers/usb/dwc2/gadget.c b/drivers/usb/dwc2/gadget.c index 7faf5f8c056d..f069530110d9 100644 --- a/drivers/usb/dwc2/gadget.c +++ b/drivers/usb/dwc2/gadget.c @@ -3532,7 +3532,7 @@ void dwc2_hsotg_core_init_disconnected(struct dwc2_hsotg *hsotg, dwc2_readl(hsotg, DOEPCTL0)); } -static void dwc2_hsotg_core_disconnect(struct dwc2_hsotg *hsotg) +void dwc2_hsotg_core_disconnect(struct dwc2_hsotg *hsotg) { /* set the soft-disconnect bit */ dwc2_set_bit(hsotg, DCTL, DCTL_SFTDISCON); diff --git a/drivers/usb/dwc2/platform.c b/drivers/usb/dwc2/platform.c index c347d93eae64..1a5c196b8c8e 100644 --- a/drivers/usb/dwc2/platform.c +++ b/drivers/usb/dwc2/platform.c @@ -317,6 +317,8 @@ static int dwc2_driver_remove(struct platform_device *dev) if (hsotg->params.activate_stm_id_vb_detection) regulator_disable(hsotg->usb33d); + dwc2_drd_exit(hsotg); + if (hsotg->ll_hw_enabled) dwc2_lowlevel_hw_disable(hsotg); @@ -532,6 +534,13 @@ static int dwc2_driver_probe(struct platform_device *dev) dwc2_writel(hsotg, ggpio, GGPIO); } + retval = dwc2_drd_init(hsotg); + if (retval) { + if (retval != -EPROBE_DEFER) + dev_err(hsotg->dev, "failed to initialize dual-role\n"); + goto error_init; + } + if (hsotg->dr_mode != USB_DR_MODE_HOST) { retval = dwc2_gadget_init(hsotg); if (retval) @@ -589,6 +598,8 @@ static int dwc2_driver_probe(struct platform_device *dev) return 0; error_init: + dwc2_drd_exit(hsotg); + if (hsotg->params.activate_stm_id_vb_detection) regulator_disable(hsotg->usb33d); error: @@ -605,6 +616,8 @@ static int __maybe_unused dwc2_suspend(struct device *dev) if (is_device_mode) dwc2_hsotg_suspend(dwc2); + dwc2_drd_suspend(dwc2); + if (dwc2->params.activate_stm_id_vb_detection) { unsigned long flags; u32 ggpio, gotgctl; @@ -685,6 +698,8 @@ static int __maybe_unused dwc2_resume(struct device *dev) /* Need to restore FORCEDEVMODE/FORCEHOSTMODE */ dwc2_force_dr_mode(dwc2); + dwc2_drd_resume(dwc2); + if (dwc2_is_device_mode(dwc2)) ret = dwc2_hsotg_resume(dwc2); -- 2.17.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH v3 2/3] dt-bindings: usb: dwc2: add optional usb-role-switch property 2020-07-24 10:47 ` Amelie Delaunay @ 2020-07-24 10:47 ` Amelie Delaunay -1 siblings, 0 replies; 18+ messages in thread From: Amelie Delaunay @ 2020-07-24 10:47 UTC (permalink / raw) To: Minas Harutyunyan, Felipe Balbi, Greg Kroah-Hartman, Rob Herring, Maxime Coquelin, Alexandre Torgue Cc: linux-usb, devicetree, linux-kernel, linux-arm-kernel, linux-stm32, Fabrice Gasnier, Amelie Delaunay, Martin Blumenstingl This patch documents the usb-role-switch property in dwc2 bindings, now that usb-role-switch support is available in dwc2 driver. Cc: Martin Blumenstingl <martin.blumenstingl@googlemail.com> Signed-off-by: Amelie Delaunay <amelie.delaunay@st.com> --- New since v2 patchset. --- Documentation/devicetree/bindings/usb/dwc2.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Documentation/devicetree/bindings/usb/dwc2.yaml b/Documentation/devicetree/bindings/usb/dwc2.yaml index 9352a8ef60a6..7b226eeffe82 100644 --- a/Documentation/devicetree/bindings/usb/dwc2.yaml +++ b/Documentation/devicetree/bindings/usb/dwc2.yaml @@ -100,6 +100,10 @@ properties: dr_mode: enum: [host, peripheral, otg] + usb-role-switch: + $ref: /schemas/types.yaml#/definitions/flag + description: Support role switch. + g-rx-fifo-size: $ref: /schemas/types.yaml#/definitions/uint32 description: size of rx fifo size in gadget mode. -- 2.17.1 ^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH v3 2/3] dt-bindings: usb: dwc2: add optional usb-role-switch property @ 2020-07-24 10:47 ` Amelie Delaunay 0 siblings, 0 replies; 18+ messages in thread From: Amelie Delaunay @ 2020-07-24 10:47 UTC (permalink / raw) To: Minas Harutyunyan, Felipe Balbi, Greg Kroah-Hartman, Rob Herring, Maxime Coquelin, Alexandre Torgue Cc: devicetree, Amelie Delaunay, Martin Blumenstingl, linux-usb, linux-kernel, Fabrice Gasnier, linux-stm32, linux-arm-kernel This patch documents the usb-role-switch property in dwc2 bindings, now that usb-role-switch support is available in dwc2 driver. Cc: Martin Blumenstingl <martin.blumenstingl@googlemail.com> Signed-off-by: Amelie Delaunay <amelie.delaunay@st.com> --- New since v2 patchset. --- Documentation/devicetree/bindings/usb/dwc2.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Documentation/devicetree/bindings/usb/dwc2.yaml b/Documentation/devicetree/bindings/usb/dwc2.yaml index 9352a8ef60a6..7b226eeffe82 100644 --- a/Documentation/devicetree/bindings/usb/dwc2.yaml +++ b/Documentation/devicetree/bindings/usb/dwc2.yaml @@ -100,6 +100,10 @@ properties: dr_mode: enum: [host, peripheral, otg] + usb-role-switch: + $ref: /schemas/types.yaml#/definitions/flag + description: Support role switch. + g-rx-fifo-size: $ref: /schemas/types.yaml#/definitions/uint32 description: size of rx fifo size in gadget mode. -- 2.17.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH v3 3/3] usb: dwc2: don't use ID/Vbus detection if usb-role-switch on STM32MP15 SoCs 2020-07-24 10:47 ` Amelie Delaunay @ 2020-07-24 10:47 ` Amelie Delaunay -1 siblings, 0 replies; 18+ messages in thread From: Amelie Delaunay @ 2020-07-24 10:47 UTC (permalink / raw) To: Minas Harutyunyan, Felipe Balbi, Greg Kroah-Hartman, Rob Herring, Maxime Coquelin, Alexandre Torgue Cc: linux-usb, devicetree, linux-kernel, linux-arm-kernel, linux-stm32, Fabrice Gasnier, Amelie Delaunay, Martin Blumenstingl If usb-role-switch is present in the device tree, it means that ID and Vbus signals are not connected to the OTG controller but to an external component (GPIOs, Type-C controller). In this configuration, usb role switch is used to force valid sessions on STM32MP15 SoCs. Acked-by: Minas Harutyunyan <hminas@synopsys.com> Signed-off-by: Amelie Delaunay <amelie.delaunay@st.com> --- No changes in v3. --- drivers/usb/dwc2/params.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/usb/dwc2/params.c b/drivers/usb/dwc2/params.c index ce736d67c7c3..d6690ee7af01 100644 --- a/drivers/usb/dwc2/params.c +++ b/drivers/usb/dwc2/params.c @@ -183,9 +183,11 @@ static void dwc2_set_stm32mp15_fsotg_params(struct dwc2_hsotg *hsotg) static void dwc2_set_stm32mp15_hsotg_params(struct dwc2_hsotg *hsotg) { struct dwc2_core_params *p = &hsotg->params; + struct device_node *np = hsotg->dev->of_node; p->otg_cap = DWC2_CAP_PARAM_NO_HNP_SRP_CAPABLE; - p->activate_stm_id_vb_detection = true; + p->activate_stm_id_vb_detection = + !of_property_read_bool(np, "usb-role-switch"); p->host_rx_fifo_size = 440; p->host_nperio_tx_fifo_size = 256; p->host_perio_tx_fifo_size = 256; -- 2.17.1 ^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH v3 3/3] usb: dwc2: don't use ID/Vbus detection if usb-role-switch on STM32MP15 SoCs @ 2020-07-24 10:47 ` Amelie Delaunay 0 siblings, 0 replies; 18+ messages in thread From: Amelie Delaunay @ 2020-07-24 10:47 UTC (permalink / raw) To: Minas Harutyunyan, Felipe Balbi, Greg Kroah-Hartman, Rob Herring, Maxime Coquelin, Alexandre Torgue Cc: devicetree, Amelie Delaunay, Martin Blumenstingl, linux-usb, linux-kernel, Fabrice Gasnier, linux-stm32, linux-arm-kernel If usb-role-switch is present in the device tree, it means that ID and Vbus signals are not connected to the OTG controller but to an external component (GPIOs, Type-C controller). In this configuration, usb role switch is used to force valid sessions on STM32MP15 SoCs. Acked-by: Minas Harutyunyan <hminas@synopsys.com> Signed-off-by: Amelie Delaunay <amelie.delaunay@st.com> --- No changes in v3. --- drivers/usb/dwc2/params.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/usb/dwc2/params.c b/drivers/usb/dwc2/params.c index ce736d67c7c3..d6690ee7af01 100644 --- a/drivers/usb/dwc2/params.c +++ b/drivers/usb/dwc2/params.c @@ -183,9 +183,11 @@ static void dwc2_set_stm32mp15_fsotg_params(struct dwc2_hsotg *hsotg) static void dwc2_set_stm32mp15_hsotg_params(struct dwc2_hsotg *hsotg) { struct dwc2_core_params *p = &hsotg->params; + struct device_node *np = hsotg->dev->of_node; p->otg_cap = DWC2_CAP_PARAM_NO_HNP_SRP_CAPABLE; - p->activate_stm_id_vb_detection = true; + p->activate_stm_id_vb_detection = + !of_property_read_bool(np, "usb-role-switch"); p->host_rx_fifo_size = 440; p->host_nperio_tx_fifo_size = 256; p->host_perio_tx_fifo_size = 256; -- 2.17.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply related [flat|nested] 18+ messages in thread
* Re: [PATCH v3 0/3] Add USB role switch support to DWC2 2020-07-24 10:47 ` Amelie Delaunay @ 2020-07-24 12:43 ` Amelie DELAUNAY -1 siblings, 0 replies; 18+ messages in thread From: Amelie DELAUNAY @ 2020-07-24 12:43 UTC (permalink / raw) To: Minas Harutyunyan, Felipe Balbi, Greg Kroah-Hartman, Rob Herring, Maxime Coquelin, Alexandre Torgue Cc: linux-usb, devicetree, linux-kernel, linux-arm-kernel, linux-stm32, Fabrice Gasnier, Martin Blumenstingl Series dropped. On 7/24/20 12:47 PM, Amelie Delaunay wrote: > When using usb-c connector (but it can also be the case with a micro-b > connector), iddig, avalid, bvalid, vbusvalid input signals may not be > connected to the DWC2 OTG controller. > DWC2 OTG controller features an overriding control of the PHY voltage valid > and ID input signals. > So, missing signals can be forced using usb role from usb role switch and > this override feature. > > This series adds support for usb role switch to dwc2, by using overriding > control of the PHY voltage valid and ID input signals. > > It has been tested on stm32mp157c-dk2 [1], which has a Type-C connector > managed by a Type-C port controller, and connected to USB OTG controller. > > [1] https://www.st.com/en/evaluation-tools/stm32mp157c-dk2.html > > Amelie Delaunay (3): > usb: dwc2: override PHY input signals with usb role switch support > dt-bindings: usb: dwc2: add optional usb-role-switch property > usb: dwc2: don't use ID/Vbus detection if usb-role-switch on STM32MP15 > SoCs > --- > Changes in v3: > - Fix build issue reported by kernel test robot in drd.c > Changes in v2: > - Previous DT patch already in stm32-next branch so removed from v2 patchset > "ARM: dts: stm32: enable usb-role-switch on USB OTG on stm32mp15xx-dkx" > - DWC2 DT bindings update added > - Build issue reported by kernel test robot fixed > - Martin's comments taken into account > --- > .../devicetree/bindings/usb/dwc2.yaml | 4 + > drivers/usb/dwc2/Kconfig | 1 + > drivers/usb/dwc2/Makefile | 2 +- > drivers/usb/dwc2/core.h | 9 + > drivers/usb/dwc2/drd.c | 181 ++++++++++++++++++ > drivers/usb/dwc2/gadget.c | 2 +- > drivers/usb/dwc2/params.c | 4 +- > drivers/usb/dwc2/platform.c | 15 ++ > 8 files changed, 215 insertions(+), 3 deletions(-) > create mode 100644 drivers/usb/dwc2/drd.c > ^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH v3 0/3] Add USB role switch support to DWC2 @ 2020-07-24 12:43 ` Amelie DELAUNAY 0 siblings, 0 replies; 18+ messages in thread From: Amelie DELAUNAY @ 2020-07-24 12:43 UTC (permalink / raw) To: Minas Harutyunyan, Felipe Balbi, Greg Kroah-Hartman, Rob Herring, Maxime Coquelin, Alexandre Torgue Cc: devicetree, Martin Blumenstingl, linux-usb, linux-kernel, Fabrice Gasnier, linux-stm32, linux-arm-kernel Series dropped. On 7/24/20 12:47 PM, Amelie Delaunay wrote: > When using usb-c connector (but it can also be the case with a micro-b > connector), iddig, avalid, bvalid, vbusvalid input signals may not be > connected to the DWC2 OTG controller. > DWC2 OTG controller features an overriding control of the PHY voltage valid > and ID input signals. > So, missing signals can be forced using usb role from usb role switch and > this override feature. > > This series adds support for usb role switch to dwc2, by using overriding > control of the PHY voltage valid and ID input signals. > > It has been tested on stm32mp157c-dk2 [1], which has a Type-C connector > managed by a Type-C port controller, and connected to USB OTG controller. > > [1] https://www.st.com/en/evaluation-tools/stm32mp157c-dk2.html > > Amelie Delaunay (3): > usb: dwc2: override PHY input signals with usb role switch support > dt-bindings: usb: dwc2: add optional usb-role-switch property > usb: dwc2: don't use ID/Vbus detection if usb-role-switch on STM32MP15 > SoCs > --- > Changes in v3: > - Fix build issue reported by kernel test robot in drd.c > Changes in v2: > - Previous DT patch already in stm32-next branch so removed from v2 patchset > "ARM: dts: stm32: enable usb-role-switch on USB OTG on stm32mp15xx-dkx" > - DWC2 DT bindings update added > - Build issue reported by kernel test robot fixed > - Martin's comments taken into account > --- > .../devicetree/bindings/usb/dwc2.yaml | 4 + > drivers/usb/dwc2/Kconfig | 1 + > drivers/usb/dwc2/Makefile | 2 +- > drivers/usb/dwc2/core.h | 9 + > drivers/usb/dwc2/drd.c | 181 ++++++++++++++++++ > drivers/usb/dwc2/gadget.c | 2 +- > drivers/usb/dwc2/params.c | 4 +- > drivers/usb/dwc2/platform.c | 15 ++ > 8 files changed, 215 insertions(+), 3 deletions(-) > create mode 100644 drivers/usb/dwc2/drd.c > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH v3 0/3] Add USB role switch support to DWC2 2020-07-24 12:43 ` Amelie DELAUNAY @ 2020-07-24 13:50 ` Felipe Balbi -1 siblings, 0 replies; 18+ messages in thread From: Felipe Balbi @ 2020-07-24 13:50 UTC (permalink / raw) To: Amelie DELAUNAY, Minas Harutyunyan, Greg Kroah-Hartman, Rob Herring, Maxime Coquelin, Alexandre Torgue Cc: linux-usb, devicetree, linux-kernel, linux-arm-kernel, linux-stm32, Fabrice Gasnier, Martin Blumenstingl [-- Attachment #1: Type: text/plain, Size: 203 bytes --] (no top-posting, please) Hi, Amelie DELAUNAY <amelie.delaunay@st.com> writes: > Series dropped. what do you mean with this? Should I drop all patches related with this series? -- balbi [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 832 bytes --] ^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH v3 0/3] Add USB role switch support to DWC2 @ 2020-07-24 13:50 ` Felipe Balbi 0 siblings, 0 replies; 18+ messages in thread From: Felipe Balbi @ 2020-07-24 13:50 UTC (permalink / raw) To: Amelie DELAUNAY, Minas Harutyunyan, Greg Kroah-Hartman, Rob Herring, Maxime Coquelin, Alexandre Torgue Cc: devicetree, Martin Blumenstingl, linux-usb, linux-kernel, Fabrice Gasnier, linux-stm32, linux-arm-kernel [-- Attachment #1.1: Type: text/plain, Size: 203 bytes --] (no top-posting, please) Hi, Amelie DELAUNAY <amelie.delaunay@st.com> writes: > Series dropped. what do you mean with this? Should I drop all patches related with this series? -- balbi [-- Attachment #1.2: signature.asc --] [-- Type: application/pgp-signature, Size: 832 bytes --] [-- Attachment #2: Type: text/plain, Size: 176 bytes --] _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH v3 0/3] Add USB role switch support to DWC2 2020-07-24 13:50 ` Felipe Balbi @ 2020-07-24 13:58 ` Amelie DELAUNAY -1 siblings, 0 replies; 18+ messages in thread From: Amelie DELAUNAY @ 2020-07-24 13:58 UTC (permalink / raw) To: Felipe Balbi, Minas Harutyunyan, Greg Kroah-Hartman, Rob Herring, Maxime Coquelin, Alexandre TORGUE Cc: linux-usb@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-stm32@st-md-mailman.stormreply.com, Fabrice GASNIER, Martin Blumenstingl Hi, On 7/24/20 3:50 PM, Felipe Balbi wrote: > > (no top-posting, please) > > Hi, > > Amelie DELAUNAY <amelie.delaunay@st.com> writes: >> Series dropped. > > what do you mean with this? Should I drop all patches related with this series? > As v1 patches were in your next branch, I've prepared a new patchset which contains fixes, on top of you next branch : https://lore.kernel.org/patchwork/project/lkml/list/?series=454959 What do you prefer ? Drop all patches related to the v1 "Add USB role switch support to DWC2" series and I send a v4 in replacement or keep all patches and wait for new series review ? ^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH v3 0/3] Add USB role switch support to DWC2 @ 2020-07-24 13:58 ` Amelie DELAUNAY 0 siblings, 0 replies; 18+ messages in thread From: Amelie DELAUNAY @ 2020-07-24 13:58 UTC (permalink / raw) To: Felipe Balbi, Minas Harutyunyan, Greg Kroah-Hartman, Rob Herring, Maxime Coquelin, Alexandre TORGUE Cc: devicetree@vger.kernel.org, Martin Blumenstingl, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, Fabrice GASNIER, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org Hi, On 7/24/20 3:50 PM, Felipe Balbi wrote: > > (no top-posting, please) > > Hi, > > Amelie DELAUNAY <amelie.delaunay@st.com> writes: >> Series dropped. > > what do you mean with this? Should I drop all patches related with this series? > As v1 patches were in your next branch, I've prepared a new patchset which contains fixes, on top of you next branch : https://lore.kernel.org/patchwork/project/lkml/list/?series=454959 What do you prefer ? Drop all patches related to the v1 "Add USB role switch support to DWC2" series and I send a v4 in replacement or keep all patches and wait for new series review ? _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH v3 0/3] Add USB role switch support to DWC2 2020-07-24 13:58 ` Amelie DELAUNAY @ 2020-07-24 16:16 ` Felipe Balbi -1 siblings, 0 replies; 18+ messages in thread From: Felipe Balbi @ 2020-07-24 16:16 UTC (permalink / raw) To: Amelie DELAUNAY, Minas Harutyunyan, Greg Kroah-Hartman, Rob Herring, Maxime Coquelin, Alexandre TORGUE Cc: linux-usb@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-stm32@st-md-mailman.stormreply.com, Fabrice GASNIER, Martin Blumenstingl [-- Attachment #1: Type: text/plain, Size: 889 bytes --] Amelie DELAUNAY <amelie.delaunay@st.com> writes: > Hi, > > On 7/24/20 3:50 PM, Felipe Balbi wrote: >> >> (no top-posting, please) >> >> Hi, >> >> Amelie DELAUNAY <amelie.delaunay@st.com> writes: >>> Series dropped. >> >> what do you mean with this? Should I drop all patches related with this series? >> > > As v1 patches were in your next branch, I've prepared a new patchset > which contains fixes, on top of you next branch : > https://lore.kernel.org/patchwork/project/lkml/list/?series=454959 > > > What do you prefer ? Drop all patches related to the v1 "Add USB role > switch support to DWC2" series and I send a v4 in replacement or keep > all patches and wait for new series review ? I've dropped those because they caused the build breakage :-) I can take a new series, let's take the opportunity to avoid the build regression. -- balbi [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 832 bytes --] ^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH v3 0/3] Add USB role switch support to DWC2 @ 2020-07-24 16:16 ` Felipe Balbi 0 siblings, 0 replies; 18+ messages in thread From: Felipe Balbi @ 2020-07-24 16:16 UTC (permalink / raw) To: Amelie DELAUNAY, Minas Harutyunyan, Greg Kroah-Hartman, Rob Herring, Maxime Coquelin, Alexandre TORGUE Cc: devicetree@vger.kernel.org, Martin Blumenstingl, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, Fabrice GASNIER, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org [-- Attachment #1.1: Type: text/plain, Size: 889 bytes --] Amelie DELAUNAY <amelie.delaunay@st.com> writes: > Hi, > > On 7/24/20 3:50 PM, Felipe Balbi wrote: >> >> (no top-posting, please) >> >> Hi, >> >> Amelie DELAUNAY <amelie.delaunay@st.com> writes: >>> Series dropped. >> >> what do you mean with this? Should I drop all patches related with this series? >> > > As v1 patches were in your next branch, I've prepared a new patchset > which contains fixes, on top of you next branch : > https://lore.kernel.org/patchwork/project/lkml/list/?series=454959 > > > What do you prefer ? Drop all patches related to the v1 "Add USB role > switch support to DWC2" series and I send a v4 in replacement or keep > all patches and wait for new series review ? I've dropped those because they caused the build breakage :-) I can take a new series, let's take the opportunity to avoid the build regression. -- balbi [-- Attachment #1.2: signature.asc --] [-- Type: application/pgp-signature, Size: 832 bytes --] [-- Attachment #2: Type: text/plain, Size: 176 bytes --] _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH v3 0/3] Add USB role switch support to DWC2 2020-07-24 16:16 ` Felipe Balbi @ 2020-07-27 9:37 ` Amelie DELAUNAY -1 siblings, 0 replies; 18+ messages in thread From: Amelie DELAUNAY @ 2020-07-27 9:37 UTC (permalink / raw) To: Felipe Balbi, Minas Harutyunyan, Greg Kroah-Hartman, Rob Herring, Maxime Coquelin, Alexandre TORGUE Cc: linux-usb@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-stm32@st-md-mailman.stormreply.com, Fabrice GASNIER, Martin Blumenstingl Hi, On 7/24/20 6:16 PM, Felipe Balbi wrote: > Amelie DELAUNAY <amelie.delaunay@st.com> writes: > >> Hi, >> >> On 7/24/20 3:50 PM, Felipe Balbi wrote: >>> >>> (no top-posting, please) >>> >>> Hi, >>> >>> Amelie DELAUNAY <amelie.delaunay@st.com> writes: >>>> Series dropped. >>> >>> what do you mean with this? Should I drop all patches related with this series? >>> >> >> As v1 patches were in your next branch, I've prepared a new patchset >> which contains fixes, on top of you next branch : >> https://lore.kernel.org/patchwork/project/lkml/list/?series=454959 >> >> >> What do you prefer ? Drop all patches related to the v1 "Add USB role >> switch support to DWC2" series and I send a v4 in replacement or keep >> all patches and wait for new series review ? > > I've dropped those because they caused the build breakage :-) I can take > a new series, let's take the opportunity to avoid the build regression. > Sure! I've sent the v4, rebased on your testing/next because your next still contains the v1 patches, with the fix for build issue, and adressing Martin's comments. I drop the fixes series. Regards, Amelie ^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH v3 0/3] Add USB role switch support to DWC2 @ 2020-07-27 9:37 ` Amelie DELAUNAY 0 siblings, 0 replies; 18+ messages in thread From: Amelie DELAUNAY @ 2020-07-27 9:37 UTC (permalink / raw) To: Felipe Balbi, Minas Harutyunyan, Greg Kroah-Hartman, Rob Herring, Maxime Coquelin, Alexandre TORGUE Cc: devicetree@vger.kernel.org, Martin Blumenstingl, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, Fabrice GASNIER, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org Hi, On 7/24/20 6:16 PM, Felipe Balbi wrote: > Amelie DELAUNAY <amelie.delaunay@st.com> writes: > >> Hi, >> >> On 7/24/20 3:50 PM, Felipe Balbi wrote: >>> >>> (no top-posting, please) >>> >>> Hi, >>> >>> Amelie DELAUNAY <amelie.delaunay@st.com> writes: >>>> Series dropped. >>> >>> what do you mean with this? Should I drop all patches related with this series? >>> >> >> As v1 patches were in your next branch, I've prepared a new patchset >> which contains fixes, on top of you next branch : >> https://lore.kernel.org/patchwork/project/lkml/list/?series=454959 >> >> >> What do you prefer ? Drop all patches related to the v1 "Add USB role >> switch support to DWC2" series and I send a v4 in replacement or keep >> all patches and wait for new series review ? > > I've dropped those because they caused the build breakage :-) I can take > a new series, let's take the opportunity to avoid the build regression. > Sure! I've sent the v4, rebased on your testing/next because your next still contains the v1 patches, with the fix for build issue, and adressing Martin's comments. I drop the fixes series. Regards, Amelie _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 18+ messages in thread
end of thread, other threads:[~2020-07-27 9:38 UTC | newest] Thread overview: 18+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2020-07-24 10:47 [PATCH v3 0/3] Add USB role switch support to DWC2 Amelie Delaunay 2020-07-24 10:47 ` Amelie Delaunay 2020-07-24 10:47 ` [PATCH v3 1/3] usb: dwc2: override PHY input signals with usb role switch support Amelie Delaunay 2020-07-24 10:47 ` Amelie Delaunay 2020-07-24 10:47 ` [PATCH v3 2/3] dt-bindings: usb: dwc2: add optional usb-role-switch property Amelie Delaunay 2020-07-24 10:47 ` Amelie Delaunay 2020-07-24 10:47 ` [PATCH v3 3/3] usb: dwc2: don't use ID/Vbus detection if usb-role-switch on STM32MP15 SoCs Amelie Delaunay 2020-07-24 10:47 ` Amelie Delaunay 2020-07-24 12:43 ` [PATCH v3 0/3] Add USB role switch support to DWC2 Amelie DELAUNAY 2020-07-24 12:43 ` Amelie DELAUNAY 2020-07-24 13:50 ` Felipe Balbi 2020-07-24 13:50 ` Felipe Balbi 2020-07-24 13:58 ` Amelie DELAUNAY 2020-07-24 13:58 ` Amelie DELAUNAY 2020-07-24 16:16 ` Felipe Balbi 2020-07-24 16:16 ` Felipe Balbi 2020-07-27 9:37 ` Amelie DELAUNAY 2020-07-27 9:37 ` Amelie DELAUNAY
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.