The patch below does not apply to the 5.15-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.15.y git checkout FETCH_HEAD git cherry-pick -x 3d930f1750ce30a6c36dbc71f8ff7e20322b94d7 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to 'stable@vger.kernel.org' --in-reply-to '2024072515-shifting-impulse-0512@gregkh' --subject-prefix 'PATCH 5.15.y' HEAD^..
Possible dependencies:
3d930f1750ce ("arm64: dts: qcom: sc7280: Disable SuperSpeed instances in park mode") 36888ed83f99 ("arm64: dts: qcom: sc7280: switch USB+DP QMP PHY to new style of bindings") 70c4a1ca13b3 ("arm64: dts: qcom: sc7280: link usb3_phy_wrapper_gcc_usb30_pipe_clk") 531c738fb360 ("arm64: dts: qcom: sc7280: drop PCIe PHY clock index") fc6b1225d20d ("arm64: dts: qcom: sc7280: Add Display Port node") 25940788d170 ("arm64: dts: qcom: sc7280: add edp display dt nodes") 43137272f0bc ("arm64: dts: qcom: sc7280: Add DSI display nodes") fcb68dfda5cb ("arm64: dts: qcom: sc7280: add display dt nodes") bd7d507935ca ("arm64: dts: qcom: sc7280: Add pcie clock support") 92e0ee9f83b3 ("arm64: dts: qcom: sc7280: Add PCIe and PHY related nodes") 6b3207dfebdf ("arm64: dts: qcom: sc7280: Use QMP property to control load state") 7720ea001b52 ("arm64: dts: qcom: sc7280: Add QSPI node") 425f30cc843c ("arm64: dts: qcom: sc7280: fix display port phy reg property")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 3d930f1750ce30a6c36dbc71f8ff7e20322b94d7 Mon Sep 17 00:00:00 2001 From: Krishna Kurapati quic_kriskura@quicinc.com Date: Tue, 4 Jun 2024 11:36:59 +0530 Subject: [PATCH] arm64: dts: qcom: sc7280: Disable SuperSpeed instances in park mode
On SC7280, 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 SC7280 to mitigate this issue.
Reported-by: Doug Anderson dianders@google.com Cc: stable@vger.kernel.org Fixes: bb9efa59c665 ("arm64: dts: qcom: sc7280: 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-3-quic_kriskura@quicinc.com Signed-off-by: Bjorn Andersson andersson@kernel.org
diff --git a/arch/arm64/boot/dts/qcom/sc7280.dtsi b/arch/arm64/boot/dts/qcom/sc7280.dtsi index c3aaa09b8187..ba43fba2c551 100644 --- a/arch/arm64/boot/dts/qcom/sc7280.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7280.dtsi @@ -4232,6 +4232,7 @@ usb_1_dwc3: usb@a600000 { iommus = <&apps_smmu 0xe0 0x0>; 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";