Skip to content

Commit 82b5992

Browse files
svenpeter42jannau
authored andcommitted
usb: dwc3: Add support for Apple DWC3
As mad as it sounds, the dwc3 controller present on the Apple M1 must be reset and reinitialized whenever a device is unplugged from the root port or when the PHY mode is changed. This is required for at least the following reasons: - The USB2 D+/D- lines are connected through a stateful eUSB2 repeater which in turn is controlled by a variant of the TI TPS6598x USB PD chip. When the USB PD controller detects a hotplug event it resets the eUSB2 repeater. Afterwards, no new device is recognized before the DWC3 core and PHY are reset as well because the eUSB2 repeater and the PHY/dwc3 block disagree about the current state. - It's possible to completely break the dwc3 controller by switching it to device mode and unplugging the cable at just the wrong time. If this happens dwc3 behaves as if no device is connected. CORESOFTRESET will also never clear after it has been set. The only workaround is to trigger a hard reset of the entire dwc3 core with its external reset line. - Whenever the PHY mode is changed (to e.g. transition to DisplayPort alternate mode or USB4) dwc3 has to be shutdown and reinitialized. Otherwise the Type-C port will not be useable until the entire SoC has been reset. All of this can be easily worked around by respecting transitions to USB_ROLE_NONE and making sure the external reset line is asserted when switching roles. Signed-off-by: Sven Peter <sven@svenpeter.dev>
1 parent ab2f3f3 commit 82b5992

3 files changed

Lines changed: 67 additions & 5 deletions

File tree

drivers/usb/dwc3/core.c

Lines changed: 54 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,9 @@ void dwc3_set_prtcap(struct dwc3 *dwc, u32 mode)
143143
dwc->current_dr_role = mode;
144144
}
145145

146+
static void dwc3_core_exit(struct dwc3 *dwc);
147+
static int dwc3_core_init_for_resume(struct dwc3 *dwc);
148+
146149
static void __dwc3_set_mode(struct work_struct *work)
147150
{
148151
struct dwc3 *dwc = work_to_dwc(work);
@@ -162,7 +165,7 @@ static void __dwc3_set_mode(struct work_struct *work)
162165
if (dwc->current_dr_role == DWC3_GCTL_PRTCAP_OTG)
163166
dwc3_otg_update(dwc, 0);
164167

165-
if (!desired_dr_role)
168+
if (!desired_dr_role && !dwc->role_switch_reset_quirk)
166169
goto out;
167170

168171
if (desired_dr_role == dwc->current_dr_role)
@@ -190,13 +193,32 @@ static void __dwc3_set_mode(struct work_struct *work)
190193
break;
191194
}
192195

196+
if (dwc->role_switch_reset_quirk) {
197+
if (dwc->current_dr_role) {
198+
dwc->current_dr_role = 0;
199+
dwc3_core_exit(dwc);
200+
}
201+
202+
if (desired_dr_role) {
203+
ret = dwc3_core_init_for_resume(dwc);
204+
if (ret) {
205+
dev_err(dwc->dev,
206+
"failed to reinitialize core\n");
207+
goto out;
208+
}
209+
} else {
210+
goto out;
211+
}
212+
}
213+
193214
/*
194215
* When current_dr_role is not set, there's no role switching.
195216
* Only perform GCTL.CoreSoftReset when there's DRD role switching.
196217
*/
197-
if (dwc->current_dr_role && ((DWC3_IP_IS(DWC3) ||
218+
if (dwc->role_switch_reset_quirk ||
219+
(dwc->current_dr_role && ((DWC3_IP_IS(DWC3) ||
198220
DWC3_VER_IS_PRIOR(DWC31, 190A)) &&
199-
desired_dr_role != DWC3_GCTL_PRTCAP_OTG)) {
221+
desired_dr_role != DWC3_GCTL_PRTCAP_OTG))) {
200222
reg = dwc3_readl(dwc->regs, DWC3_GCTL);
201223
reg |= DWC3_GCTL_CORESOFTRESET;
202224
dwc3_writel(dwc->regs, DWC3_GCTL, reg);
@@ -1594,6 +1616,18 @@ static int dwc3_core_init_mode(struct dwc3 *dwc)
15941616
ret = dwc3_drd_init(dwc);
15951617
if (ret)
15961618
return dev_err_probe(dev, ret, "failed to initialize dual-role\n");
1619+
1620+
/*
1621+
* If the role switch reset quirk is required the first role
1622+
* switch notification will initialize the core such that we
1623+
* have to shut it down here. Make sure that the __dwc3_set_mode
1624+
* queued by dwc3_drd_init has completed before since it
1625+
* may still try to access MMIO.
1626+
*/
1627+
if (dwc->role_switch_reset_quirk) {
1628+
flush_work(&dwc->drd_work);
1629+
dwc3_core_exit(dwc);
1630+
}
15971631
break;
15981632
default:
15991633
dev_err(dev, "Unsupported mode of operation %d\n", dwc->dr_mode);
@@ -2171,6 +2205,22 @@ static int dwc3_probe(struct platform_device *pdev)
21712205
if (ret)
21722206
goto err_put_psy;
21732207

2208+
if (dev->of_node) {
2209+
if (of_device_is_compatible(dev->of_node, "apple,dwc3")) {
2210+
if (!IS_ENABLED(CONFIG_USB_ROLE_SWITCH) ||
2211+
!IS_ENABLED(CONFIG_USB_DWC3_DUAL_ROLE)) {
2212+
dev_err(dev,
2213+
"Apple DWC3 requires role switch support.\n"
2214+
);
2215+
ret = -EINVAL;
2216+
goto err_put_psy;
2217+
}
2218+
2219+
dwc->dr_mode = USB_DR_MODE_OTG;
2220+
dwc->role_switch_reset_quirk = true;
2221+
}
2222+
}
2223+
21742224
ret = reset_control_deassert(dwc->reset);
21752225
if (ret)
21762226
goto err_put_psy;
@@ -2310,7 +2360,6 @@ static void dwc3_remove(struct platform_device *pdev)
23102360
power_supply_put(dwc->usb_psy);
23112361
}
23122362

2313-
#ifdef CONFIG_PM
23142363
static int dwc3_core_init_for_resume(struct dwc3 *dwc)
23152364
{
23162365
int ret;
@@ -2337,6 +2386,7 @@ static int dwc3_core_init_for_resume(struct dwc3 *dwc)
23372386
return ret;
23382387
}
23392388

2389+
#ifdef CONFIG_PM
23402390
static int dwc3_suspend_common(struct dwc3 *dwc, pm_message_t msg)
23412391
{
23422392
u32 reg;

drivers/usb/dwc3/core.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1152,6 +1152,7 @@ struct dwc3_scratchpad_array {
11521152
* @suspended: set to track suspend event due to U3/L2.
11531153
* @susphy_state: state of DWC3_GUSB2PHYCFG_SUSPHY + DWC3_GUSB3PIPECTL_SUSPHY
11541154
* before PM suspend.
1155+
* @role_switch_reset_quirk: set to force reinitialization after any role switch
11551156
* @imod_interval: set the interrupt moderation interval in 250ns
11561157
* increments or 0 to disable.
11571158
* @max_cfg_eps: current max number of IN eps used across all USB configs.
@@ -1386,6 +1387,8 @@ struct dwc3 {
13861387
unsigned suspended:1;
13871388
unsigned susphy_state:1;
13881389

1390+
unsigned role_switch_reset_quirk:1;
1391+
13891392
u16 imod_interval;
13901393

13911394
int max_cfg_eps;

drivers/usb/dwc3/drd.c

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -464,6 +464,9 @@ static int dwc3_usb_role_switch_set(struct usb_role_switch *sw,
464464
break;
465465
}
466466

467+
if (dwc->role_switch_reset_quirk && role == USB_ROLE_NONE)
468+
mode = 0;
469+
467470
dwc3_set_mode(dwc, mode);
468471
return 0;
469472
}
@@ -492,6 +495,10 @@ static enum usb_role dwc3_usb_role_switch_get(struct usb_role_switch *sw)
492495
role = USB_ROLE_DEVICE;
493496
break;
494497
}
498+
499+
if (dwc->role_switch_reset_quirk && !dwc->current_dr_role)
500+
role = USB_ROLE_NONE;
501+
495502
spin_unlock_irqrestore(&dwc->lock, flags);
496503
return role;
497504
}
@@ -502,7 +509,9 @@ static int dwc3_setup_role_switch(struct dwc3 *dwc)
502509
u32 mode;
503510

504511
dwc->role_switch_default_mode = usb_get_role_switch_default_mode(dwc->dev);
505-
if (dwc->role_switch_default_mode == USB_DR_MODE_HOST) {
512+
if (dwc->role_switch_reset_quirk) {
513+
mode = 0;
514+
} else if (dwc->role_switch_default_mode == USB_DR_MODE_HOST) {
506515
mode = DWC3_GCTL_PRTCAP_HOST;
507516
} else {
508517
dwc->role_switch_default_mode = USB_DR_MODE_PERIPHERAL;

0 commit comments

Comments
 (0)