Hi, Johan
On 2024/2/21 21:05, Greg Kroah-Hartman wrote:
5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johan Hovold <johan+linaro@xxxxxxxxxx>
commit 84ad9ac8d9ca29033d589e79a991866b38e23b85 upstream.
The DP/DM wakeup interrupts are edge triggered and which edge to trigger
on depends on use-case and whether a Low speed or Full/High speed device
is connected.
Fixes: ca4db2b538a1 ("arm64: dts: qcom: sdm845: Add USB-related nodes")
Cc: stable@xxxxxxxxxxxxxxx # 4.20
Signed-off-by: Johan Hovold <johan+linaro@xxxxxxxxxx>
Link: https://lore.kernel.org/r/20231120164331.8116-9-johan+linaro@xxxxxxxxxx
Signed-off-by: Bjorn Andersson <andersson@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
arch/arm64/boot/dts/qcom/sdm845.dtsi | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
--- a/arch/arm64/boot/dts/qcom/sdm845.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi
@@ -2503,8 +2503,8 @@
interrupts = <GIC_SPI 131 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 486 IRQ_TYPE_LEVEL_HIGH>,
- <GIC_SPI 488 IRQ_TYPE_LEVEL_HIGH>,
- <GIC_SPI 489 IRQ_TYPE_LEVEL_HIGH>;
+ <GIC_SPI 488 IRQ_TYPE_EDGE_BOTH>,
+ <GIC_SPI 489 IRQ_TYPE_EDGE_BOTH>;
interrupt-names = "hs_phy_irq", "ss_phy_irq",
"dm_hs_phy_irq", "dp_hs_phy_irq";
@@ -2547,8 +2547,8 @@
interrupts = <GIC_SPI 136 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 487 IRQ_TYPE_LEVEL_HIGH>,
- <GIC_SPI 490 IRQ_TYPE_LEVEL_HIGH>,
- <GIC_SPI 491 IRQ_TYPE_LEVEL_HIGH>;
+ <GIC_SPI 490 IRQ_TYPE_EDGE_BOTH>,
+ <GIC_SPI 491 IRQ_TYPE_EDGE_BOTH>;
interrupt-names = "hs_phy_irq", "ss_phy_irq",
"dm_hs_phy_irq", "dp_hs_phy_irq";
This patch only causes the db845c Android builds to fail to have the adb
connection setup after boot.
In the serial console, the following lines are printed:
[ 0.779242][ T79] genirq: Setting trigger mode 3 for irq 33
failed (__typeid__ZTSFiP8irq_datajE_global_addr+0x14/0x58)
[ 0.779411][ T79] dwc3-qcom a6f8800.usb: dp_hs_phy_irq failed: -22
[ 0.779418][ T79] dwc3-qcom a6f8800.usb: failed to setup IRQs,
err=-22
[ 0.779652][ T154] irq/30-qcom_dwc (154) used greatest stack
depth: 14464 bytes left
[ 0.779661][ T79] dwc3-qcom: probe of a6f8800.usb failed with
error -22
[ 0.779997][ T1] init: Loaded kernel module /lib/modules/smem.ko
[ 0.780144][ T1] init: Loading module
/lib/modules/qcom_glink_native.ko with args ''
[ 0.782619][ T79] genirq: Setting trigger mode 3 for irq 37
failed (__typeid__ZTSFiP8irq_datajE_global_addr+0x14/0x58)
[ 0.782672][ T79] dwc3-qcom a8f8800.usb: dp_hs_phy_irq failed: -22
[ 0.782679][ T79] dwc3-qcom a8f8800.usb: failed to setup IRQs,
err=-22
[ 0.782864][ T79] dwc3-qcom: probe of a8f8800.usb failed with
error -22
After some investigation, it's found it will work again if the following
two patches are applied:
72b67ebf9d24 ("arm64: dts: qcom: add PDC interrupt controller for
SDM845")
204f9ed4bad6 ("arm64: dts: qcom: sdm845: fix USB DP/DM HS PHY
interrupts")
Could you please help to have a check and give some suggestions on what
patches
should be back ported to the 5.4 kernel, or are the above two patches
only good enough?
Thanks,
Yongqin Liu
---------------------------------------------------------------
#mailing list
linaro-android@xxxxxxxxxxxxxxxx <mailto:linaro-android@xxxxxxxxxxxxxxxx>
http://lists.linaro.org/mailman/listinfo/linaro-android
<http://lists.linaro.org/mailman/listinfo/linaro-android>
