From: Greg Kroah-Hartman Date: Thu, 25 Jul 2024 12:52:32 +0000 (+0200) Subject: 6.10-stable patches X-Git-Tag: v4.19.319~19 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4c802d76ec7de157b39a7b5ea4ad1bcfb7d58a95;p=thirdparty%2Fkernel%2Fstable-queue.git 6.10-stable patches added patches: arm64-dts-qcom-ipq6018-disable-ss-instance-in-parkmode-for-usb.patch arm64-dts-qcom-ipq8074-disable-ss-instance-in-parkmode-for-usb.patch arm64-dts-qcom-msm8996-disable-ss-instance-in-parkmode-for-usb.patch arm64-dts-qcom-msm8998-disable-ss-instance-in-parkmode-for-usb.patch arm64-dts-qcom-qrb2210-rb1-switch-i2c2-to-i2c-gpio.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-sdm845-disable-ss-instance-in-parkmode-for-usb.patch arm64-dts-qcom-sm6115-disable-ss-instance-in-parkmode-for-usb.patch arm64-dts-qcom-sm6350-disable-ss-instance-in-parkmode-for-usb.patch arm64-dts-qcom-x1e80100-crd-fix-the-phy-regulator-for-pcie-6a.patch arm64-dts-qcom-x1e80100-crd-fix-usb-phys-regulators.patch arm64-dts-qcom-x1e80100-qcp-fix-the-phy-regulator-for-pcie-6a.patch arm64-dts-qcom-x1e80100-qcp-fix-usb-phys-regulators.patch --- diff --git a/queue-6.10/arm64-dts-qcom-ipq6018-disable-ss-instance-in-parkmode-for-usb.patch b/queue-6.10/arm64-dts-qcom-ipq6018-disable-ss-instance-in-parkmode-for-usb.patch new file mode 100644 index 00000000000..b91dfe92244 --- /dev/null +++ b/queue-6.10/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 +@@ -685,6 +685,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.10/arm64-dts-qcom-ipq8074-disable-ss-instance-in-parkmode-for-usb.patch b/queue-6.10/arm64-dts-qcom-ipq8074-disable-ss-instance-in-parkmode-for-usb.patch new file mode 100644 index 00000000000..03860497e4e --- /dev/null +++ b/queue-6.10/arm64-dts-qcom-ipq8074-disable-ss-instance-in-parkmode-for-usb.patch @@ -0,0 +1,48 @@ +From dc6ba95c6c4400a84cca5b419b34ae852a08cfb5 Mon Sep 17 00:00:00 2001 +From: Krishna Kurapati +Date: Thu, 4 Jul 2024 20:58:42 +0530 +Subject: arm64: dts: qcom: ipq8074: Disable SS instance in Parkmode for USB + +From: Krishna Kurapati + +commit dc6ba95c6c4400a84cca5b419b34ae852a08cfb5 upstream. + +For Gen-1 targets like IPQ8074, 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 IPQ8074 to mitigate this issue. + +Cc: stable@vger.kernel.org +Fixes: 5e09bc51d07b ("arm64: dts: ipq8074: enable USB support") +Signed-off-by: Krishna Kurapati +Reviewed-by: Konrad Dybcio +Link: https://lore.kernel.org/r/20240704152848.3380602-3-quic_kriskura@quicinc.com +Signed-off-by: Bjorn Andersson +Signed-off-by: Greg Kroah-Hartman +--- + arch/arm64/boot/dts/qcom/ipq8074.dtsi | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/arch/arm64/boot/dts/qcom/ipq8074.dtsi ++++ b/arch/arm64/boot/dts/qcom/ipq8074.dtsi +@@ -666,6 +666,7 @@ + interrupts = ; + phys = <&qusb_phy_0>, <&ssphy_0>; + phy-names = "usb2-phy", "usb3-phy"; ++ snps,parkmode-disable-ss-quirk; + snps,is-utmi-l1-suspend; + snps,hird-threshold = /bits/ 8 <0x0>; + snps,dis_u2_susphy_quirk; +@@ -715,6 +716,7 @@ + interrupts = ; + phys = <&qusb_phy_1>, <&ssphy_1>; + phy-names = "usb2-phy", "usb3-phy"; ++ 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.10/arm64-dts-qcom-msm8996-disable-ss-instance-in-parkmode-for-usb.patch b/queue-6.10/arm64-dts-qcom-msm8996-disable-ss-instance-in-parkmode-for-usb.patch new file mode 100644 index 00000000000..f04af2404b3 --- /dev/null +++ b/queue-6.10/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 +@@ -3091,6 +3091,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.10/arm64-dts-qcom-msm8998-disable-ss-instance-in-parkmode-for-usb.patch b/queue-6.10/arm64-dts-qcom-msm8998-disable-ss-instance-in-parkmode-for-usb.patch new file mode 100644 index 00000000000..4e0737b9847 --- /dev/null +++ b/queue-6.10/arm64-dts-qcom-msm8998-disable-ss-instance-in-parkmode-for-usb.patch @@ -0,0 +1,40 @@ +From 0046325ae52079b46da13a7f84dd7b2a6f7c38f8 Mon Sep 17 00:00:00 2001 +From: Krishna Kurapati +Date: Thu, 4 Jul 2024 20:58:43 +0530 +Subject: arm64: dts: qcom: msm8998: Disable SS instance in Parkmode for USB + +From: Krishna Kurapati + +commit 0046325ae52079b46da13a7f84dd7b2a6f7c38f8 upstream. + +For Gen-1 targets like MSM8998, 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 MSM8998 to mitigate this issue. + +Cc: stable@vger.kernel.org +Fixes: 026dad8f5873 ("arm64: dts: qcom: msm8998: Add USB-related nodes") +Signed-off-by: Krishna Kurapati +Reviewed-by: Konrad Dybcio +Link: https://lore.kernel.org/r/20240704152848.3380602-4-quic_kriskura@quicinc.com +Signed-off-by: Bjorn Andersson +Signed-off-by: Greg Kroah-Hartman +--- + arch/arm64/boot/dts/qcom/msm8998.dtsi | 1 + + 1 file changed, 1 insertion(+) + +--- a/arch/arm64/boot/dts/qcom/msm8998.dtsi ++++ b/arch/arm64/boot/dts/qcom/msm8998.dtsi +@@ -2164,6 +2164,7 @@ + interrupts = ; + snps,dis_u2_susphy_quirk; + snps,dis_enblslpm_quirk; ++ snps,parkmode-disable-ss-quirk; + phys = <&qusb2phy>, <&usb3phy>; + phy-names = "usb2-phy", "usb3-phy"; + snps,has-lpm-erratum; diff --git a/queue-6.10/arm64-dts-qcom-qrb2210-rb1-switch-i2c2-to-i2c-gpio.patch b/queue-6.10/arm64-dts-qcom-qrb2210-rb1-switch-i2c2-to-i2c-gpio.patch new file mode 100644 index 00000000000..1fdd584e0b1 --- /dev/null +++ b/queue-6.10/arm64-dts-qcom-qrb2210-rb1-switch-i2c2-to-i2c-gpio.patch @@ -0,0 +1,59 @@ +From b7b545ccc08873e107aa24c461b1fdb123dd3761 Mon Sep 17 00:00:00 2001 +From: Dmitry Baryshkov +Date: Wed, 5 Jun 2024 11:55:56 +0300 +Subject: arm64: dts: qcom: qrb2210-rb1: switch I2C2 to i2c-gpio + +From: Dmitry Baryshkov + +commit b7b545ccc08873e107aa24c461b1fdb123dd3761 upstream. + +On the Qualcomm RB1 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: 616eda24edd4 ("arm64: dts: qcom: qrb2210-rb1: Set up HDMI") +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-1-946f5d6b6948@linaro.org +Signed-off-by: Bjorn Andersson +Signed-off-by: Greg Kroah-Hartman +--- + arch/arm64/boot/dts/qcom/qrb2210-rb1.dts | 13 ++++++++++++- + 1 file changed, 12 insertions(+), 1 deletion(-) + +--- a/arch/arm64/boot/dts/qcom/qrb2210-rb1.dts ++++ b/arch/arm64/boot/dts/qcom/qrb2210-rb1.dts +@@ -59,6 +59,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"; + +@@ -199,7 +210,7 @@ + status = "okay"; + }; + +-&i2c2 { ++&i2c2_gpio { + clock-frequency = <400000>; + status = "okay"; + diff --git a/queue-6.10/arm64-dts-qcom-qrb4210-rb2-switch-i2c2-to-i2c-gpio.patch b/queue-6.10/arm64-dts-qcom-qrb4210-rb2-switch-i2c2-to-i2c-gpio.patch new file mode 100644 index 00000000000..9901ea01900 --- /dev/null +++ b/queue-6.10/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 +@@ -60,6 +60,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"; + +@@ -190,7 +201,7 @@ + }; + }; + +-&i2c2 { ++&i2c2_gpio { + clock-frequency = <400000>; + status = "okay"; + diff --git a/queue-6.10/arm64-dts-qcom-sdm630-disable-ss-instance-in-parkmode-for-usb.patch b/queue-6.10/arm64-dts-qcom-sdm630-disable-ss-instance-in-parkmode-for-usb.patch new file mode 100644 index 00000000000..1f86f08009a --- /dev/null +++ b/queue-6.10/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 +@@ -1302,6 +1302,7 @@ + interrupts = ; + snps,dis_u2_susphy_quirk; + snps,dis_enblslpm_quirk; ++ snps,parkmode-disable-ss-quirk; + + phys = <&qusb2phy0>, <&usb3_qmpphy>; + phy-names = "usb2-phy", "usb3-phy"; diff --git a/queue-6.10/arm64-dts-qcom-sdm845-disable-ss-instance-in-parkmode-for-usb.patch b/queue-6.10/arm64-dts-qcom-sdm845-disable-ss-instance-in-parkmode-for-usb.patch new file mode 100644 index 00000000000..9c7e7621be5 --- /dev/null +++ b/queue-6.10/arm64-dts-qcom-sdm845-disable-ss-instance-in-parkmode-for-usb.patch @@ -0,0 +1,48 @@ +From cf4d6d54eadb60d2ee4d31c9d92299f5e8dcb55c Mon Sep 17 00:00:00 2001 +From: Krishna Kurapati +Date: Thu, 4 Jul 2024 20:58:48 +0530 +Subject: arm64: dts: qcom: sdm845: Disable SS instance in Parkmode for USB + +From: Krishna Kurapati + +commit cf4d6d54eadb60d2ee4d31c9d92299f5e8dcb55c upstream. + +For Gen-1 targets like SDM845, 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 SDM845 to mitigate this issue. + +Cc: stable@vger.kernel.org +Fixes: ca4db2b538a1 ("arm64: dts: qcom: sdm845: Add USB-related nodes") +Signed-off-by: Krishna Kurapati +Reviewed-by: Konrad Dybcio +Link: https://lore.kernel.org/r/20240704152848.3380602-9-quic_kriskura@quicinc.com +Signed-off-by: Bjorn Andersson +Signed-off-by: Greg Kroah-Hartman +--- + arch/arm64/boot/dts/qcom/sdm845.dtsi | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/arch/arm64/boot/dts/qcom/sdm845.dtsi ++++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi +@@ -4106,6 +4106,7 @@ + iommus = <&apps_smmu 0x740 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"; + }; +@@ -4161,6 +4162,7 @@ + iommus = <&apps_smmu 0x760 0>; + snps,dis_u2_susphy_quirk; + snps,dis_enblslpm_quirk; ++ snps,parkmode-disable-ss-quirk; + phys = <&usb_2_hsphy>, <&usb_2_qmpphy>; + phy-names = "usb2-phy", "usb3-phy"; + }; diff --git a/queue-6.10/arm64-dts-qcom-sm6115-disable-ss-instance-in-parkmode-for-usb.patch b/queue-6.10/arm64-dts-qcom-sm6115-disable-ss-instance-in-parkmode-for-usb.patch new file mode 100644 index 00000000000..2db7d8f6ed5 --- /dev/null +++ b/queue-6.10/arm64-dts-qcom-sm6115-disable-ss-instance-in-parkmode-for-usb.patch @@ -0,0 +1,40 @@ +From 074992a1163295d717faa21d1818c4c19ef6e676 Mon Sep 17 00:00:00 2001 +From: Krishna Kurapati +Date: Thu, 4 Jul 2024 20:58:45 +0530 +Subject: arm64: dts: qcom: sm6115: Disable SS instance in Parkmode for USB + +From: Krishna Kurapati + +commit 074992a1163295d717faa21d1818c4c19ef6e676 upstream. + +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. + +Cc: stable@vger.kernel.org +Fixes: 97e563bf5ba1 ("arm64: dts: qcom: sm6115: Add basic soc dtsi") +Signed-off-by: Krishna Kurapati +Reviewed-by: Konrad Dybcio +Link: https://lore.kernel.org/r/20240704152848.3380602-6-quic_kriskura@quicinc.com +Signed-off-by: Bjorn Andersson +Signed-off-by: Greg Kroah-Hartman +--- + arch/arm64/boot/dts/qcom/sm6115.dtsi | 1 + + 1 file changed, 1 insertion(+) + +--- a/arch/arm64/boot/dts/qcom/sm6115.dtsi ++++ b/arch/arm64/boot/dts/qcom/sm6115.dtsi +@@ -1656,6 +1656,7 @@ + snps,has-lpm-erratum; + snps,hird-threshold = /bits/ 8 <0x10>; + snps,usb3_lpm_capable; ++ snps,parkmode-disable-ss-quirk; + + usb-role-switch; + diff --git a/queue-6.10/arm64-dts-qcom-sm6350-disable-ss-instance-in-parkmode-for-usb.patch b/queue-6.10/arm64-dts-qcom-sm6350-disable-ss-instance-in-parkmode-for-usb.patch new file mode 100644 index 00000000000..48e87f87e26 --- /dev/null +++ b/queue-6.10/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 +@@ -1890,6 +1890,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.10/arm64-dts-qcom-x1e80100-crd-fix-the-phy-regulator-for-pcie-6a.patch b/queue-6.10/arm64-dts-qcom-x1e80100-crd-fix-the-phy-regulator-for-pcie-6a.patch new file mode 100644 index 00000000000..f183cd09c60 --- /dev/null +++ b/queue-6.10/arm64-dts-qcom-x1e80100-crd-fix-the-phy-regulator-for-pcie-6a.patch @@ -0,0 +1,33 @@ +From cf7d2157aa87dca6f078a2d4867fd0a9dbc357aa Mon Sep 17 00:00:00 2001 +From: Abel Vesa +Date: Thu, 30 May 2024 18:43:39 +0300 +Subject: arm64: dts: qcom: x1e80100-crd: Fix the PHY regulator for PCIe 6a + +From: Abel Vesa + +commit cf7d2157aa87dca6f078a2d4867fd0a9dbc357aa upstream. + +The actual PHY regulator is L1d instead of L3j, so fix it accordingly. + +Fixes: d7e03cce0400 ("arm64: dts: qcom: x1e80100-crd: Enable more support") +Signed-off-by: Abel Vesa +Reviewed-by: Dmitry Baryshkov +Cc: stable@vger.kernel.org # 6.9 +Link: https://lore.kernel.org/r/20240530-x1e80100-dts-pcie6a-v1-1-ee17a9939ba5@linaro.org +Signed-off-by: Bjorn Andersson +Signed-off-by: Greg Kroah-Hartman +--- + arch/arm64/boot/dts/qcom/x1e80100-crd.dts | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/arch/arm64/boot/dts/qcom/x1e80100-crd.dts ++++ b/arch/arm64/boot/dts/qcom/x1e80100-crd.dts +@@ -659,7 +659,7 @@ + }; + + &pcie6a_phy { +- vdda-phy-supply = <&vreg_l3j_0p8>; ++ vdda-phy-supply = <&vreg_l1d_0p8>; + vdda-pll-supply = <&vreg_l2j_1p2>; + + status = "okay"; diff --git a/queue-6.10/arm64-dts-qcom-x1e80100-crd-fix-usb-phys-regulators.patch b/queue-6.10/arm64-dts-qcom-x1e80100-crd-fix-usb-phys-regulators.patch new file mode 100644 index 00000000000..95f1e7f91d5 --- /dev/null +++ b/queue-6.10/arm64-dts-qcom-x1e80100-crd-fix-usb-phys-regulators.patch @@ -0,0 +1,82 @@ +From ae5cee8e7349d7e5deff4cf90a08cbd738287155 Mon Sep 17 00:00:00 2001 +From: Abel Vesa +Date: Thu, 30 May 2024 19:35:45 +0300 +Subject: arm64: dts: qcom: x1e80100-crd: Fix USB PHYs regulators + +From: Abel Vesa + +commit ae5cee8e7349d7e5deff4cf90a08cbd738287155 upstream. + +The 1.2v HS PHY shared regulator is actually LDO2 from PM8550ve id J. +Also add the missing supplies to QMP PHYs. + +Fixes: d7e03cce0400 ("arm64: dts: qcom: x1e80100-crd: Enable more support") +Signed-off-by: Abel Vesa +Reviewed-by: Dmitry Baryshkov +Cc: stable@vger.kernel.org # 6.9 +Link: https://lore.kernel.org/r/20240530-x1e80100-dts-fix-usb-phy-supplies-v1-1-6eb72a546227@linaro.org +Signed-off-by: Bjorn Andersson +Signed-off-by: Greg Kroah-Hartman +--- + arch/arm64/boot/dts/qcom/x1e80100-crd.dts | 15 ++++++++++++--- + 1 file changed, 12 insertions(+), 3 deletions(-) + +--- a/arch/arm64/boot/dts/qcom/x1e80100-crd.dts ++++ b/arch/arm64/boot/dts/qcom/x1e80100-crd.dts +@@ -841,7 +841,7 @@ + + &usb_1_ss0_hsphy { + vdd-supply = <&vreg_l2e_0p8>; +- vdda12-supply = <&vreg_l3e_1p2>; ++ vdda12-supply = <&vreg_l2j_1p2>; + + phys = <&smb2360_0_eusb2_repeater>; + +@@ -849,6 +849,9 @@ + }; + + &usb_1_ss0_qmpphy { ++ vdda-phy-supply = <&vreg_l3e_1p2>; ++ vdda-pll-supply = <&vreg_l1j_0p8>; ++ + status = "okay"; + }; + +@@ -863,7 +866,7 @@ + + &usb_1_ss1_hsphy { + vdd-supply = <&vreg_l2e_0p8>; +- vdda12-supply = <&vreg_l3e_1p2>; ++ vdda12-supply = <&vreg_l2j_1p2>; + + phys = <&smb2360_1_eusb2_repeater>; + +@@ -871,6 +874,9 @@ + }; + + &usb_1_ss1_qmpphy { ++ vdda-phy-supply = <&vreg_l3e_1p2>; ++ vdda-pll-supply = <&vreg_l2d_0p9>; ++ + status = "okay"; + }; + +@@ -885,7 +891,7 @@ + + &usb_1_ss2_hsphy { + vdd-supply = <&vreg_l2e_0p8>; +- vdda12-supply = <&vreg_l3e_1p2>; ++ vdda12-supply = <&vreg_l2j_1p2>; + + phys = <&smb2360_2_eusb2_repeater>; + +@@ -893,6 +899,9 @@ + }; + + &usb_1_ss2_qmpphy { ++ vdda-phy-supply = <&vreg_l3e_1p2>; ++ vdda-pll-supply = <&vreg_l2d_0p9>; ++ + status = "okay"; + }; + diff --git a/queue-6.10/arm64-dts-qcom-x1e80100-qcp-fix-the-phy-regulator-for-pcie-6a.patch b/queue-6.10/arm64-dts-qcom-x1e80100-qcp-fix-the-phy-regulator-for-pcie-6a.patch new file mode 100644 index 00000000000..f0227925074 --- /dev/null +++ b/queue-6.10/arm64-dts-qcom-x1e80100-qcp-fix-the-phy-regulator-for-pcie-6a.patch @@ -0,0 +1,33 @@ +From 87042003f6ea7d075784db98da6903738a38f3cf Mon Sep 17 00:00:00 2001 +From: Abel Vesa +Date: Thu, 30 May 2024 18:43:40 +0300 +Subject: arm64: dts: qcom: x1e80100-qcp: Fix the PHY regulator for PCIe 6a + +From: Abel Vesa + +commit 87042003f6ea7d075784db98da6903738a38f3cf upstream. + +The actual PHY regulator is L1d instead of L3j, so fix it accordingly. + +Fixes: f9a9c11471da ("arm64: dts: qcom: x1e80100-qcp: Enable more support") +Signed-off-by: Abel Vesa +Reviewed-by: Dmitry Baryshkov +Cc: stable@vger.kernel.org # 6.9 +Link: https://lore.kernel.org/r/20240530-x1e80100-dts-pcie6a-v1-2-ee17a9939ba5@linaro.org +Signed-off-by: Bjorn Andersson +Signed-off-by: Greg Kroah-Hartman +--- + arch/arm64/boot/dts/qcom/x1e80100-qcp.dts | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/arch/arm64/boot/dts/qcom/x1e80100-qcp.dts ++++ b/arch/arm64/boot/dts/qcom/x1e80100-qcp.dts +@@ -470,7 +470,7 @@ + }; + + &pcie6a_phy { +- vdda-phy-supply = <&vreg_l3j_0p8>; ++ vdda-phy-supply = <&vreg_l1d_0p8>; + vdda-pll-supply = <&vreg_l2j_1p2>; + + status = "okay"; diff --git a/queue-6.10/arm64-dts-qcom-x1e80100-qcp-fix-usb-phys-regulators.patch b/queue-6.10/arm64-dts-qcom-x1e80100-qcp-fix-usb-phys-regulators.patch new file mode 100644 index 00000000000..7b03b8705f7 --- /dev/null +++ b/queue-6.10/arm64-dts-qcom-x1e80100-qcp-fix-usb-phys-regulators.patch @@ -0,0 +1,82 @@ +From 20676f7819d7364b7e8bd437b212106faa893b49 Mon Sep 17 00:00:00 2001 +From: Abel Vesa +Date: Thu, 30 May 2024 19:35:46 +0300 +Subject: arm64: dts: qcom: x1e80100-qcp: Fix USB PHYs regulators + +From: Abel Vesa + +commit 20676f7819d7364b7e8bd437b212106faa893b49 upstream. + +The 1.2v HS PHY shared regulator is actually LDO2 from PM8550ve id J. +Also add the missing supplies to QMP PHYs. + +Fixes: f9a9c11471da ("arm64: dts: qcom: x1e80100-qcp: Enable more support") +Signed-off-by: Abel Vesa +Reviewed-by: Dmitry Baryshkov +Cc: stable@vger.kernel.org # 6.9 +Link: https://lore.kernel.org/r/20240530-x1e80100-dts-fix-usb-phy-supplies-v1-2-6eb72a546227@linaro.org +Signed-off-by: Bjorn Andersson +Signed-off-by: Greg Kroah-Hartman +--- + arch/arm64/boot/dts/qcom/x1e80100-qcp.dts | 15 ++++++++++++--- + 1 file changed, 12 insertions(+), 3 deletions(-) + +--- a/arch/arm64/boot/dts/qcom/x1e80100-qcp.dts ++++ b/arch/arm64/boot/dts/qcom/x1e80100-qcp.dts +@@ -537,7 +537,7 @@ + + &usb_1_ss0_hsphy { + vdd-supply = <&vreg_l2e_0p8>; +- vdda12-supply = <&vreg_l3e_1p2>; ++ vdda12-supply = <&vreg_l2j_1p2>; + + phys = <&smb2360_0_eusb2_repeater>; + +@@ -545,6 +545,9 @@ + }; + + &usb_1_ss0_qmpphy { ++ vdda-phy-supply = <&vreg_l3e_1p2>; ++ vdda-pll-supply = <&vreg_l1j_0p8>; ++ + status = "okay"; + }; + +@@ -559,7 +562,7 @@ + + &usb_1_ss1_hsphy { + vdd-supply = <&vreg_l2e_0p8>; +- vdda12-supply = <&vreg_l3e_1p2>; ++ vdda12-supply = <&vreg_l2j_1p2>; + + phys = <&smb2360_1_eusb2_repeater>; + +@@ -567,6 +570,9 @@ + }; + + &usb_1_ss1_qmpphy { ++ vdda-phy-supply = <&vreg_l3e_1p2>; ++ vdda-pll-supply = <&vreg_l2d_0p9>; ++ + status = "okay"; + }; + +@@ -581,7 +587,7 @@ + + &usb_1_ss2_hsphy { + vdd-supply = <&vreg_l2e_0p8>; +- vdda12-supply = <&vreg_l3e_1p2>; ++ vdda12-supply = <&vreg_l2j_1p2>; + + phys = <&smb2360_2_eusb2_repeater>; + +@@ -589,6 +595,9 @@ + }; + + &usb_1_ss2_qmpphy { ++ vdda-phy-supply = <&vreg_l3e_1p2>; ++ vdda-pll-supply = <&vreg_l2d_0p9>; ++ + status = "okay"; + }; + diff --git a/queue-6.10/series b/queue-6.10/series index 16c8d003312..cc9bab7847d 100644 --- a/queue-6.10/series +++ b/queue-6.10/series @@ -10,3 +10,17 @@ 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-sc7180-disable-superspeed-instances-in-park-mode.patch arm64-dts-qcom-sc7280-disable-superspeed-instances-in-park-mode.patch +arm64-dts-qcom-x1e80100-qcp-fix-usb-phys-regulators.patch +arm64-dts-qcom-qrb2210-rb1-switch-i2c2-to-i2c-gpio.patch +arm64-dts-qcom-qrb4210-rb2-switch-i2c2-to-i2c-gpio.patch +arm64-dts-qcom-x1e80100-crd-fix-the-phy-regulator-for-pcie-6a.patch +arm64-dts-qcom-x1e80100-qcp-fix-the-phy-regulator-for-pcie-6a.patch +arm64-dts-qcom-x1e80100-crd-fix-usb-phys-regulators.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-msm8998-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 +arm64-dts-qcom-ipq8074-disable-ss-instance-in-parkmode-for-usb.patch +arm64-dts-qcom-sdm845-disable-ss-instance-in-parkmode-for-usb.patch +arm64-dts-qcom-sm6115-disable-ss-instance-in-parkmode-for-usb.patch