[PATCH v19 6/6] usb: dwc3: rockchip: add USBDP PHY reset quirk
From: Sebastian Reichel
Date: Fri Nov 13 2026 - 20:03:37 EST
On recent Rockchip platforms (at least RK3588 & RK3576), DWC3 IP is used
with a USBDP PHY providing USB3 and DP. This PHY needs to be reset when
the mode changes, which may happen when plugging in different USB-C
devices.
If the USBDP PHY resets with the DWC3 IP running, its internal state
corrupts resulting in the USBDP PHY not being able to lock some PLL
clocks, which effectively renders USB3 unusable.
To fix the issue this adds a Rockchip USBDP specific quirk, which will
assert PHYSOFTRST before the actual PHY is disabled and will deassert it
once the PHY returns.
The quirk is skipped while DWC3 is suspended, as its registers may be
inaccessible and the device being suspended is a quirk in itself (the
vendor BSP enables runtime PM with very short autosuspend as a
workaround for this issue). Thus the code just ensures the PM state
does not change while the PHY reset is going on.
Note, that the same platforms also use DWC3 with a different PHY
(rockchip-naneng-combphy), so the PHY calls are protected by a
driver name check.
Signed-off-by: Sebastian Reichel <sebastian.reichel@xxxxxxxxxxxxx>
---
drivers/usb/dwc3/Kconfig | 1 +
drivers/usb/dwc3/dwc3-rockchip.c | 154 +++++++++++++++++++++++++++++++++++++--
drivers/usb/dwc3/trace.c | 3 +
3 files changed, 153 insertions(+), 5 deletions(-)
diff --git a/drivers/usb/dwc3/Kconfig b/drivers/usb/dwc3/Kconfig
index 3c120ea9746d..c86c1ac293bf 100644
--- a/drivers/usb/dwc3/Kconfig
+++ b/drivers/usb/dwc3/Kconfig
@@ -193,6 +193,7 @@ config USB_DWC3_OCTEON
config USB_DWC3_ROCKCHIP
tristate "Rockchip DWC3 Platform Driver"
depends on ARCH_ROCKCHIP || COMPILE_TEST
+ depends on PHY_ROCKCHIP_USBDP || !PHY_ROCKCHIP_USBDP
depends on OF
default USB_DWC3
help
diff --git a/drivers/usb/dwc3/dwc3-rockchip.c b/drivers/usb/dwc3/dwc3-rockchip.c
index 4129aefd6a8b..25bf2794c1fc 100644
--- a/drivers/usb/dwc3/dwc3-rockchip.c
+++ b/drivers/usb/dwc3/dwc3-rockchip.c
@@ -2,11 +2,120 @@
/* Copyright (c) 2026, Collabora Ltd. */
#include <linux/module.h>
#include <linux/platform_device.h>
+#include <linux/phy/rockchip-usbdp.h>
#include <linux/pm_runtime.h>
+#include <linux/wait.h>
#include "glue.h"
+#include "io.h"
struct dwc3_rockchip {
struct dwc3 dwc;
+ wait_queue_head_t phy_reset_wq;
+ u8 phy_reset_active;
+ bool pm_suspended;
+};
+
+static inline struct dwc3_rockchip *to_dwc3_rockchip(struct dwc3 *dwc)
+{
+ return container_of(dwc, struct dwc3_rockchip, dwc);
+}
+
+static void dwc3_rockchip_set_suspended(struct dwc3_rockchip *dwc_rk, bool suspended)
+{
+ struct dwc3 *dwc = &dwc_rk->dwc;
+
+ guard(spinlock_irq)(&dwc->lock);
+
+ wait_event_lock_irq(dwc_rk->phy_reset_wq, !dwc_rk->phy_reset_active, dwc->lock);
+ dwc_rk->pm_suspended = suspended;
+}
+
+static void dwc3_rockchip_phy_pre_reset(struct dwc3_rockchip *dwc_rk, int port)
+{
+ struct dwc3 *dwc = &dwc_rk->dwc;
+ u32 reg;
+
+ guard(spinlock_irqsave)(&dwc->lock);
+
+ dwc_rk->phy_reset_active |= BIT(port);
+
+ /* DWC3 being suspended also works as a quirk */
+ if (dwc_rk->pm_suspended)
+ return;
+
+ /*
+ * Assert USB3 PHY soft reset within DWC3 before the external
+ * PHY resets. This disconnects the PIPE interface, preventing
+ * the DWC3 from interfering with PHY reinitialization and
+ * avoiding LCPLL lock failures.
+ */
+ reg = dwc3_readl(dwc, DWC3_GUSB3PIPECTL(port));
+ reg |= DWC3_GUSB3PIPECTL_PHYSOFTRST;
+ dwc3_writel(dwc, DWC3_GUSB3PIPECTL(port), reg);
+}
+
+static void dwc3_rockchip_phy_post_reset(struct dwc3_rockchip *dwc_rk, int port)
+{
+ struct dwc3 *dwc = &dwc_rk->dwc;
+ u32 reg;
+
+ scoped_guard(spinlock_irqsave, &dwc->lock) {
+ dwc_rk->phy_reset_active &= ~BIT(port);
+
+ if (!dwc_rk->pm_suspended) {
+ reg = dwc3_readl(dwc, DWC3_GUSB3PIPECTL(port));
+ reg &= ~DWC3_GUSB3PIPECTL_PHYSOFTRST;
+ dwc3_writel(dwc, DWC3_GUSB3PIPECTL(port), reg);
+ }
+ }
+
+ wake_up(&dwc_rk->phy_reset_wq);
+}
+
+static void dwc3_rockchip_phy_reset(void *data, int port, bool pre)
+{
+ struct dwc3_rockchip *dwc_rk = data;
+
+ if (pre)
+ dwc3_rockchip_phy_pre_reset(dwc_rk, port);
+ else
+ dwc3_rockchip_phy_post_reset(dwc_rk, port);
+}
+
+static void dwc3_rockchip_phy_unregister_reset_handler(void *data)
+{
+ struct dwc3_rockchip *dwc_rk = data;
+ struct dwc3 *dwc = &dwc_rk->dwc;
+ int i;
+
+ for (i = 0; i < dwc->num_usb3_ports; i++) {
+ struct phy *phy = dwc->usb3_generic_phy[i];
+
+ if (phy && !strcmp(dev_driver_string(phy->dev.parent), "rockchip-usbdp-phy"))
+ rk_udphy_unregister_reset_handler(phy);
+ }
+
+ WARN_ON(dwc_rk->phy_reset_active);
+}
+
+static int dwc3_rockchip_phy_register_reset_handler(struct dwc3 *dwc)
+{
+ struct dwc3_rockchip *dwc_rk = to_dwc3_rockchip(dwc);
+ int i;
+
+ for (i = 0; i < dwc->num_usb3_ports; i++) {
+ struct phy *phy = dwc->usb3_generic_phy[i];
+
+ if (phy && !strcmp(dev_driver_string(phy->dev.parent), "rockchip-usbdp-phy"))
+ rk_udphy_register_reset_handler(phy, dwc3_rockchip_phy_reset, dwc_rk, i);
+ }
+
+ return devm_add_action_or_reset(dwc->dev,
+ dwc3_rockchip_phy_unregister_reset_handler, dwc_rk);
+}
+
+static const struct dwc3_glue_ops dwc3_rockchip_glue_ops = {
+ .post_phy_registration = dwc3_rockchip_phy_register_reset_handler,
};
static int dwc3_rockchip_probe(struct platform_device *pdev)
@@ -25,8 +134,9 @@ static int dwc3_rockchip_probe(struct platform_device *pdev)
if (!dwc_rk)
return -ENOMEM;
+ init_waitqueue_head(&dwc_rk->phy_reset_wq);
dwc_rk->dwc.dev = &pdev->dev;
- dwc_rk->dwc.glue_ops = NULL;
+ dwc_rk->dwc.glue_ops = &dwc3_rockchip_glue_ops;
probe_data.dwc = &dwc_rk->dwc;
probe_data.res = res;
@@ -42,12 +152,29 @@ static void dwc3_rockchip_remove(struct platform_device *pdev)
static int dwc3_rockchip_runtime_suspend(struct device *dev)
{
- return dwc3_runtime_suspend(dev_get_drvdata(dev));
+ struct dwc3 *dwc = dev_get_drvdata(dev);
+ struct dwc3_rockchip *dwc_rk = to_dwc3_rockchip(dwc);
+ int ret;
+
+ ret = dwc3_runtime_suspend(dwc);
+ if (!ret)
+ dwc3_rockchip_set_suspended(dwc_rk, true);
+
+ return ret;
}
static int dwc3_rockchip_runtime_resume(struct device *dev)
{
- return dwc3_runtime_resume(dev_get_drvdata(dev));
+ struct dwc3 *dwc = dev_get_drvdata(dev);
+ struct dwc3_rockchip *dwc_rk = to_dwc3_rockchip(dwc);
+ int ret;
+
+ dwc3_rockchip_set_suspended(dwc_rk, false);
+ ret = dwc3_runtime_resume(dwc);
+ if (ret)
+ dwc3_rockchip_set_suspended(dwc_rk, true);
+
+ return ret;
}
static int dwc3_rockchip_runtime_idle(struct device *dev)
@@ -57,12 +184,29 @@ static int dwc3_rockchip_runtime_idle(struct device *dev)
static int dwc3_rockchip_suspend(struct device *dev)
{
- return dwc3_pm_suspend(dev_get_drvdata(dev));
+ struct dwc3 *dwc = dev_get_drvdata(dev);
+ struct dwc3_rockchip *dwc_rk = to_dwc3_rockchip(dwc);
+ int ret;
+
+ ret = dwc3_pm_suspend(dwc);
+ if (!ret)
+ dwc3_rockchip_set_suspended(dwc_rk, true);
+
+ return ret;
}
static int dwc3_rockchip_resume(struct device *dev)
{
- return dwc3_pm_resume(dev_get_drvdata(dev));
+ struct dwc3 *dwc = dev_get_drvdata(dev);
+ struct dwc3_rockchip *dwc_rk = to_dwc3_rockchip(dwc);
+ int ret;
+
+ dwc3_rockchip_set_suspended(dwc_rk, false);
+ ret = dwc3_pm_resume(dwc);
+ if (ret)
+ dwc3_rockchip_set_suspended(dwc_rk, true);
+
+ return ret;
}
static void dwc3_rockchip_complete(struct device *dev)
diff --git a/drivers/usb/dwc3/trace.c b/drivers/usb/dwc3/trace.c
index 088995885678..8c4e2a7b142e 100644
--- a/drivers/usb/dwc3/trace.c
+++ b/drivers/usb/dwc3/trace.c
@@ -9,3 +9,6 @@
#define CREATE_TRACE_POINTS
#include "trace.h"
+
+EXPORT_TRACEPOINT_SYMBOL_GPL(dwc3_readl);
+EXPORT_TRACEPOINT_SYMBOL_GPL(dwc3_writel);
--
2.53.0