Repository navigation
linux-qcom-6.18 : update to tag qcom-6.18.y-20260812 v6.18.37 - #2872
Dmitry Baryshkov (lumag) merged 1 commit into
Conversation
Test Results 117 files 698 suites 8h 0m 54s ⏱️ Results for commit 99cbd8c. ♻️ This comment has been updated with latest results. |
Why can't we pick up the upstream solution? |
|
This workaround is currently used on Hamoa and Purwa platforms. At present, neither platform has migrated to the M.2 solution yet, although the transition is ongoing on QLI 0.0. On Hamoa and Purwa, both UART and USB Bluetooth interfaces are required, so BT_EN must remain permanently asserted (pulled high). Without this workaround, the UART Bluetooth driver may enter the code path that toggles BT_EN during Bluetooth on/off operations, which can lead to a state mismatch between the host and the controller. Once Hamoa and Purwa fully transition to the M.2 solution, this workaround will no longer be required and can be removed. |
|
Cheng Jiang (@che-jiang) this is being committed to QLI 0.0, the master branch of meta-qcom. |
|
Also... Is it the same workaround that broke wcn39xx BT devices? |
|
Yes, it's also the workaround for wcn39xx BT devices |
WCN39xx doesn't need workarounds. One of the versions of the patch broke wcn39xx, that's why I'm asking. |
|
There is misunderstanding here. WCN39xx doesn't need workaround. But Hamoa needs. This workaround for Hamoa is qualcomm-linux/kernel@24d48e0. But it breaks the wcn39xx. The WORKAROUND: power: sequencing: qcom-wcn: skip BT devices without bt-enable GPIO is used to fix it. |
So, you have a workaround for the workaround? And it's not even annotated with Fixes tags, how one would identify it as a fix for the earlier buggy commit? Please stop this, revert the previous buggy workaround and apply the upstream solution. |
The first workaround doesn't cover the wcn39xx case, so after merging, it causes the wcn39xx doesn't work with pwrseq. Then we update the workaround. This is the history. For upstream solution, the changes for Haoma/Purwa are under review on QLI 0.0, we will create PR on QLI2.0 once it's merged on 0.0 |
Then fix the history. The second commit doesn't have any notion that it fixes a previous mistake. Fix it.
I don't see any PR here, for QLI 0.0 aka meta-qcom/master. Are you sure what you are talking about? |
|
Also, could you please clarify, what is the difference between UPSTREAM: and FROMGIT:? |
Sure, we will try to add the info in the commit message.
Hi Dmitry Baryshkov (@lumag) , As mentioned, the workarounds are used to enable BT on Hamoa and Purwa. These are the new changes for it. They are still on kernel topic and under reivew. |
FROMGIT: Patch merged upstream on a (sub)-maintainer tree |
Don't post excerpts from the internal docs or links to them. Also I asked for an explanation not a quote from the docs. |
Update the comment. Some changes are only on a (sub)-maintainer tree when we add to QLI, so the FROMGIT is used.
|
And what does that mean? What is "upstream branch"? The branch in qcom-next? Then this tag tells us nothing. |
Rewrite Git history, be more careful next time. |
No, it's not qcom-next. It's a subsystem maintainer tree (or a maintainer's staging tree). FROMGIT means the patch has been picked up by a subsystem maintainer tree (e.g. qcom DTS tree) but has not yet landed in Linux mainline. UPSTREAM means it is already in mainline. |
Thank you! We will take care next time. |
|
Update the commit message to the following, could you please help to review? Thanks! |
Dmitry Baryshkov (@lumag) to avoid rewriting Git history, can we revert this commit and bring back commit with proper commit message ? |
|
Hi @sgaud-quic/ Dmitry Baryshkov (@lumag), As two of the following PR are merged on QLI0.0. Shall we switch to the M.2 solution and revert all the workarounds? qualcomm-linux/kernel-topics#1627 -- revert the workaround, wait for merge |
dee324c to
43dd4c1
Compare
Dmitry Baryshkov (@lumag) New tag has all the workaround changes reverted, please help review. |
|
Root cause: The test script checks for static DT compatible strings ( Failing check in Raised testkit issue for the fix: qualcomm-linux/qcom-linux-testkit#533
|
|
Dmitry Baryshkov (@lumag) / Ricardo Salveti (@ricardosalveti) / Viswanath Kraleti (@vkraleti) / Anuj Mittal (@anujm1) can you please help review the PR. |
You didn't respond to the error analysis:
|
This needs to be fixed from test side, below PR would fix this : |
Dmitry Baryshkov (@lumag) any further inputs needed here ? |
Hi Dmitry Baryshkov (@lumag) , |
We can't merge the kernel which breaks on some of the tests. |
Move to the latest linux-qcom-6.18 release tag qcom-6.18.y-20260812 Changelog: QCLINUX: Revert "WORKAROUND: power: sequencing: qcom-wcn: skip BT devices without bt-enable GPIO" (5a472e184be9) QCLINUX: Revert "WORKAROUND: power: sequencing: qcom-wcn: skip BT devices without bt-enable GPIO" (06f2b9c60834) FROMLIST: arm64: dts: qcom: purwa-iot-evk: Describe the PCIe M.2 Key E connector FROMLIST: arm64: dts: qcom: hamoa-iot-evk: Describe the PCIe M.2 Key E connector QCLINUX: Revert "WORKAROUND: arm64: dts: qcom: purwa-iot-evk: support Bluetooth over both USB and UART" QCLINUX: Revert "WORKAROUND: arm64: dts: qcom: hamoa-iot-evk: support Bluetooth over both USB and UART" FROMLIST: arm64: dts: qcom: hamoa: Add compatible to the PCIe Root Port FROMLIST: arm64: dts: qcom: hamoa: Add graph port/endpoint anchors to pcie4_port0 and uart14 FROMLIST: power: sequencing: pcie-m2: Deassert W_DISABLE2# when no UART serdev is created FROMGIT: power: sequencing: pcie-m2: Match WCN6855 and WCN7851 UART BT variants by subdevice ID UPSTREAM: pinctrl: qcom: Replace open coded eoi call with irq_chip_eoi_parent() UPSTREAM: pinctrl: qcom: Register functions before enabling pinctrl UPSTREAM: pinctrl: qcom: Drop redundant intr_target_reg on modern SoCs FROMLIST: wifi: ath11k: unregister PM notifier on QMI init failure path FROMLIST: wifi: ath11k: fix NULL dereference in ahb remove when QMI init incomplete FROMLIST: wifi: ath11k: fix sporadic WLAN initialization failures UPSTREAM: interconnect: qcom: qcs8300: fix the num_links for nsp icc node FROMLIST: arm64: dts: qcom: shikra: Enable CDSP cooling FROMLIST: coresight: tnoc: Bind Aggregator TNOC on the platform bus FROMLIST: dt-bindings: arm: coresight-tnoc: Bind on platform bus instead of AMBA BACKPORT: coresight-tnoc: Add runtime PM support for Interconnect TNOC BACKPORT: coresight-tnoc: add platform driver to support Interconnect TNOC BACKPORT: dt-bindings: arm: qcom: Add Coresight Interconnect TNOC BACKPORT: arm64: dts: qcom: hamoa: Add label properties to CoreSight devices BACKPORT: arm64: dts: qcom: talos: Add label properties to CoreSight devices BACKPORT: arm64: dts: qcom: kodiak: Add label properties to CoreSight devices BACKPORT: arm64: dts: qcom: monaco: Add label properties to CoreSight devices BACKPORT: arm64: dts: qcom: lemans: Add label properties to CoreSight devices BACKPORT: arm64: dts: qcom: lemans: enable static TPDM FROMLIST: arm64: dts: qcom: purwa-evk: add DP0/DP1 audio playback support FROMGIT: arm64: dts: qcom: lemans-evk: Describe the PCIe M.2 Key E connector FROMGIT: arm64: dts: qcom: lemans: Add compatible to the PCIe Root Port FROMGIT: power: sequencing: pwrseq-pcie-m2: Add QCC2072 BT PCI device ID UPSTREAM: power: sequencing: pcie-m2: Sort PCI device IDs in ascending order UPSTREAM: power: sequencing: pcie-m2: Add PCI ID 0x1103 for WCN6855 Bluetooth UPSTREAM: wifi: ath12k: fix EHT TX MCS limitation due to wrong 20 MHz-only parsing WORKAROUND: power: sequencing: qcom-wcn: skip BT devices without bt-enable GPIO UPSTREAM: Bluetooth: qca: enable pwrseq support for WCN39xx devices UPSTREAM: power: sequencing: qcom-wcn: add support for WCN39xx UPSTREAM: regulator: dt-bindings: qcom,wcn3990-pmu: describe PMUs on WCN39xx FROMLIST: arm64: dts: qcom: shikra: Add WCN3988 PMU and fix WiFi/BT supply routing BACKPORT: arm64: dts: qcom: sa8775p: Add reg and clocks for QoS configuration BACKPORT: interconnect: qcom: sa8775p: enable QoS configuration UPSTREAM: dt-bindings: interconnect: add reg and clocks properties to enable QoS on sa8775p UPSTREAM: arm64: dts: qcom: qcs8300: Add clocks for QoS configuration UPSTREAM: interconnect: qcom: qcs8300: enable QoS configuration UPSTREAM: dt-bindings: interconnect: qcom,qcs8300-rpmh: add clocks property to enable QoS UPSTREAM: interconnect: qcom: kaanapali: Drop redundant link_nodes casts UPSTREAM: arm64: dts: qcom: talos: Add clocks for QoS configuration UPSTREAM: interconnect: qcom: qcs615: enable QoS configuration UPSTREAM: dt-bindings: interconnect: qcom,qcs615-rpmh: add clocks property to enable QoS UPSTREAM: interconnect: qcom: icc-rpmh: drop support for non-dynamic IDS UPSTREAM: interconnect: qcom: sm8750: convert to dynamic IDs UPSTREAM: interconnect: qcom: sm8650: convert to dynamic IDs UPSTREAM: interconnect: qcom: sm8550: convert to dynamic IDs UPSTREAM: interconnect: qcom: sm8450: convert to dynamic IDs UPSTREAM: interconnect: qcom: sm8350: convert to dynamic IDs UPSTREAM: interconnect: qcom: sm8150: convert to dynamic IDs UPSTREAM: interconnect: qcom: sm7150: convert to dynamic IDs UPSTREAM: interconnect: qcom: sm6350: convert to dynamic IDs BACKPORT: interconnect: qcom: sdx75: convert to dynamic IDs UPSTREAM: interconnect: qcom: sdx65: convert to dynamic IDs UPSTREAM: interconnect: qcom: sdx55: convert to dynamic IDs UPSTREAM: interconnect: qcom: sdm670: convert to dynamic IDs UPSTREAM: interconnect: qcom: sc7180: convert to dynamic IDs UPSTREAM: interconnect: qcom: sar2130p: convert to dynamic IDs UPSTREAM: interconnect: qcom: qdu1000: convert to dynamic IDs UPSTREAM: interconnect: qcom: qcs8300: convert to dynamic IDs UPSTREAM: interconnect: qcom: qcs615: convert to dynamic IDs UPSTREAM: interconnect: qcom: x1e80100: convert to dynamic IDs UPSTREAM: interconnect: qcom: sm8250: convert to dynamic IDs UPSTREAM: interconnect: qcom: sdm845: convert to dynamic IDs UPSTREAM: interconnect: qcom: sc8280xp: convert to dynamic IDs UPSTREAM: interconnect: qcom: sc8180x: convert to dynamic IDs UPSTREAM: interconnect: qcom: sc7280: convert to dynamic IDs UPSTREAM: interconnect: qcom: icc-rpmh: convert link_nodes to dynamic array FROMLIST: wifi: ath12k: Fix low MLO RX throughput on WCN7850 FROMLIST: wifi: ath12k: change MAC buffer ring size to 4096 Signed-off-by: Salendarsingh Gaud <sgaud@qti.qualcomm.com>
43dd4c1 to
99cbd8c
Compare
|
Current failure are from mainline kernel not relevant to this PR : Audio record on Hamoa : https://lava.infra.foundries.io/scheduler/job/376640#results_6401 This is a lava reporting issue, actual test case passed : |
|
@lumag/ Ricardo Salveti (@ricardosalveti) / Anuj Mittal (@anujm1) / Viswanath Kraleti (@vkraleti) / sbanerjeeqc could you please help review this PR. |
896dff1
into
qualcomm-linux:master
|
Successfully created backport PR for |
Move to the latest linux-qcom-6.18 release tag qcom-6.18.y-20260812
Changelog:
QCLINUX: Revert "WORKAROUND: power: sequencing: qcom-wcn: skip BT devices without bt-enable GPIO" (5a472e184be9)
QCLINUX: Revert "WORKAROUND: power: sequencing: qcom-wcn: skip BT devices without bt-enable GPIO" (06f2b9c60834)
FROMLIST: arm64: dts: qcom: purwa-iot-evk: Describe the PCIe M.2 Key E connector
FROMLIST: arm64: dts: qcom: hamoa-iot-evk: Describe the PCIe M.2 Key E connector
QCLINUX: Revert "WORKAROUND: arm64: dts: qcom: purwa-iot-evk: support Bluetooth over both USB and UART"
QCLINUX: Revert "WORKAROUND: arm64: dts: qcom: hamoa-iot-evk: support Bluetooth over both USB and UART"
FROMLIST: arm64: dts: qcom: hamoa: Add compatible to the PCIe Root Port
FROMLIST: arm64: dts: qcom: hamoa: Add graph port/endpoint anchors to pcie4_port0 and uart14
FROMLIST: power: sequencing: pcie-m2: Deassert W_DISABLE2# when no UART serdev is created
FROMGIT: power: sequencing: pcie-m2: Match WCN6855 and WCN7851 UART BT variants by subdevice ID
UPSTREAM: pinctrl: qcom: Replace open coded eoi call with irq_chip_eoi_parent()
UPSTREAM: pinctrl: qcom: Register functions before enabling pinctrl
UPSTREAM: pinctrl: qcom: Drop redundant intr_target_reg on modern SoCs
FROMLIST: wifi: ath11k: unregister PM notifier on QMI init failure path
FROMLIST: wifi: ath11k: fix NULL dereference in ahb remove when QMI init incomplete
FROMLIST: wifi: ath11k: fix sporadic WLAN initialization failures
UPSTREAM: interconnect: qcom: qcs8300: fix the num_links for nsp icc node
FROMLIST: arm64: dts: qcom: shikra: Enable CDSP cooling
FROMLIST: coresight: tnoc: Bind Aggregator TNOC on the platform bus
FROMLIST: dt-bindings: arm: coresight-tnoc: Bind on platform bus instead of AMBA
BACKPORT: coresight-tnoc: Add runtime PM support for Interconnect TNOC
BACKPORT: coresight-tnoc: add platform driver to support Interconnect TNOC
BACKPORT: dt-bindings: arm: qcom: Add Coresight Interconnect TNOC
BACKPORT: arm64: dts: qcom: hamoa: Add label properties to CoreSight devices
BACKPORT: arm64: dts: qcom: talos: Add label properties to CoreSight devices
BACKPORT: arm64: dts: qcom: kodiak: Add label properties to CoreSight devices
BACKPORT: arm64: dts: qcom: monaco: Add label properties to CoreSight devices
BACKPORT: arm64: dts: qcom: lemans: Add label properties to CoreSight devices
BACKPORT: arm64: dts: qcom: lemans: enable static TPDM
FROMLIST: arm64: dts: qcom: purwa-evk: add DP0/DP1 audio playback support
FROMGIT: arm64: dts: qcom: lemans-evk: Describe the PCIe M.2 Key E connector
FROMGIT: arm64: dts: qcom: lemans: Add compatible to the PCIe Root Port
FROMGIT: power: sequencing: pwrseq-pcie-m2: Add QCC2072 BT PCI device ID
UPSTREAM: power: sequencing: pcie-m2: Sort PCI device IDs in ascending order
UPSTREAM: power: sequencing: pcie-m2: Add PCI ID 0x1103 for WCN6855 Bluetooth
UPSTREAM: wifi: ath12k: fix EHT TX MCS limitation due to wrong 20 MHz-only parsing
WORKAROUND: power: sequencing: qcom-wcn: skip BT devices without bt-enable GPIO
UPSTREAM: Bluetooth: qca: enable pwrseq support for WCN39xx devices
UPSTREAM: power: sequencing: qcom-wcn: add support for WCN39xx
UPSTREAM: regulator: dt-bindings: qcom,wcn3990-pmu: describe PMUs on WCN39xx
FROMLIST: arm64: dts: qcom: shikra: Add WCN3988 PMU and fix WiFi/BT supply routing
BACKPORT: arm64: dts: qcom: sa8775p: Add reg and clocks for QoS configuration
BACKPORT: interconnect: qcom: sa8775p: enable QoS configuration
UPSTREAM: dt-bindings: interconnect: add reg and clocks properties to enable QoS on sa8775p
UPSTREAM: arm64: dts: qcom: qcs8300: Add clocks for QoS configuration
UPSTREAM: interconnect: qcom: qcs8300: enable QoS configuration
UPSTREAM: dt-bindings: interconnect: qcom,qcs8300-rpmh: add clocks property to enable QoS
UPSTREAM: interconnect: qcom: kaanapali: Drop redundant link_nodes casts
UPSTREAM: arm64: dts: qcom: talos: Add clocks for QoS configuration
UPSTREAM: interconnect: qcom: qcs615: enable QoS configuration
UPSTREAM: dt-bindings: interconnect: qcom,qcs615-rpmh: add clocks property to enable QoS
UPSTREAM: interconnect: qcom: icc-rpmh: drop support for non-dynamic IDS
UPSTREAM: interconnect: qcom: sm8750: convert to dynamic IDs
UPSTREAM: interconnect: qcom: sm8650: convert to dynamic IDs
UPSTREAM: interconnect: qcom: sm8550: convert to dynamic IDs
UPSTREAM: interconnect: qcom: sm8450: convert to dynamic IDs
UPSTREAM: interconnect: qcom: sm8350: convert to dynamic IDs
UPSTREAM: interconnect: qcom: sm8150: convert to dynamic IDs
UPSTREAM: interconnect: qcom: sm7150: convert to dynamic IDs
UPSTREAM: interconnect: qcom: sm6350: convert to dynamic IDs
BACKPORT: interconnect: qcom: sdx75: convert to dynamic IDs
UPSTREAM: interconnect: qcom: sdx65: convert to dynamic IDs
UPSTREAM: interconnect: qcom: sdx55: convert to dynamic IDs
UPSTREAM: interconnect: qcom: sdm670: convert to dynamic IDs
UPSTREAM: interconnect: qcom: sc7180: convert to dynamic IDs
UPSTREAM: interconnect: qcom: sar2130p: convert to dynamic IDs
UPSTREAM: interconnect: qcom: qdu1000: convert to dynamic IDs
UPSTREAM: interconnect: qcom: qcs8300: convert to dynamic IDs
UPSTREAM: interconnect: qcom: qcs615: convert to dynamic IDs
UPSTREAM: interconnect: qcom: x1e80100: convert to dynamic IDs
UPSTREAM: interconnect: qcom: sm8250: convert to dynamic IDs
UPSTREAM: interconnect: qcom: sdm845: convert to dynamic IDs
UPSTREAM: interconnect: qcom: sc8280xp: convert to dynamic IDs
UPSTREAM: interconnect: qcom: sc8180x: convert to dynamic IDs
UPSTREAM: interconnect: qcom: sc7280: convert to dynamic IDs
UPSTREAM: interconnect: qcom: icc-rpmh: convert link_nodes to dynamic array
FROMLIST: wifi: ath12k: Fix low MLO RX throughput on WCN7850
FROMLIST: wifi: ath12k: change MAC buffer ring size to 4096