FAILED: patch "[PATCH] arm64: dts: qcom: sm6115: Disable SS instance in Parkmode for" failed to apply to 6.6-stable tree

The patch below does not apply to the 6.6-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 <[email protected]>.

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-6.6.y
git checkout FETCH_HEAD
git cherry-pick -x 074992a1163295d717faa21d1818c4c19ef6e676
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2024072522-properly-jackpot-9fed@gregkh' --subject-prefix 'PATCH 6.6.y' HEAD^..

Possible dependencies:

074992a11632 ("arm64: dts: qcom: sm6115: Disable SS instance in Parkmode for USB") a06a2f12f9e2 ("arm64: dts: qcom: qrb4210-rb2: enable USB-C port handling") 7e3a1f6470f7 ("arm64: dts: qcom: sm6115: drop pipe clock selection") b3eaa47395b9 ("arm64: dts: qcom: sm6115: Hook up interconnects") f6874706e311 ("arm64: dts: qcom: sm6115: switch UFS QMP PHY to new style of bindings") ff753723bf39 ("arm64: dts: qcom: qrb4210-rb2: Enable MPSS and Wi-Fi") cab60b166575 ("arm64: dts: qcom: qrb4210-rb2: Enable bluetooth") ba5f5610841f ("arm64: dts: qcom: sm6115: Add UART3")
27c2ca90e2f3 ("arm64: dts: qcom: qrb4210-rb2: don't force usb peripheral mode")

thanks,

greg k-h

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

From 074992a1163295d717faa21d1818c4c19ef6e676 Mon Sep 17 00:00:00 2001
From: Krishna Kurapati <[email protected]>
Date: Thu, 4 Jul 2024 20:58:45 +0530
Subject: [PATCH] arm64: dts: qcom: sm6115: Disable SS instance in Parkmode for
USB

For Gen-1 targets like SM6115, it is seen that stressing out the controller in host mode 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 instance in park mode for SM6115 to mitigate this issue.

index ac5f071a8db3..aec6ca5941c2 100644
@@ -1659,6 +1659,7 @@ usb_dwc3: usb@4e00000 {
 				snps,has-lpm-erratum;
 				snps,hird-threshold = /bits/ 8 <0x10>;
 				snps,usb3_lpm_capable;
+				snps,parkmode-disable-ss-quirk;
 
 				usb-role-switch;