From 74d85439993ee9a59d8cdb0afdc968dd63a0cbea Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 25 Jul 2024 14:52:06 +0200 Subject: [PATCH] 6.6-stable patches added patches: arm64-dts-qcom-ipq6018-disable-ss-instance-in-parkmode-for-usb.patch arm64-dts-qcom-msm8996-disable-ss-instance-in-parkmode-for-usb.patch arm64-dts-qcom-qrb4210-rb2-switch-i2c2-to-i2c-gpio.patch arm64-dts-qcom-sdm630-disable-ss-instance-in-parkmode-for-usb.patch arm64-dts-qcom-sm6350-disable-ss-instance-in-parkmode-for-usb.patch --- ...able-ss-instance-in-parkmode-for-usb.patch | 40 +++++++++++++ ...able-ss-instance-in-parkmode-for-usb.patch | 40 +++++++++++++ ...-qrb4210-rb2-switch-i2c2-to-i2c-gpio.patch | 59 +++++++++++++++++++ ...able-ss-instance-in-parkmode-for-usb.patch | 40 +++++++++++++ ...able-ss-instance-in-parkmode-for-usb.patch | 40 +++++++++++++ queue-6.6/series | 5 ++ 6 files changed, 224 insertions(+) create mode 100644 queue-6.6/arm64-dts-qcom-ipq6018-disable-ss-instance-in-parkmode-for-usb.patch create mode 100644 queue-6.6/arm64-dts-qcom-msm8996-disable-ss-instance-in-parkmode-for-usb.patch create mode 100644 queue-6.6/arm64-dts-qcom-qrb4210-rb2-switch-i2c2-to-i2c-gpio.patch create mode 100644 queue-6.6/arm64-dts-qcom-sdm630-disable-ss-instance-in-parkmode-for-usb.patch create mode 100644 queue-6.6/arm64-dts-qcom-sm6350-disable-ss-instance-in-parkmode-for-usb.patch diff --git a/queue-6.6/arm64-dts-qcom-ipq6018-disable-ss-instance-in-parkmode-for-usb.patch b/queue-6.6/arm64-dts-qcom-ipq6018-disable-ss-instance-in-parkmode-for-usb.patch new file mode 100644 index 00000000000..e99c0c42c4f --- /dev/null +++ b/queue-6.6/arm64-dts-qcom-ipq6018-disable-ss-instance-in-parkmode-for-usb.patch @@ -0,0 +1,40 @@ +From 4ae4837871ee8c8b055cf8131f65d31ee4208fa0 Mon Sep 17 00:00:00 2001 +From: Krishna Kurapati +Date: Thu, 4 Jul 2024 20:58:41 +0530 +Subject: arm64: dts: qcom: ipq6018: Disable SS instance in Parkmode for USB + +From: Krishna Kurapati + +commit 4ae4837871ee8c8b055cf8131f65d31ee4208fa0 upstream. + +For Gen-1 targets like IPQ6018, 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 IPQ6018 to mitigate this issue. + +Cc: stable@vger.kernel.org +Fixes: 20bb9e3dd2e4 ("arm64: dts: qcom: ipq6018: add usb3 DT description") +Signed-off-by: Krishna Kurapati +Reviewed-by: Konrad Dybcio +Link: https://lore.kernel.org/r/20240704152848.3380602-2-quic_kriskura@quicinc.com +Signed-off-by: Bjorn Andersson +Signed-off-by: Greg Kroah-Hartman +--- + arch/arm64/boot/dts/qcom/ipq6018.dtsi | 1 + + 1 file changed, 1 insertion(+) + +--- a/arch/arm64/boot/dts/qcom/ipq6018.dtsi ++++ b/arch/arm64/boot/dts/qcom/ipq6018.dtsi +@@ -579,6 +579,7 @@ + clocks = <&xo>; + clock-names = "ref"; + tx-fifo-resize; ++ snps,parkmode-disable-ss-quirk; + snps,is-utmi-l1-suspend; + snps,hird-threshold = /bits/ 8 <0x0>; + snps,dis_u2_susphy_quirk; diff --git a/queue-6.6/arm64-dts-qcom-msm8996-disable-ss-instance-in-parkmode-for-usb.patch b/queue-6.6/arm64-dts-qcom-msm8996-disable-ss-instance-in-parkmode-for-usb.patch new file mode 100644 index 00000000000..27dea2ae9c6 --- /dev/null +++ b/queue-6.6/arm64-dts-qcom-msm8996-disable-ss-instance-in-parkmode-for-usb.patch @@ -0,0 +1,40 @@ +From 44ea1ae3cf95db97e10d6ce17527948121f1dd4b Mon Sep 17 00:00:00 2001 +From: Krishna Kurapati +Date: Thu, 4 Jul 2024 20:58:47 +0530 +Subject: arm64: dts: qcom: msm8996: Disable SS instance in Parkmode for USB + +From: Krishna Kurapati + +commit 44ea1ae3cf95db97e10d6ce17527948121f1dd4b upstream. + +For Gen-1 targets like MSM8996, 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 MSM8996 to mitigate this issue. + +Cc: stable@vger.kernel.org +Fixes: 1e39255ed29d ("arm64: dts: msm8996: Add device node for qcom,dwc3") +Signed-off-by: Krishna Kurapati +Reviewed-by: Konrad Dybcio +Link: https://lore.kernel.org/r/20240704152848.3380602-8-quic_kriskura@quicinc.com +Signed-off-by: Bjorn Andersson +Signed-off-by: Greg Kroah-Hartman +--- + arch/arm64/boot/dts/qcom/msm8996.dtsi | 1 + + 1 file changed, 1 insertion(+) + +--- a/arch/arm64/boot/dts/qcom/msm8996.dtsi ++++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi +@@ -3082,6 +3082,7 @@ + snps,dis_u2_susphy_quirk; + snps,dis_enblslpm_quirk; + snps,is-utmi-l1-suspend; ++ snps,parkmode-disable-ss-quirk; + tx-fifo-resize; + }; + }; diff --git a/queue-6.6/arm64-dts-qcom-qrb4210-rb2-switch-i2c2-to-i2c-gpio.patch b/queue-6.6/arm64-dts-qcom-qrb4210-rb2-switch-i2c2-to-i2c-gpio.patch new file mode 100644 index 00000000000..1ac01359b72 --- /dev/null +++ b/queue-6.6/arm64-dts-qcom-qrb4210-rb2-switch-i2c2-to-i2c-gpio.patch @@ -0,0 +1,59 @@ +From f77e7bd40c3c2d79685e9cc80de874b69a976f55 Mon Sep 17 00:00:00 2001 +From: Dmitry Baryshkov +Date: Wed, 5 Jun 2024 11:55:57 +0300 +Subject: arm64: dts: qcom: qrb4210-rb2: switch I2C2 to i2c-gpio + +From: Dmitry Baryshkov + +commit f77e7bd40c3c2d79685e9cc80de874b69a976f55 upstream. + +On the Qualcomm RB2 platform the I2C bus connected to the LT9611UXC +bridge under some circumstances can go into a state when all transfers +timeout. This causes both issues with fetching of EDID and with +updating of the bridge's firmware. While we are debugging the issue, +switch corresponding I2C bus to use i2c-gpio driver. While using +i2c-gpio no communication issues are observed. + +This patch is asusmed to be a temporary fix, so it is implemented in a +non-intrusive manner to simply reverting it later. + +Fixes: f7b01e07e89c ("arm64: dts: qcom: qrb4210-rb2: Enable display out") +Cc: stable@vger.kernel.org +Signed-off-by: Dmitry Baryshkov +Reviewed-by: Caleb Connolly +Link: https://lore.kernel.org/r/20240605-rb12-i2c2g-pio-v2-2-946f5d6b6948@linaro.org +Signed-off-by: Bjorn Andersson +Signed-off-by: Greg Kroah-Hartman +--- + arch/arm64/boot/dts/qcom/qrb4210-rb2.dts | 13 ++++++++++++- + 1 file changed, 12 insertions(+), 1 deletion(-) + +--- a/arch/arm64/boot/dts/qcom/qrb4210-rb2.dts ++++ b/arch/arm64/boot/dts/qcom/qrb4210-rb2.dts +@@ -57,6 +57,17 @@ + }; + }; + ++ i2c2_gpio: i2c { ++ compatible = "i2c-gpio"; ++ ++ sda-gpios = <&tlmm 6 GPIO_ACTIVE_HIGH>; ++ scl-gpios = <&tlmm 7 GPIO_ACTIVE_HIGH>; ++ #address-cells = <1>; ++ #size-cells = <0>; ++ ++ status = "disabled"; ++ }; ++ + leds { + compatible = "gpio-leds"; + +@@ -187,7 +198,7 @@ + }; + }; + +-&i2c2 { ++&i2c2_gpio { + clock-frequency = <400000>; + status = "okay"; + diff --git a/queue-6.6/arm64-dts-qcom-sdm630-disable-ss-instance-in-parkmode-for-usb.patch b/queue-6.6/arm64-dts-qcom-sdm630-disable-ss-instance-in-parkmode-for-usb.patch new file mode 100644 index 00000000000..b31844ea515 --- /dev/null +++ b/queue-6.6/arm64-dts-qcom-sdm630-disable-ss-instance-in-parkmode-for-usb.patch @@ -0,0 +1,40 @@ +From fad58a41b84667cb6c9232371fc3af77d4443889 Mon Sep 17 00:00:00 2001 +From: Krishna Kurapati +Date: Thu, 4 Jul 2024 20:58:44 +0530 +Subject: arm64: dts: qcom: sdm630: Disable SS instance in Parkmode for USB + +From: Krishna Kurapati + +commit fad58a41b84667cb6c9232371fc3af77d4443889 upstream. + +For Gen-1 targets like SDM630, 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 SDM630 to mitigate this issue. + +Cc: stable@vger.kernel.org +Fixes: c65a4ed2ea8b ("arm64: dts: qcom: sdm630: Add USB configuration") +Signed-off-by: Krishna Kurapati +Reviewed-by: Konrad Dybcio +Link: https://lore.kernel.org/r/20240704152848.3380602-5-quic_kriskura@quicinc.com +Signed-off-by: Bjorn Andersson +Signed-off-by: Greg Kroah-Hartman +--- + arch/arm64/boot/dts/qcom/sdm630.dtsi | 1 + + 1 file changed, 1 insertion(+) + +--- a/arch/arm64/boot/dts/qcom/sdm630.dtsi ++++ b/arch/arm64/boot/dts/qcom/sdm630.dtsi +@@ -1258,6 +1258,7 @@ + interrupts = ; + snps,dis_u2_susphy_quirk; + snps,dis_enblslpm_quirk; ++ snps,parkmode-disable-ss-quirk; + + /* + * SDM630 technically supports USB3 but I diff --git a/queue-6.6/arm64-dts-qcom-sm6350-disable-ss-instance-in-parkmode-for-usb.patch b/queue-6.6/arm64-dts-qcom-sm6350-disable-ss-instance-in-parkmode-for-usb.patch new file mode 100644 index 00000000000..eeb8686c97b --- /dev/null +++ b/queue-6.6/arm64-dts-qcom-sm6350-disable-ss-instance-in-parkmode-for-usb.patch @@ -0,0 +1,40 @@ +From c5d57eb7d06df16c07037cea5dacfd74d49d1833 Mon Sep 17 00:00:00 2001 +From: Krishna Kurapati +Date: Thu, 4 Jul 2024 20:58:46 +0530 +Subject: arm64: dts: qcom: sm6350: Disable SS instance in Parkmode for USB + +From: Krishna Kurapati + +commit c5d57eb7d06df16c07037cea5dacfd74d49d1833 upstream. + +For Gen-1 targets like SM6350, 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 SM6350 to mitigate this issue. + +Cc: stable@vger.kernel.org +Fixes: 23737b9557fe ("arm64: dts: qcom: sm6350: Add USB1 nodes") +Signed-off-by: Krishna Kurapati +Reviewed-by: Konrad Dybcio +Link: https://lore.kernel.org/r/20240704152848.3380602-7-quic_kriskura@quicinc.com +Signed-off-by: Bjorn Andersson +Signed-off-by: Greg Kroah-Hartman +--- + arch/arm64/boot/dts/qcom/sm6350.dtsi | 1 + + 1 file changed, 1 insertion(+) + +--- a/arch/arm64/boot/dts/qcom/sm6350.dtsi ++++ b/arch/arm64/boot/dts/qcom/sm6350.dtsi +@@ -1864,6 +1864,7 @@ + snps,dis_enblslpm_quirk; + snps,has-lpm-erratum; + snps,hird-threshold = /bits/ 8 <0x10>; ++ snps,parkmode-disable-ss-quirk; + phys = <&usb_1_hsphy>, <&usb_1_qmpphy QMP_USB43DP_USB3_PHY>; + phy-names = "usb2-phy", "usb3-phy"; + }; diff --git a/queue-6.6/series b/queue-6.6/series index 77c7c87b5ff..7dabd2515dc 100644 --- a/queue-6.6/series +++ b/queue-6.6/series @@ -6,3 +6,8 @@ fs-ntfs3-validate-ff-offset.patch usb-gadget-midi2-fix-incorrect-default-midi2-protocol-setup.patch alsa-hda-realtek-enable-headset-mic-on-positivo-su-c1400.patch alsa-hda-realtek-fix-the-speaker-output-on-samsung-galaxy-book-pro-360.patch +arm64-dts-qcom-qrb4210-rb2-switch-i2c2-to-i2c-gpio.patch +arm64-dts-qcom-msm8996-disable-ss-instance-in-parkmode-for-usb.patch +arm64-dts-qcom-sm6350-disable-ss-instance-in-parkmode-for-usb.patch +arm64-dts-qcom-ipq6018-disable-ss-instance-in-parkmode-for-usb.patch +arm64-dts-qcom-sdm630-disable-ss-instance-in-parkmode-for-usb.patch -- 2.47.3