Skip to content

Commit bc0f0d4

Browse files
ADESTMfelipebalbi
authored andcommitted
usb: dwc2: override PHY input signals with usb role switch support
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 Acked-by: Minas Harutyunyan <[email protected]> Signed-off-by: Amelie Delaunay <[email protected]> Signed-off-by: Felipe Balbi <[email protected]>
1 parent c17536d commit bc0f0d4

File tree

6 files changed

+214
-2
lines changed

6 files changed

+214
-2
lines changed

drivers/usb/dwc2/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ config USB_DWC2_PERIPHERAL
4747
config USB_DWC2_DUAL_ROLE
4848
bool "Dual Role mode"
4949
depends on (USB=y && USB_GADGET=y) || (USB_DWC2=m && USB && USB_GADGET)
50+
select USB_ROLE_SWITCH
5051
help
5152
Select this option if you want the driver to work in a dual-role
5253
mode. In this mode both host and gadget features are enabled, and

drivers/usb/dwc2/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ ccflags-$(CONFIG_USB_DWC2_DEBUG) += -DDEBUG
33
ccflags-$(CONFIG_USB_DWC2_VERBOSE) += -DVERBOSE_DEBUG
44

55
obj-$(CONFIG_USB_DWC2) += dwc2.o
6-
dwc2-y := core.o core_intr.o platform.o
6+
dwc2-y := core.o core_intr.o platform.o drd.o
77
dwc2-y += params.o
88

99
ifneq ($(filter y,$(CONFIG_USB_DWC2_HOST) $(CONFIG_USB_DWC2_DUAL_ROLE)),)

drivers/usb/dwc2/core.h

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -860,6 +860,7 @@ struct dwc2_hregs_backup {
860860
* - USB_DR_MODE_PERIPHERAL
861861
* - USB_DR_MODE_HOST
862862
* - USB_DR_MODE_OTG
863+
* @role_sw: usb_role_switch handle
863864
* @hcd_enabled: Host mode sub-driver initialization indicator.
864865
* @gadget_enabled: Peripheral mode sub-driver initialization indicator.
865866
* @ll_hw_enabled: Status of low-level hardware resources.
@@ -1054,6 +1055,7 @@ struct dwc2_hsotg {
10541055
struct dwc2_core_params params;
10551056
enum usb_otg_state op_state;
10561057
enum usb_dr_mode dr_mode;
1058+
struct usb_role_switch *role_sw;
10571059
unsigned int hcd_enabled:1;
10581060
unsigned int gadget_enabled:1;
10591061
unsigned int ll_hw_enabled:1;
@@ -1376,6 +1378,11 @@ static inline int dwc2_is_device_mode(struct dwc2_hsotg *hsotg)
13761378
return (dwc2_readl(hsotg, GINTSTS) & GINTSTS_CURMODE_HOST) == 0;
13771379
}
13781380

1381+
int dwc2_drd_init(struct dwc2_hsotg *hsotg);
1382+
void dwc2_drd_suspend(struct dwc2_hsotg *hsotg);
1383+
void dwc2_drd_resume(struct dwc2_hsotg *hsotg);
1384+
void dwc2_drd_exit(struct dwc2_hsotg *hsotg);
1385+
13791386
/*
13801387
* Dump core registers and SPRAM
13811388
*/
@@ -1392,6 +1399,7 @@ int dwc2_hsotg_resume(struct dwc2_hsotg *dwc2);
13921399
int dwc2_gadget_init(struct dwc2_hsotg *hsotg);
13931400
void dwc2_hsotg_core_init_disconnected(struct dwc2_hsotg *dwc2,
13941401
bool reset);
1402+
void dwc2_hsotg_core_disconnect(struct dwc2_hsotg *hsotg);
13951403
void dwc2_hsotg_core_connect(struct dwc2_hsotg *hsotg);
13961404
void dwc2_hsotg_disconnect(struct dwc2_hsotg *dwc2);
13971405
int dwc2_hsotg_set_test_mode(struct dwc2_hsotg *hsotg, int testmode);

drivers/usb/dwc2/drd.c

Lines changed: 190 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,190 @@
1+
// SPDX-License-Identifier: GPL-2.0
2+
/*
3+
* drd.c - DesignWare USB2 DRD Controller Dual-role support
4+
*
5+
* Copyright (C) 2020 STMicroelectronics
6+
*
7+
* Author(s): Amelie Delaunay <[email protected]>
8+
*/
9+
10+
#include <linux/iopoll.h>
11+
#include <linux/platform_device.h>
12+
#include <linux/usb/role.h>
13+
#include "core.h"
14+
15+
static void dwc2_ovr_init(struct dwc2_hsotg *hsotg)
16+
{
17+
unsigned long flags;
18+
u32 gotgctl;
19+
20+
spin_lock_irqsave(&hsotg->lock, flags);
21+
22+
gotgctl = dwc2_readl(hsotg, GOTGCTL);
23+
gotgctl |= GOTGCTL_BVALOEN | GOTGCTL_AVALOEN | GOTGCTL_VBVALOEN;
24+
gotgctl |= GOTGCTL_DBNCE_FLTR_BYPASS;
25+
gotgctl &= ~(GOTGCTL_BVALOVAL | GOTGCTL_AVALOVAL | GOTGCTL_VBVALOVAL);
26+
dwc2_writel(hsotg, gotgctl, GOTGCTL);
27+
28+
dwc2_force_mode(hsotg, false);
29+
30+
spin_unlock_irqrestore(&hsotg->lock, flags);
31+
}
32+
33+
static int dwc2_ovr_avalid(struct dwc2_hsotg *hsotg, bool valid)
34+
{
35+
u32 gotgctl = dwc2_readl(hsotg, GOTGCTL);
36+
37+
/* Check if A-Session is already in the right state */
38+
if ((valid && (gotgctl & GOTGCTL_ASESVLD)) ||
39+
(!valid && !(gotgctl & GOTGCTL_ASESVLD)))
40+
return -EALREADY;
41+
42+
if (valid)
43+
gotgctl |= GOTGCTL_AVALOVAL | GOTGCTL_VBVALOVAL;
44+
else
45+
gotgctl &= ~(GOTGCTL_AVALOVAL | GOTGCTL_VBVALOVAL);
46+
dwc2_writel(hsotg, gotgctl, GOTGCTL);
47+
48+
return 0;
49+
}
50+
51+
static int dwc2_ovr_bvalid(struct dwc2_hsotg *hsotg, bool valid)
52+
{
53+
u32 gotgctl = dwc2_readl(hsotg, GOTGCTL);
54+
55+
/* Check if B-Session is already in the right state */
56+
if ((valid && (gotgctl & GOTGCTL_BSESVLD)) ||
57+
(!valid && !(gotgctl & GOTGCTL_BSESVLD)))
58+
return -EALREADY;
59+
60+
if (valid)
61+
gotgctl |= GOTGCTL_BVALOVAL | GOTGCTL_VBVALOVAL;
62+
else
63+
gotgctl &= ~(GOTGCTL_BVALOVAL | GOTGCTL_VBVALOVAL);
64+
dwc2_writel(hsotg, gotgctl, GOTGCTL);
65+
66+
return 0;
67+
}
68+
69+
static int dwc2_drd_role_sw_set(struct usb_role_switch *sw, enum usb_role role)
70+
{
71+
struct dwc2_hsotg *hsotg = usb_role_switch_get_drvdata(sw);
72+
unsigned long flags;
73+
74+
/* Skip session not in line with dr_mode */
75+
if ((role == USB_ROLE_DEVICE && hsotg->dr_mode == USB_DR_MODE_HOST) ||
76+
(role == USB_ROLE_HOST && hsotg->dr_mode == USB_DR_MODE_PERIPHERAL))
77+
return -EINVAL;
78+
79+
/* Skip session if core is in test mode */
80+
if (role == USB_ROLE_NONE && hsotg->test_mode) {
81+
dev_dbg(hsotg->dev, "Core is in test mode\n");
82+
return -EBUSY;
83+
}
84+
85+
spin_lock_irqsave(&hsotg->lock, flags);
86+
87+
if (role == USB_ROLE_HOST) {
88+
if (dwc2_ovr_avalid(hsotg, true))
89+
goto unlock;
90+
91+
if (hsotg->dr_mode == USB_DR_MODE_OTG)
92+
/*
93+
* This will raise a Connector ID Status Change
94+
* Interrupt - connID A
95+
*/
96+
dwc2_force_mode(hsotg, true);
97+
} else if (role == USB_ROLE_DEVICE) {
98+
if (dwc2_ovr_bvalid(hsotg, true))
99+
goto unlock;
100+
101+
if (hsotg->dr_mode == USB_DR_MODE_OTG)
102+
/*
103+
* This will raise a Connector ID Status Change
104+
* Interrupt - connID B
105+
*/
106+
dwc2_force_mode(hsotg, false);
107+
108+
/* This clear DCTL.SFTDISCON bit */
109+
dwc2_hsotg_core_connect(hsotg);
110+
} else {
111+
if (dwc2_is_device_mode(hsotg)) {
112+
if (!dwc2_ovr_bvalid(hsotg, false))
113+
/* This set DCTL.SFTDISCON bit */
114+
dwc2_hsotg_core_disconnect(hsotg);
115+
} else {
116+
dwc2_ovr_avalid(hsotg, false);
117+
}
118+
}
119+
120+
unlock:
121+
spin_unlock_irqrestore(&hsotg->lock, flags);
122+
123+
dev_dbg(hsotg->dev, "%s-session valid\n",
124+
role == USB_ROLE_NONE ? "No" :
125+
role == USB_ROLE_HOST ? "A" : "B");
126+
127+
return 0;
128+
}
129+
130+
int dwc2_drd_init(struct dwc2_hsotg *hsotg)
131+
{
132+
struct usb_role_switch_desc role_sw_desc = {0};
133+
struct usb_role_switch *role_sw;
134+
int ret;
135+
136+
if (!device_property_read_bool(hsotg->dev, "usb-role-switch"))
137+
return 0;
138+
139+
role_sw_desc.driver_data = hsotg;
140+
role_sw_desc.fwnode = dev_fwnode(hsotg->dev);
141+
role_sw_desc.set = dwc2_drd_role_sw_set;
142+
role_sw_desc.allow_userspace_control = true;
143+
144+
role_sw = usb_role_switch_register(hsotg->dev, &role_sw_desc);
145+
if (IS_ERR(role_sw)) {
146+
ret = PTR_ERR(role_sw);
147+
dev_err(hsotg->dev,
148+
"failed to register role switch: %d\n", ret);
149+
return ret;
150+
}
151+
152+
hsotg->role_sw = role_sw;
153+
154+
/* Enable override and initialize values */
155+
dwc2_ovr_init(hsotg);
156+
157+
return 0;
158+
}
159+
160+
void dwc2_drd_suspend(struct dwc2_hsotg *hsotg)
161+
{
162+
u32 gintsts, gintmsk;
163+
164+
if (hsotg->role_sw && !hsotg->params.external_id_pin_ctl) {
165+
gintmsk = dwc2_readl(hsotg, GINTMSK);
166+
gintmsk &= ~GINTSTS_CONIDSTSCHNG;
167+
dwc2_writel(hsotg, gintmsk, GINTMSK);
168+
gintsts = dwc2_readl(hsotg, GINTSTS);
169+
dwc2_writel(hsotg, gintsts | GINTSTS_CONIDSTSCHNG, GINTSTS);
170+
}
171+
}
172+
173+
void dwc2_drd_resume(struct dwc2_hsotg *hsotg)
174+
{
175+
u32 gintsts, gintmsk;
176+
177+
if (hsotg->role_sw && !hsotg->params.external_id_pin_ctl) {
178+
gintsts = dwc2_readl(hsotg, GINTSTS);
179+
dwc2_writel(hsotg, gintsts | GINTSTS_CONIDSTSCHNG, GINTSTS);
180+
gintmsk = dwc2_readl(hsotg, GINTMSK);
181+
gintmsk |= GINTSTS_CONIDSTSCHNG;
182+
dwc2_writel(hsotg, gintmsk, GINTMSK);
183+
}
184+
}
185+
186+
void dwc2_drd_exit(struct dwc2_hsotg *hsotg)
187+
{
188+
if (hsotg->role_sw)
189+
usb_role_switch_unregister(hsotg->role_sw);
190+
}

drivers/usb/dwc2/gadget.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3530,7 +3530,7 @@ void dwc2_hsotg_core_init_disconnected(struct dwc2_hsotg *hsotg,
35303530
dwc2_readl(hsotg, DOEPCTL0));
35313531
}
35323532

3533-
static void dwc2_hsotg_core_disconnect(struct dwc2_hsotg *hsotg)
3533+
void dwc2_hsotg_core_disconnect(struct dwc2_hsotg *hsotg)
35343534
{
35353535
/* set the soft-disconnect bit */
35363536
dwc2_set_bit(hsotg, DCTL, DCTL_SFTDISCON);

drivers/usb/dwc2/platform.c

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -317,6 +317,8 @@ static int dwc2_driver_remove(struct platform_device *dev)
317317
if (hsotg->params.activate_stm_id_vb_detection)
318318
regulator_disable(hsotg->usb33d);
319319

320+
dwc2_drd_exit(hsotg);
321+
320322
if (hsotg->ll_hw_enabled)
321323
dwc2_lowlevel_hw_disable(hsotg);
322324

@@ -533,6 +535,13 @@ static int dwc2_driver_probe(struct platform_device *dev)
533535
dwc2_writel(hsotg, ggpio, GGPIO);
534536
}
535537

538+
retval = dwc2_drd_init(hsotg);
539+
if (retval) {
540+
if (retval != -EPROBE_DEFER)
541+
dev_err(hsotg->dev, "failed to initialize dual-role\n");
542+
goto error_init;
543+
}
544+
536545
if (hsotg->dr_mode != USB_DR_MODE_HOST) {
537546
retval = dwc2_gadget_init(hsotg);
538547
if (retval)
@@ -606,6 +615,8 @@ static int __maybe_unused dwc2_suspend(struct device *dev)
606615
if (is_device_mode)
607616
dwc2_hsotg_suspend(dwc2);
608617

618+
dwc2_drd_suspend(dwc2);
619+
609620
if (dwc2->params.activate_stm_id_vb_detection) {
610621
unsigned long flags;
611622
u32 ggpio, gotgctl;
@@ -686,6 +697,8 @@ static int __maybe_unused dwc2_resume(struct device *dev)
686697
/* Need to restore FORCEDEVMODE/FORCEHOSTMODE */
687698
dwc2_force_dr_mode(dwc2);
688699

700+
dwc2_drd_resume(dwc2);
701+
689702
if (dwc2_is_device_mode(dwc2))
690703
ret = dwc2_hsotg_resume(dwc2);
691704

0 commit comments

Comments
 (0)