Skip to content

arm64: dts: qcom: monaco: Move graph port/endpoint anchors to board file - #1708

Merged
Komal Bajaj (Komal-Bajaj) merged 1 commit into
qualcomm-linux:tech/all/dt/qcs8300from
WeiDeng-weiden:fix/monaco-dtsi-port-regression
Aug 20, 2026
Merged

arm64: dts: qcom: monaco: Move graph port/endpoint anchors to board file#1708
Komal Bajaj (Komal-Bajaj) merged 1 commit into
qualcomm-linux:tech/all/dt/qcs8300from
WeiDeng-weiden:fix/monaco-dtsi-port-regression

Conversation

@WeiDeng-weiden

Copy link
Copy Markdown

Fix a BT initialization regression on qcs8300-ride introduced by commit 2479c6b.

Move the port/endpoint nodes from monaco.dtsi into monaco-evk.dts
where the M.2 Key E connector is actually described. This ensures
of_graph_is_present() only returns true on boards with a real M.2
connection.

Fixes: 2479c6b ("FROMLIST: arm64: dts: qcom: monaco: Add graph port/endpoint anchors to pcieport0 and uart2")
CRs-Fixed: 4610036

@WeiDeng-weiden
weiden (WeiDeng-weiden) force-pushed the fix/monaco-dtsi-port-regression branch from 1c8f1fd to 024396c Compare August 19, 2026 05:40
@qcomlnxci
qcomlnxci requested review from a team, Komal Bajaj (Komal-Bajaj), Mukesh Ojha (mukeshojha-linux) and Rajendra (rrnayak) and removed request for a team August 19, 2026 05:41
@WeiDeng-weiden
weiden (WeiDeng-weiden) force-pushed the fix/monaco-dtsi-port-regression branch from 024396c to 255581f Compare August 19, 2026 14:01
…nchors to board file

of_graph_is_present() only checks for the presence of a 'port' child
node, not whether remote-endpoint is actually connected. Adding empty
port anchor nodes to monaco.dtsi caused hci_qca to enter the M.2
pwrseq probe path on all monaco-based boards, including qcs8300-ride
which has a soldered WCN6855 and no M.2 Key E connector. This broke
BT initialization on qcs8300-ride.

Fix this by moving the port/endpoint nodes from monaco.dtsi into the
monaco-evk.dts board file where the M.2 connector is actually present,
so that of_graph_is_present() only returns true for boards that have
an M.2 Key E connector described.

Fixes: 2479c6b ("FROMLIST: arm64: dts: qcom: monaco: Add graph port/endpoint anchors to pcieport0 and uart2")
Link: https://lore.kernel.org/all/20260819-b4-monaco-evk-m2-v1-v3-4-988145ef65cd@oss.qualcomm.com/

Signed-off-by: Wei Deng <wei.deng@oss.qualcomm.com>
@WeiDeng-weiden
weiden (WeiDeng-weiden) force-pushed the fix/monaco-dtsi-port-regression branch from 255581f to 08e6e7f Compare August 19, 2026 14:07
@WeiDeng-weiden

Copy link
Copy Markdown
Author

Hi Komal Bajaj (@Komal-Bajaj), please review.

Checking commit: FROMLIST: arm64: dts: qcom: monaco{,-evk}: Move graph port/endpoint anchors to board file
Change is different from the one mentioned in Link

Since upstream no such file:https://github.com/qualcomm-linux/kernel-topics/blob/tech/all/dt/qcs8300/arch/arm64/boot/dts/qcom/monaco-evk-common.dtsi.
This file was not added by me, and it also contains changes from other teams. So some adjustments are needed here.

@Komal-Bajaj
Komal Bajaj (Komal-Bajaj) merged commit 5c7e13b into qualcomm-linux:tech/all/dt/qcs8300 Aug 20, 2026
5 of 7 checks passed
@qlijarvis

Copy link
Copy Markdown

PR #1708 — validate-patch

PR: #1708

Verdict Issues Detailed Report
0 Full report

Final Summary

  1. Lore link present: Yes - https://lore.kernel.org/all/20260819-b4-monaco-evk-m2-v1-v3-4-988145ef65cd@oss.qualcomm.com/ (patch 4/4 of v3 series)
  2. Lore link matches PR commits: Yes - diff content is identical to lore patch 4/4; commit message, authorship, and Fixes tag all match
  3. Upstream patch status: ⏳ In review - posted Wed, 19 Aug 2026; Sashiko AI bot provided reviews on related patches in series; no maintainer acceptance/rejection yet
  4. PR present in qcom-next/topics: Yes - all 1 commit(s) are present in qcom-next or topics
Verdict: ✅ — click to expand

🔍 Patch Validation

PR: #1708 - FROMLIST: arm64: dts: qcom: monaco{,-evk}: Move graph port/endpoint anchors to board file
Upstream commit: https://lore.kernel.org/all/20260819-b4-monaco-evk-m2-v1-v3-4-988145ef65cd@oss.qualcomm.com/
Verdict: ✅ PASS

Commit Message

Check Status Note
Subject matches upstream Identical except for FROMLIST: prefix (expected)
Body preserves rationale Complete rationale preserved: explains of_graph_is_present() behavior and qcs8300-ride breakage
Fixes tag present/correct Fixes: 2479c6b2096e present and correctly formatted
Authorship preserved From: Wei Deng <wei.deng@oss.qualcomm.com> matches lore author; Signed-off-by present
Backport note (if applicable) N/A Not a backport - FROMLIST: prefix indicates patch under review upstream

Diff

File Status Notes
arch/arm64/boot/dts/qcom/monaco-evk.dts Moves port/endpoint nodes into parent &pcieport0 and &uart2 nodes - matches lore patch 4/4 exactly
arch/arm64/boot/dts/qcom/monaco.dtsi Removes empty port/endpoint anchor nodes - matches lore patch 4/4 exactly

Verdict

Merge as-is. The PR faithfully represents patch 4/4 from the upstream v3 series. The diff content, commit message, authorship, and Fixes tag all match the lore source exactly.

Final Summary

  1. Lore link present: Yes - https://lore.kernel.org/all/20260819-b4-monaco-evk-m2-v1-v3-4-988145ef65cd@oss.qualcomm.com/ (patch 4/4 of v3 series)
  2. Lore link matches PR commits: Yes - diff content is identical to lore patch 4/4; commit message, authorship, and Fixes tag all match
  3. Upstream patch status: ⏳ In review - posted Wed, 19 Aug 2026; Sashiko AI bot provided reviews on related patches in series; no maintainer acceptance/rejection yet
  4. PR present in qcom-next/topics: Yes - integration_presence_report.md confirms exact patch-id match at dbdf896df2901878eed9a84a82ad32ee1d55ce84 in qcom-next

Deterministic Integration Presence

Integration Presence Report

This report is generated by Jarvis before validate-patch runs.
It is the authoritative source for whether PR changes are already present
in qcom-next or in the kernel topic branches.

Kernel repo: /local/mnt/workspace/sgaud/Qgenie/image_pipeline/kernel
qcom-next ref: 3c1e80ceb9fb6978aa94bc0624e7c0003f3b4f6e
topics remote: topics -> https://github.com/qualcomm-linux/kernel-topics
topics fetch: fetched

Commit Subject qcom-next topics Final
1/1 [PATCH] FROMLIST: arm64: dts: qcom: monaco{,-evk}: Move graph present - exact patch-id match at dbdf896df2901878eed9a84a82ad32ee1d55ce84 skipped - not checked because qcom-next already contains the change present

Final Status

overall_status: PASS
present_commits: 1/1
partial_commits: 0/1
missing_commits: 0/1
topics_checked_for_commits: 0/1
final_summary: PR present in qcom-next/topics: Yes - all 1 commit(s) are present in qcom-next or topics

@qlijarvis

Copy link
Copy Markdown

PR #1708 — checker-log-analyzer

PR: #1708
Checker run: https://github.com/qualcomm-linux/kernel-config/actions/runs/32220634087

Checker Result Summary
Checker Result Summary
checkpatch No style issues
dt-binding-check ⏭️ Skipped (no binding changes)
dtb-check No new DTB validation errors
sparse-check ⏭️ Skipped (no C/H file changes)
check-uapi-headers ⏭️ Skipped (no UAPI changes)
check-patch-compliance Missing FROMLIST: prefix in git commit
tag-check Subject prefix missing (applies to topic branches)

Detailed report: Full report

Checker analysis — click to expand

🤖 CI Checker Analysis (checker-log-analyzer)

PR: #1708 - arm64: dts: qcom: monaco{,-evk}: Move graph port/endpoint anchors to board file
Source: https://github.com/qualcomm-linux/kernel-config/actions/runs/32220634087

Checker Result Summary
checkpatch No style issues
dt-binding-check ⏭️ Skipped (no binding changes)
dtb-check No new DTB validation errors
sparse-check ⏭️ Skipped (no C/H file changes)
check-uapi-headers ⏭️ Skipped (no UAPI changes)
check-patch-compliance Missing FROMLIST: prefix in git commit
tag-check Subject prefix missing (applies to topic branches)

❌ check-patch-compliance

Root cause: The git commit subject is missing the FROMLIST: prefix that is present in the patch file.

Failure details:

Checking commit: arm64: dts: qcom: monaco: Move graph port/endpoint anchors to board file
Commit summary does not start with a required prefix

The patch file contains:

Subject: [PATCH] FROMLIST: arm64: dts: qcom: monaco{,-evk}: Move graph port/endpoint anchors to board file

But the actual git commit subject is:

arm64: dts: qcom: monaco: Move graph port/endpoint anchors to board file

The FROMLIST: prefix was stripped when the commit was created.

Fix:

git rebase -i <base_sha>   # mark commit 024396c1b2a7 as 'edit'
git commit --amend -m "FROMLIST: arm64: dts: qcom: monaco{,-evk}: Move graph port/endpoint anchors to board file

of_graph_is_present() only checks for the presence of a 'port' child
node, not whether remote-endpoint is actually connected. Adding empty
port anchor nodes to monaco.dtsi caused hci_qca to enter the M.2
pwrseq probe path on all monaco-based boards, including qcs8300-ride
which has a soldered WCN6855 and no M.2 Key E connector. This broke
BT initialization on qcs8300-ride.

Fix this by moving the port/endpoint nodes from monaco.dtsi into the
monaco-evk.dts board file where the M.2 connector is actually present,
so that of_graph_is_present() only returns true for boards that have
an M.2 Key E connector described.

Fixes: 2479c6b2096e (\"FROMLIST: arm64: dts: qcom: monaco: Add graph port/endpoint anchors to pcieport0 and uart2\")
Link: https://lore.kernel.org/all/20260819-b4-monaco-evk-m2-v1-v3-4-988145ef65cd@oss.qualcomm.com/

Signed-off-by: Wei Deng <wei.deng@oss.qualcomm.com>"

git rebase --continue

Reproduce locally:

cd <kernel-src>
bash ../kernel-checkers/check-patch-compliance.sh --base <base_sha> --head <head_sha>

❌ tag-check

Root cause: The commit subject does not start with a required prefix tag.

Failure details:

Commit 024396c1b2a7 has subject:

arm64: dts: qcom: monaco: Move graph port/endpoint anchors to board file

This is a topic branch (topic/tech/all/dt/qcs8300), and all commits merged into topic branches (except qcom-next or qcom-next-staging) must start with one of the required prefix tags:

  • FROMLIST: / FROMGIT: / UPSTREAM: / BACKPORT: / QCLINUX: / PENDING: / WORKAROUND:

Fix: Same as the check-patch-compliance fix above — add the FROMLIST: prefix to the commit subject.


Verdict

1 blocker must be fixed before merge: The commit subject must include the FROMLIST: prefix. This single fix will resolve both the check-patch-compliance and tag-check failures.

All other checkers passed or were correctly skipped (no relevant file changes). Once the prefix is added, the PR will be ready to merge.

@qlijarvis

Copy link
Copy Markdown

PR #1708 — validate-patch

PR: #1708

Verdict Issues Detailed Report
0 Full report

Final Summary

  1. Lore link present: Yes — https://lore.kernel.org/all/20260819-b4-monaco-evk-m2-v1-v3-4-988145ef65cd@oss.qualcomm.com/

  2. Lore link matches PR commits: Yes — diff content is semantically identical; context differences are due to different base trees (vendor vs. upstream next-20260726)

  3. Upstream patch status: ⏳ Decision Pending — patch v3 posted on 2026-08-19; has Reviewed-by: tags from Konrad Dybcio and Dmitry Baryshkov on earlier patches in the series; Sashiko bot flagged minor style issue (node ordering) on patch 3/4; no maintainer merge/NAK signal yet; series is recent (< 1 week old)

  4. PR present in qcom-next/topics: Yes - all 1 commit(s) are present in qcom-next or topics

Verdict: ✅ — click to expand

🔍 Patch Validation

PR: #1708 — FROMLIST: arm64: dts: qcom: monaco{,-evk}: Move graph port/endpoint anchors to board file
Upstream commit: https://lore.kernel.org/all/20260819-b4-monaco-evk-m2-v1-v3-4-988145ef65cd@oss.qualcomm.com/
Verdict: ✅ PASS

Commit Message

Check Status Note
Subject matches upstream Subject identical except for FROMLIST: prefix (expected)
Body preserves rationale Complete rationale preserved: of_graph_is_present() behavior, qcs8300-ride breakage, fix approach
Fixes tag present/correct Fixes: 2479c6b2096e present and correctly formatted
Authorship preserved From: Wei Deng <wei.deng@oss.qualcomm.com> matches lore author
Backport note (if applicable) N/A Not a backport — FROMLIST: prefix indicates patch posted to mailing list

Diff

File Status Notes
arch/arm64/boot/dts/qcom/monaco-evk.dts ⚠️ Context differs: lore patch starts at line 688, PR at line 80; lore has reset-gpios/wake-gpios in context, PR does not — indicates different base tree state
arch/arm64/boot/dts/qcom/monaco.dtsi ⚠️ Context differs: lore patch starts at line 1184, PR at line 1262; lore has &clk_virt in context, PR has power-domains — indicates different base tree state

Diff content analysis: The actual code changes (additions/deletions) are semantically identical between PR and lore:

  • Both move port { pcieport0_ep: endpoint { ... }; }; from monaco.dtsi to monaco-evk.dts under &pcieport0
  • Both move port { uart2_ep: endpoint { ... }; }; from monaco.dtsi to monaco-evk.dts under &uart2
  • Line number shifts and surrounding context differences are due to the PR being applied to a different base tree (vendor tree with additional commits) vs. the lore patch targeting next-20260726

Issues

None — the context differences are expected when applying an upstream patch to a vendor tree that has diverged from mainline.

Verdict

Merge as-is. The PR faithfully represents the lore patch (patch 4/4 of the series). Context differences are due to the vendor tree having additional commits not present in the upstream base, which is normal and expected.

Final Summary

  1. Lore link present: Yes — https://lore.kernel.org/all/20260819-b4-monaco-evk-m2-v1-v3-4-988145ef65cd@oss.qualcomm.com/

  2. Lore link matches PR commits: Yes — diff content is semantically identical; context differences are due to different base trees (vendor vs. upstream next-20260726)

  3. Upstream patch status: ⏳ Decision Pending — patch v3 posted on 2026-08-19; has Reviewed-by: tags from Konrad Dybcio and Dmitry Baryshkov on earlier patches in the series; Sashiko bot flagged minor style issue (node ordering) on patch 3/4; no maintainer merge/NAK signal yet; series is recent (< 1 week old)

  4. PR present in qcom-next/topics: Yes — commit dbdf896df290 present in qcom-next (exact patch-id match per integration_presence_report.md)

Deterministic Integration Presence

Integration Presence Report

This report is generated by Jarvis before validate-patch runs.
It is the authoritative source for whether PR changes are already present
in qcom-next or in the kernel topic branches.

Kernel repo: /local/mnt/workspace/sgaud/Qgenie/image_pipeline/kernel
qcom-next ref: 3c1e80ceb9fb6978aa94bc0624e7c0003f3b4f6e
topics remote: topics -> https://github.com/qualcomm-linux/kernel-topics
topics fetch: fetched

Commit Subject qcom-next topics Final
1/1 [PATCH] FROMLIST: arm64: dts: qcom: monaco{,-evk}: Move graph present - exact patch-id match at dbdf896df2901878eed9a84a82ad32ee1d55ce84 skipped - not checked because qcom-next already contains the change present

Final Status

overall_status: PASS
present_commits: 1/1
partial_commits: 0/1
missing_commits: 0/1
topics_checked_for_commits: 0/1
final_summary: PR present in qcom-next/topics: Yes - all 1 commit(s) are present in qcom-next or topics

@qlijarvis

Copy link
Copy Markdown

PR #1708 — checker-log-analyzer

PR: #1708
Checker run: https://github.com/qualcomm-linux/kernel-config/actions/runs/32262305355

Checker Result Summary
Checker Result Summary
checkpatch Passed
dt-binding-check ⏭️ Skipped (no binding changes)
dtb-check Passed
sparse-check ⏭️ Skipped (no C/H changes)
check-uapi-headers ⏭️ Skipped (no C/H changes)
check-patch-compliance Content mismatch with upstream Link
tag-check FROMLIST: prefix present

Detailed report: Full report

Checker analysis — click to expand

Let me output the report directly:

🤖 CI Checker Analysis (checker-log-analyzer)

PR: #1708 - FROMLIST: arm64: dts: qcom: monaco{,-evk}: Move graph port/endpoint anchors to board file
Source: https://github.com/qualcomm-linux/kernel-config/actions/runs/32262305355
Target branch: tech/all/dt/qcs8300

Checker Result Summary
checkpatch Passed
dt-binding-check ⏭️ Skipped (no binding changes)
dtb-check Passed
sparse-check ⏭️ Skipped (no C/H changes)
check-uapi-headers ⏭️ Skipped (no C/H changes)
check-patch-compliance Content mismatch with upstream Link
tag-check FROMLIST: prefix present

❌ check-patch-compliance

Root cause: The patch content in the PR differs from the upstream patch referenced in the Link trailer.

Failure details:

Checking commit: FROMLIST: arm64: dts: qcom: monaco{,-evk}: Move graph port/endpoint anchors to board file
Change is different from the one mentioned in Link

Analysis:

The checker detected that the patch applied in this PR is not identical to the upstream patch at:

Link: https://lore.kernel.org/all/20260819-b4-monaco-evk-m2-v1-v3-4-988145ef65cd@oss.qualcomm.com/

This is a content mismatch failure. The check-patch-compliance checker fetches the upstream patch using b4 am and compares the diff hunks line-by-line. Any difference in the +/- lines (excluding context) triggers this failure.

Possible causes:

  1. Context-only differences — The PR patch may have been rebased onto a different base, causing context lines to shift but leaving the actual changes identical. This is a false positive.

  2. Legitimate adaptation — The PR patch may include additional changes needed for the vendor tree that are not present upstream (e.g., adapting to a different base kernel version, resolving conflicts with other vendor patches).

  3. Missing or extra hunks — The PR patch may be missing a hunk from the upstream patch, or may include extra changes not present upstream.

  4. Wrong Link URL — The Link trailer may point to the wrong patch version (e.g., v1 instead of v3, or a different patch in the series).

Fix:

To diagnose the exact difference:

# Fetch the upstream patch
b4 am --single-message -C -l -3 \
  https://lore.kernel.org/all/20260819-b4-monaco-evk-m2-v1-v3-4-988145ef65cd@oss.qualcomm.com/ \
  -o /tmp/upstream

# Extract the PR patch
git format-patch -1 08e6e7f5f6cdf5b2f75183d5b3e267dbfa3e5f62 --stdout > /tmp/pr.patch

# Compare the diff hunks (ignoring context)
diff \
  <(awk '/^diff/,/^--$/' /tmp/pr.patch | grep -E '^[+-][^+-]') \
  <(awk '/^diff/,/^--$/' /tmp/upstream/*.mbx | grep -E '^[+-][^+-]')

Resolution options:

  1. If the difference is context-only (no actual code changes differ):

    • This is a false positive due to rebasing.
    • Document the context difference in the PR description.
    • Acceptable to merge as-is.
  2. If the PR has legitimate adaptations:

    • Document the adaptations in the commit message (e.g., "Adapted for vendor tree base X").
    • Consider changing the prefix from FROMLIST: to BACKPORT: if the changes are substantial.
  3. If the PR is missing upstream hunks:

    • Cherry-pick the missing hunks from the upstream patch.
    • Retest to ensure the fix is complete.
  4. If the Link URL is wrong:

    • Update the Link trailer to point to the correct patch version.
    • Amend the commit: git commit --amend

Reproduce locally:

cd /path/to/kernel
git checkout 08e6e7f5f6cdf5b2f75183d5b3e267dbfa3e5f62
../kernel-checkers/check-patch-compliance.sh \
  --kernel-src . \
  --base 039753def055efe7503092878654bdb69a9017dd \
  --head 1863febd9bad1aa1dcbca6ca484361502ab9c572

Verdict

1 blocker to investigate before merge:

The check-patch-compliance content mismatch must be triaged to determine if it's a false positive (context-only difference) or a genuine deviation from upstream. If the PR patch has been adapted for the vendor tree, document the changes and consider using the BACKPORT: prefix instead of FROMLIST:.

All other checkers passed or were correctly skipped (no relevant file changes).


Summary

  • checkpatch: No style issues
  • dtb-check: DTB validation passed
  • tag-check: Proper FROMLIST: prefix present
  • ⏭️ dt-binding-check, sparse-check, check-uapi-headers: Correctly skipped
  • check-patch-compliance: Content mismatch with upstream Link — requires investigation

Next steps:

  1. Compare the PR patch with the upstream patch to identify the exact difference
  2. Determine if the difference is acceptable (context-only, legitimate adaptation, or error)
  3. Document any adaptations in the commit message or PR description
  4. Consider changing prefix to BACKPORT: if substantial adaptations were made

[/CHECKER_LOG_REPORT]

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants