From: Greg KH <gregkh@linuxfoundation.org>
To: Joonhoe Kim <26rote@gmail.com>
Cc: Thinh.Nguyen@synopsys.com, robh@kernel.org, krzk+dt@kernel.org,
conor+dt@kernel.org, andersson@kernel.org,
konradybcio@kernel.org, heikki.krogerus@linux.intel.com,
abel.vesa@oss.qualcomm.com, abelvesa@kernel.org,
wesley.cheng@oss.qualcomm.com, krishna.kurapati@oss.qualcomm.com,
konrad.dybcio@oss.qualcomm.com,
dmitry.baryshkov@oss.qualcomm.com, neil.armstrong@linaro.org,
val@packett.cool, balaji.kalkonda@oss.qualcomm.com,
tvlad744@gmail.com, effeffe99@gmail.com,
prashanth.k@oss.qualcomm.com, yongxing.mou@oss.qualcomm.com,
peter.chen@oss.qualcomm.com, tapas.rana@oss.qualcomm.com,
vkoul@kernel.org, linux-phy@lists.infradead.org,
linux-arm-msm@vger.kernel.org, linux-usb@vger.kernel.org,
devicetree@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH v4 2/2] usb: dwc3: qcom: Use the UTMI clock as PIPE clock in DisplayPort-only modes
Date: Fri, 20 Nov 2026 16:07:21 +0100 [thread overview]
Message-ID: <2026112017-flyover-grape-cee7@gregkh> (raw)
In-Reply-To: <20261119124558.1548-3-26rote@gmail.com>
On Thu, Nov 19, 2026 at 09:45:58PM +0900, Joonhoe Kim wrote:
> With DisplayPort pin assignment C or E the QMP USB3-DP combo PHY gives
> all four lanes to DisplayPort and powers its USB PCS down. The
> controller can still run USB 2.0, e.g. for the hub of a USB-C monitor.
> Keeping the pipe clock branch enabled, as commit f546912bcac6 ("phy:
> qcom: qmp-combo: Move pipe_clk on/off to common") does, is not enough on
> Kaanapali. The next xHCI reset in this mode times out ("Host halt
> failed, -110"), and USB stops working until the cable is replugged.
>
> Register the glue as a Type-C mode switch when the node has the
> "mode-switch" property. Select the UTMI clock as PIPE clock in DP-only
> modes, as "qcom,select-utmi-as-pipe-clk" does statically.
> typec_mux_set() calls the switches in the order of the connector's
> ports. Port 0 (HS, the controller) comes before port 1 (SS, the PHY).
> So the controller switches before the PHY powers its USB side down.
>
> The safe and USB states can come with the DisplayPort altmode, so only
> the modal states with the DisplayPort SVID count as DisplayPort. Pin
> assignment C or E always selects the UTMI clock. Go back to the PIPE
> clock when a USB state follows the safe state. A change from C/E to
> D/F while DisplayPort is active keeps the UTMI clock: the PHY may keep
> DP-only mode then, and the UTMI clock still runs USB 2.0 if it does
> not.
>
> Read the selected clock back from QSCRATCH, as on some SoCs it loses
> its contents in system suspend.
>
> The mux callback does not resume the glue. From the start of a
> runtime or system suspend until the core has resumed, the callback only
> records the state. The resume paths apply it before the core resumes,
> and again once the core has resumed or when the suspend fails.
>
> The mux needs the Type-C class, so depend on TYPEC || TYPEC=n as
> PHY_QCOM_QMP_COMBO does, and do not register the mux without it. With
> the arm64 defconfig (TYPEC=m) this builds the glue, including
> dwc3-qcom-legacy, as a module.
>
> Signed-off-by: Joonhoe Kim <26rote@gmail.com>
> ---
> v4:
> - mutex_lock()/mutex_unlock() where nothing returns early (Krzysztof)
> - Leave the probe code as it was apart from the new argument (Krzysztof)
> v3:
> - Rebase on Filippo Falezza's "usb: dwc3: qcom: Restore UTMI PIPE clock
> on resume" and use its utmi_as_pipe_clk
> - Compare with the clock selected in QSCRATCH, not a cached value
> - Check the safe state before the altmode: the safe and USB states can
> come with the DisplayPort altmode (Sashiko)
> - Always select the UTMI clock for pin assignment C or E (Sashiko)
> - Do not resume the glue from the mux callback. From the start of a
> runtime or system suspend until the core has resumed, only record the
> state; apply it before and after the core resumes, and when the
> suspend fails (Sashiko)
> - Leave the clock select alone on nodes without a mux
> - Only record the state once remove has started
> v2:
> - Switch back to the PIPE clock from the mux callback, not on a role
> change (Sashiko)
> - Keep dp_only while DisplayPort is active, as the PHY keeps its mode
> - Defer the clock switch to resume while suspended for system sleep
> - Depend on TYPEC || TYPEC=n, skip the mux without CONFIG_TYPEC (Sashiko)
>
> drivers/usb/dwc3/Kconfig | 1 +
> drivers/usb/dwc3/dwc3-qcom.c | 150 ++++++++++++++++++++++++++++++++---
> 2 files changed, 138 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/usb/dwc3/Kconfig b/drivers/usb/dwc3/Kconfig
> index 18169727a..282f366de 100644
> --- a/drivers/usb/dwc3/Kconfig
> +++ b/drivers/usb/dwc3/Kconfig
> @@ -132,6 +132,7 @@ config USB_DWC3_QCOM
> depends on ARCH_QCOM || COMPILE_TEST
> depends on EXTCON || !EXTCON
> depends on OF
> + depends on TYPEC || TYPEC=n
> default USB_DWC3
> help
> Some Qualcomm SoCs use DesignWare Core IP for USB2/3
> diff --git a/drivers/usb/dwc3/dwc3-qcom.c b/drivers/usb/dwc3/dwc3-qcom.c
> index f4ce035d4..d80c7ee39 100644
> --- a/drivers/usb/dwc3/dwc3-qcom.c
> +++ b/drivers/usb/dwc3/dwc3-qcom.c
> @@ -19,6 +19,9 @@
> #include <linux/iopoll.h>
> #include <linux/usb/hcd.h>
> #include <linux/usb.h>
> +#include <linux/usb/typec_altmode.h>
> +#include <linux/usb/typec_dp.h>
> +#include <linux/usb/typec_mux.h>
> #include "core.h"
> #include "glue.h"
>
> @@ -82,6 +85,13 @@ struct dwc3_qcom {
> bool is_suspended;
> bool pm_suspended;
> bool utmi_as_pipe_clk;
> + bool dp_active;
> + bool dp_only;
> + bool mux_deferred;
> + bool mode_switch;
> + /* protects dp_active, dp_only and mux_deferred */
> + struct mutex pipe_clk_lock;
> + struct typec_mux_dev *mux;
> struct icc_path *icc_path_ddr;
> struct icc_path *icc_path_apps;
>
> @@ -336,16 +346,19 @@ static void dwc3_qcom_enable_interrupts(struct dwc3_qcom *qcom)
> dwc3_qcom_enable_port_interrupts(&qcom->ports[i]);
> }
>
> -static void dwc3_qcom_select_utmi_clk(struct dwc3_qcom *qcom)
> +static void dwc3_qcom_select_utmi_clk(struct dwc3_qcom *qcom, bool utmi)
What does that bool mean? That's going to be a pain, please make this 2
functions so you know what is happening when you call it.
> {
> - /* Configure dwc3 to use UTMI clock as PIPE clock not present */
> dwc3_qcom_setbits(qcom->qscratch_base, QSCRATCH_GENERAL_CFG,
> PIPE_UTMI_CLK_DIS);
>
> usleep_range(100, 1000);
>
> - dwc3_qcom_setbits(qcom->qscratch_base, QSCRATCH_GENERAL_CFG,
> - PIPE_UTMI_CLK_SEL | PIPE3_PHYSTATUS_SW);
> + if (utmi)
> + dwc3_qcom_setbits(qcom->qscratch_base, QSCRATCH_GENERAL_CFG,
> + PIPE_UTMI_CLK_SEL | PIPE3_PHYSTATUS_SW);
> + else
> + dwc3_qcom_clrbits(qcom->qscratch_base, QSCRATCH_GENERAL_CFG,
> + PIPE_UTMI_CLK_SEL | PIPE3_PHYSTATUS_SW);
>
> usleep_range(100, 1000);
>
> @@ -353,6 +366,39 @@ static void dwc3_qcom_select_utmi_clk(struct dwc3_qcom *qcom)
> PIPE_UTMI_CLK_DIS);
> }
>
> +static bool dwc3_qcom_utmi_clk_selected(struct dwc3_qcom *qcom)
> +{
> + return readl(qcom->qscratch_base + QSCRATCH_GENERAL_CFG) &
> + PIPE_UTMI_CLK_SEL;
> +}
> +
> +static void dwc3_qcom_update_pipe_clk(struct dwc3_qcom *qcom)
> +{
> + lockdep_assert_held(&qcom->pipe_clk_lock);
> +
> + if (qcom->mode_switch && !qcom->utmi_as_pipe_clk &&
> + qcom->dp_only != dwc3_qcom_utmi_clk_selected(qcom))
> + dwc3_qcom_select_utmi_clk(qcom, qcom->dp_only);
> +}
> +
> +static void dwc3_qcom_defer_mux(struct dwc3_qcom *qcom)
> +{
> + mutex_lock(&qcom->pipe_clk_lock);
> + qcom->mux_deferred = true;
> + mutex_unlock(&qcom->pipe_clk_lock);
> +}
> +
> +static void dwc3_qcom_undefer_mux(struct dwc3_qcom *qcom)
> +{
> + guard(mutex)(&qcom->pipe_clk_lock);
> +
> + if (qcom->is_suspended)
> + return;
> +
> + qcom->mux_deferred = false;
> + dwc3_qcom_update_pipe_clk(qcom);
> +}
> +
> static int dwc3_qcom_suspend(struct dwc3_qcom *qcom, bool wakeup)
> {
> u32 val;
> @@ -413,7 +459,11 @@ static int dwc3_qcom_resume(struct dwc3_qcom *qcom, bool wakeup)
> * clock ("failed to enable ep0out").
> */
> if (qcom->utmi_as_pipe_clk)
> - dwc3_qcom_select_utmi_clk(qcom);
> + dwc3_qcom_select_utmi_clk(qcom, true);
> +
> + mutex_lock(&qcom->pipe_clk_lock);
Why no guard() use here?
> + dwc3_qcom_update_pipe_clk(qcom);
> + mutex_unlock(&qcom->pipe_clk_lock);
>
> /* Clear existing events from PHY related to L2 in/out */
> for (i = 0; i < qcom->num_ports; i++) {
> @@ -446,6 +496,54 @@ static irqreturn_t qcom_dwc3_resume_irq(int irq, void *data)
> return IRQ_HANDLED;
> }
>
> +static int dwc3_qcom_mux_set(struct typec_mux_dev *mux,
> + struct typec_mux_state *state)
> +{
> + struct dwc3_qcom *qcom = typec_mux_get_drvdata(mux);
> + bool dp = state->mode >= TYPEC_STATE_MODAL && state->alt &&
> + state->alt->svid == USB_TYPEC_DP_SID;
> +
> + mutex_lock(&qcom->pipe_clk_lock);
guard()?
prev parent reply other threads:[~2026-11-20 15:07 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-19 12:45 [PATCH v4 0/2] usb: dwc3: qcom: Keep USB 2.0 working " Joonhoe Kim
2026-11-19 12:45 ` [PATCH v4 1/2] dt-bindings: usb: qcom,snps-dwc3: Add mode-switch Joonhoe Kim
2026-11-19 12:45 ` [PATCH v4 2/2] usb: dwc3: qcom: Use the UTMI clock as PIPE clock in DisplayPort-only modes Joonhoe Kim
2026-11-20 15:07 ` Greg KH [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=2026112017-flyover-grape-cee7@gregkh \
--to=gregkh@linuxfoundation.org \
--cc=26rote@gmail.com \
--cc=Thinh.Nguyen@synopsys.com \
--cc=abel.vesa@oss.qualcomm.com \
--cc=abelvesa@kernel.org \
--cc=andersson@kernel.org \
--cc=balaji.kalkonda@oss.qualcomm.com \
--cc=conor+dt@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=dmitry.baryshkov@oss.qualcomm.com \
--cc=effeffe99@gmail.com \
--cc=heikki.krogerus@linux.intel.com \
--cc=konrad.dybcio@oss.qualcomm.com \
--cc=konradybcio@kernel.org \
--cc=krishna.kurapati@oss.qualcomm.com \
--cc=krzk+dt@kernel.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-phy@lists.infradead.org \
--cc=linux-usb@vger.kernel.org \
--cc=neil.armstrong@linaro.org \
--cc=peter.chen@oss.qualcomm.com \
--cc=prashanth.k@oss.qualcomm.com \
--cc=robh@kernel.org \
--cc=tapas.rana@oss.qualcomm.com \
--cc=tvlad744@gmail.com \
--cc=val@packett.cool \
--cc=vkoul@kernel.org \
--cc=wesley.cheng@oss.qualcomm.com \
--cc=yongxing.mou@oss.qualcomm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®