The patch below does not apply to the 5.10-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to stable@vger.kernel.org.

To reproduce the conflict and resubmit, you may use the following commands:

git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.10.y git checkout FETCH_HEAD git cherry-pick -x 5b8baed4b88132c12010ce6ca1b56f00d122e376 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to 'stable@vger.kernel.org' --in-reply-to '2024072546-saddled-unselect-6d9b@gregkh' --subject-prefix 'PATCH 5.10.y' HEAD^..

Possible dependencies:

5b8baed4b881 ("arm64: dts: qcom: sc7180: Disable SuperSpeed instances in park mode") ebb840b00b7f ("arm64: dts: qcom: sc7180: switch USB+DP QMP PHY to new style of bindings") 2b616f86d51b ("arm64: dts: qcom: sc7180: rename labels for DSI nodes") 4a9f8f8f2ada ("arm64: dts: qcom: Add Acer Aspire 1") 39238382c499 ("arm64: dts: qcom: sc7180: Drop redundant disable in mdp") 43926a3cb191 ("arm64: dts: qcom: sc7180: Don't enable lpass clocks by default") c28d9029f3b6 ("arm64: dts: qcom: sc7180-trogdor-wormdingler: use just "port" in panel") 88904a12fbcb ("arm64: dts: qcom: sc7180-trogdor-quackingstick: use just "port" in panel") 746bda7d9dd9 ("arm64: dts: qcom: sc7180-idp: use just "port" in panel") 603f96d4c9d0 ("arm64: dts: qcom: add initial support for qcom sa8775p-ride") a45d0641d110 ("arm64: dts: qcom: sc7180: Add compat qcom,sc7180-dsi-ctrl") f5b4811e8758 ("arm64: dts: qcom: sc7180: Add trogdor eDP/touchscreen regulator off-on-time") 6be310347c9c ("arm64: dts: qcom: add SA8540P ride(Qdrive-3)") 2372bd2d5be6 ("arm64: dts: qcom: sc7180: change DSI PHY node name to generic one") 95dc5fd99972 ("arm64: dts: qcom: sc7180: Drop redundant phy-names from DSI controller") a10b760b7402 ("arm64: dts: qcom: sc7180-trogdor: Split out keyboard node and describe detachables") 6afcee78b4a4 ("arm64: dts: qcom: sc7180: Add kingoftown dts files") fb69f6adaf88 ("arm64: dts: qcom: sc7180: Add pazquel dts files") 9520fef90049 ("arm64: dts: qcom: sc7180: Add mrbland dts files") c77a3d4a2bfa ("arm64: dts: qcom: sc7180: Add quackingstick dts files")

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From 5b8baed4b88132c12010ce6ca1b56f00d122e376 Mon Sep 17 00:00:00 2001 From: Krishna Kurapati quic_kriskura@quicinc.com Date: Tue, 4 Jun 2024 11:36:58 +0530 Subject: [PATCH] arm64: dts: qcom: sc7180: Disable SuperSpeed instances in park mode

On SC7180, in host mode, it is observed that stressing out controller results in HC died error:

xhci-hcd.12.auto: xHCI host not responding to stop endpoint command xhci-hcd.12.auto: xHCI host controller not responding, assume dead xhci-hcd.12.auto: HC died; cleaning up

And at this instant only restarting the host mode fixes it. Disable SuperSpeed instances in park mode for SC7180 to mitigate this issue.

Reported-by: Doug Anderson dianders@google.com Cc: stable@vger.kernel.org Fixes: 0b766e7fe5a2 ("arm64: dts: qcom: sc7180: Add USB related nodes") Signed-off-by: Krishna Kurapati quic_kriskura@quicinc.com Reviewed-by: Konrad Dybcio konrad.dybcio@linaro.org Link: https://lore.kernel.org/r/20240604060659.1449278-2-quic_kriskura@quicinc.com Signed-off-by: Bjorn Andersson andersson@kernel.org

diff --git a/arch/arm64/boot/dts/qcom/sc7180.dtsi b/arch/arm64/boot/dts/qcom/sc7180.dtsi index 52d074a4fbf3..9ab0c98cac05 100644 --- a/arch/arm64/boot/dts/qcom/sc7180.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180.dtsi @@ -3066,6 +3066,7 @@ usb_1_dwc3: usb@a600000 { iommus = <&apps_smmu 0x540 0>; snps,dis_u2_susphy_quirk; snps,dis_enblslpm_quirk; + snps,parkmode-disable-ss-quirk; phys = <&usb_1_hsphy>, <&usb_1_qmpphy QMP_USB43DP_USB3_PHY>; phy-names = "usb2-phy", "usb3-phy"; maximum-speed = "super-speed";