Add V3 Coresight DT patch for Glymur

[jiegan0107]

Add V3 Coresight DT patch for Glymur

[sgaud-quic]

🔨 Build Failure Analysis — PR #1159

PR: #1159
Build run: https://github.com/qualcomm-linux/kernel-config/actions/runs/25912039829

#	Error	File:Line	PR-introduced?	Root Cause
1	CONFLICT (content): Merge conflict in arch/arm64/boot/dts/qcom/glymur.dtsi	arch/arm64/boot/dts/qcom/glymur.dtsi	Yes	PR patch 2/3 reverts the existing Coresight DT content in glymur.dtsi (removing ~1300 lines and replacing them with non-Coresight nodes), but the qcom-next baseline already contains a different version of those same lines, causing a content conflict during the ci-merge auto-merge step

Verdict

All 1 failure is introduced by this PR: the large-scale revert of glymur.dtsi Coresight content in patch 2/3 conflicts with the current state of arch/arm64/boot/dts/qcom/glymur.dtsi on the qcom-next baseline branch.

📎 Detailed analysis: Full report

[sgaud-quic]

🔨 Build Failure Analysis — PR #1159

PR: #1159
Build run: https://github.com/qualcomm-linux/kernel-config/actions/runs/25912039829

#	Error	File:Line	PR-introduced?	Root Cause
1	CONFLICT (content): Merge conflict in arch/arm64/boot/dts/qcom/glymur.dtsi	arch/arm64/boot/dts/qcom/glymur.dtsi	Yes	PR's 3-patch series rewrites large sections of glymur.dtsi (reverts old coresight nodes, then re-adds V3 coresight nodes) against a qcom-next baseline that has already diverged from the index commits referenced in the patch (268a2d4b4b6bc / f42dc9c8c817f). The automerge CI tool (ci-merge) cannot fast-forward-merge topic/tech/all/dt/glymur onto the current qcom-next HEAD (9f3cbcbfaa5a143d339bcabf1a6a6ac98107e084). Both the build and build_rt jobs hit the identical conflict.

Verdict

All 1 failure is introduced by this PR: the topic branch tech/all/dt/glymur has a content conflict with the current qcom-next baseline in arch/arm64/boot/dts/qcom/glymur.dtsi and cannot be auto-merged.

📎 Detailed analysis: Full report

[sgaud-quic]

PR #1159 — validate-patch

PR: #1159

Verdict	Issues	Detailed Report
⚠️	0	Full report

Verdict: ⚠️ — click to expand

🔍 Patch Validation

PR: PR #1159 — FROMLIST: arm64: dts: qcom: glymur: add coresight nodes (3-commit series)
Upstream commit: https://lore.kernel.org/all/20260515-add-coresight-nodes-for-glymur-v3-1-83ab39db275d@oss.qualcomm.com/
Verdict: ⚠️ PARTIAL

---

Per-Commit Analysis

Commit 1/3 — Revert "WORKAROUND: arm64: dts: qcom: Mahua: Removing Qdss DSP node"

Check	Status	Note
Subject matches upstream	✅ N/A	Revert of a WORKAROUND: commit — no upstream lore link expected
Body preserves rationale	✅	Clearly states reason: "addressed in Coresight DT patch V3"
Fixes tag present/correct	✅ N/A	Not applicable for a revert
Authorship preserved	✅	From: Jie Gan is the author of the revert — correct
Backport note	✅ N/A	Not applicable
Lore link	✅ N/A	WORKAROUND: commits have no upstream lore by design; revert of one likewise needs none

Diff: Reverts QDSS_DSP: label on cti@111ab000 in glymur.dtsi and removes /delete-node/ &QDSS_DSP from mahua.dtsi. Mechanically correct revert of the stated commit (7dbe137534c0). ✅

---

Commit 2/3 — Revert "FROMLIST: arm64: dts: qcom: glymur: add coresight nodes"

Check	Status	Note
Subject matches upstream	✅ N/A	Internal vendor-tree revert of a prior FROMLIST commit
Body preserves rationale	✅	States: "Update the Coresight DT patch to V3"
Fixes tag present/correct	✅ N/A	Not applicable
Authorship preserved	✅	From: Jie Gan — correct for a vendor-tree revert
Backport note	✅ N/A	Not applicable
Lore link	⚠️	No Link: to the original FROMLIST posting being reverted; acceptable for a housekeeping revert but a link to the v1/v2 lore posting would improve traceability

Diff: Reverts commit 245e0672b7d5 — the prior v1/v2 FROMLIST coresight patch. The diff is a large mechanical revert (1509-line change, 206 insertions / 1303 deletions), consistent with undoing the previous coresight node addition. ✅

---

Commit 3/3 — FROMLIST: arm64: dts: qcom: glymur: add coresight nodes

Check	Status	Note
Subject matches upstream	✅	Subject (stripped of FROMLIST: prefix) matches the lore v3 posting title
Body preserves rationale	✅	Body describes TPDM→ETF/STM→ETF trace paths, AOSS/CDSP/QDSS/PCIe5/TraceNoc scope, and the cti_wpss deletion rationale for Mahua
Fixes tag present/correct	✅ N/A	No Fixes: tag — not a bugfix patch, new feature DT nodes
Authorship preserved	✅	FROMLIST: rule: submitter (Jie Gan) in From: is correct; original lore author's Signed-off-by: Jie Gan is present (same person — author is also submitter)
Backport note	✅ N/A	Not a backport
Lore link	✅	Link: https://lore.kernel.org/all/20260515-add-coresight-nodes-for-glymur-v3-1-83ab39db275d@oss.qualcomm.com/ present and well-formed
Author date vs lore date	⚠️	Commit Date: is Wed, 18 Mar 2026 but the lore link message-ID prefix is 20260515 (May 15, 2026). The commit was originally authored for v1/v2 and the Date: header was not updated when v3 was posted. This is a stale author date.

Diff: Adds ~1304 lines of coresight DT nodes to glymur.dtsi (STM, TPDA, TPDM, funnels, ETF, replicator, CTI, TraceNoc, static-tpdm nodes) and adds /delete-node/ &cti_wpss to mahua.dtsi. The diff is consistent with the commit message description. Since network access is blocked, direct line-by-line comparison against the lore v3 raw patch could not be performed — the diff content is internally self-consistent and the lore link points to v3 which matches the PR submission date.

Upstream status: ⏳ Decision Pending — patch is FROMLIST: (v3 posted 2026-05-15); not yet merged into mainline. Network access blocked; could not confirm acceptance signals from the lore thread.

qcom-next presence: ⏭️ Skipped — no kernel repo found on system and network access is blocked; verify manually.

---

Issues

1. ⚠️ Commit 3 — Stale author Date: header (Wed, 18 Mar 2026): The commit was originally authored for an earlier revision (v1/v2) and the Date: was not refreshed when v3 was posted on 2026-05-15. While not a functional problem, it creates a misleading timeline. Recommend git commit --amend --reset-author or --date to align with the v3 posting date.

2. ⚠️ Commit 2 — Missing Link: to original FROMLIST posting: The revert of the prior FROMLIST commit (245e0672) does not include a Link: back to the v1/v2 lore posting it is reverting. This is a minor traceability gap; adding Link: https://lore.kernel.org/... for the original v1/v2 message-ID would make the history clearer.

3. ⏭️ Lore diff comparison skipped: Network access to lore.kernel.org is blocked in this environment. The diff content of commit 3 could not be verified line-by-line against the upstream v3 lore patch. Manual verification is recommended before merge.

---

Verdict

The series is structurally sound — commits 1 and 2 are clean vendor-tree housekeeping reverts, and commit 3 is a well-formed FROMLIST: with a correct lore v3 link and proper Signed-off-by:. The two minor issues (stale author date in commit 3, missing lore link in commit 2's revert) should be addressed before merge, and the diff of commit 3 must be manually verified against the lore v3 patch since network access was unavailable during this analysis.

[sgaud-quic]

PR #1159 — checker-log-analyzer

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

Checker	Result	Summary
Checker	Result	Summary
checkpatch	❌	Merge conflict in glymur.dtsi — never reached check phase
dt-binding-check	❌	Merge conflict in glymur.dtsi — never reached check phase
dtb-check	❌	Merge conflict in glymur.dtsi — never reached check phase
sparse-check	❌	Merge conflict in glymur.dtsi — never reached check phase
check-uapi-headers	❌	Merge conflict in glymur.dtsi — never reached check phase
check-patch-compliance	❌	Merge conflict in glymur.dtsi — never reached check phase
tag-check	❌	2 of 3 commits missing required prefix before Revert
qcom-next-check	N/A	Branch is tech/all/dt/glymur, not qcom-next

Detailed report: Full report

Checker analysis — click to expand

🤖 CI Checker Analysis (checker-log-analyzer)

PR: #1159 — Coresight DT V3 update for glymur (3 commits by Jie Gan)
Source: https://github.com/qualcomm-linux/kernel-config/actions/runs/25912078252

Checker	Result	Summary
checkpatch	❌	Merge conflict in glymur.dtsi — never reached check phase
dt-binding-check	❌	Merge conflict in glymur.dtsi — never reached check phase
dtb-check	❌	Merge conflict in glymur.dtsi — never reached check phase
sparse-check	❌	Merge conflict in glymur.dtsi — never reached check phase
check-uapi-headers	❌	Merge conflict in glymur.dtsi — never reached check phase
check-patch-compliance	❌	Merge conflict in glymur.dtsi — never reached check phase
tag-check	❌	2 of 3 commits missing required prefix before Revert
qcom-next-check	N/A	Branch is tech/all/dt/glymur, not qcom-next

---

❌ All Checkers — Merge Conflict (Root Cause)

Root cause: The CI integration branch cannot be built because arch/arm64/boot/dts/qcom/glymur.dtsi has a content conflict when merging topic branch topic/tech/all/dt/glymur onto the baseline 9f3cbcbfaa5a143d339bcabf1a6a6ac98107e084.

Failure details:

** Merging topic branch: topic/tech/all/dt/glymur
Auto-merging arch/arm64/boot/dts/qcom/glymur.dtsi
CONFLICT (content): Merge conflict in arch/arm64/boot/dts/qcom/glymur.dtsi
Automatic merge failed; fix conflicts and then commit the result.
Merge failed, manual merge
##[error]Process completed with exit code 1.

This identical error appears in all six checker logs (checkpatch, dt-binding-check, dtb-check, sparse-check, check-uapi-headers, check-patch-compliance). None of the checkers reached their actual analysis phase.

Root cause analysis: The PR contains 3 commits that revert and replace the Coresight DT nodes in glymur.dtsi. Commit 2 reverts FROMLIST: arm64: dts: qcom: glymur: add coresight nodes (removing ~1300 lines), and Commit 3 adds the V3 version. Another topic branch in the integration tree has independently modified glymur.dtsi, causing a content conflict that the CI automerge cannot resolve automatically.

Fix: Rebase the PR branch (topic/tech/all/dt/glymur) onto the current baseline (9f3cbcbfaa5a143d339bcabf1a6a6ac98107e084) and resolve the conflict in glymur.dtsi:

git fetch origin
git checkout topic/tech/all/dt/glymur
git rebase 9f3cbcbfaa5a143d339bcabf1a6a6ac98107e084
# Resolve conflict in arch/arm64/boot/dts/qcom/glymur.dtsi
git add arch/arm64/boot/dts/qcom/glymur.dtsi
git rebase --continue
git push --force-with-lease

Reproduce locally:

git checkout -b integ 9f3cbcbfaa5a143d339bcabf1a6a6ac98107e084
git merge topic/tech/all/dt/glymur
# Observe: CONFLICT (content): Merge conflict in arch/arm64/boot/dts/qcom/glymur.dtsi

---

❌ tag-check — Missing Prefix on Revert Commits

Root cause: Two of the three commits are bare Revert "..." subjects with no required prefix tag before Revert, which is mandatory for all branches except qcom-next and qcom-next-staging.

Failure details:

Commit	Subject	Status
1	Revert "WORKAROUND: arm64: dts: qcom: Mahua: Removing Qdss DSP node"	❌ Missing prefix
2	Revert "FROMLIST: arm64: dts: qcom: glymur: add coresight nodes"	❌ Missing prefix
3	FROMLIST: arm64: dts: qcom: glymur: add coresight nodes	✅

The target branch tech/all/dt/glymur requires every commit subject to start with FROMLIST:, FROMGIT:, UPSTREAM:, BACKPORT:, QCLINUX:, PENDING:, or WORKAROUND:. Revert commits must carry a prefix before the word Revert.

Fix: Amend both revert commits to add the appropriate prefix. Since these reverts are of vendor/topic-branch commits (not upstream), QCLINUX: is appropriate:

git rebase -i <base_sha>   # mark commits 1 and 2 as 'edit'

# For commit 1:
git commit --amend -m 'QCLINUX: Revert "WORKAROUND: arm64: dts: qcom: Mahua: Removing Qdss DSP node"

This reverts commit 7dbe137534c06846a165523c4dc28f5956d82428.
This issue has been addressed in Coresight DT patch V3. Revert this
commit for updating the Coresight DT patch to V3.'
git rebase --continue

# For commit 2:
git commit --amend -m 'QCLINUX: Revert "FROMLIST: arm64: dts: qcom: glymur: add coresight nodes"

This reverts commit 245e0672b7d535079e61f806845092a43aed2c26.
Update the Coresight DT patch to V3.'
git rebase --continue

Reproduce locally:

git log <base>..<head> --format="%H %s" | grep -v -E '^[a-f0-9]+ (FROMLIST|FROMGIT|UPSTREAM|BACKPORT|QCLINUX|PENDING|WORKAROUND):'

---

Verdict

2 blockers before merge:

1. Merge conflict (blocker for all checkers) — rebase topic/tech/all/dt/glymur onto baseline 9f3cbcbfaa5a143d339bcabf1a6a6ac98107e084 and resolve the glymur.dtsi conflict. Once resolved, re-trigger CI to get actual checker results.
2. tag-check — add QCLINUX: prefix to the two bare Revert "..." commit subjects (commits 1 and 2).

Note: Because the merge conflict prevented all checkers from running, the actual patch content (checkpatch style, DT binding validity, DTB correctness, sparse warnings, UAPI ABI) has not been validated by this CI run. A clean re-run after rebasing is required to confirm no additional issues.

[sgaud-quic]

PR #1159 — validate-patch

PR: #1159

Verdict	Issues	Detailed Report
⚠️	0	Full report

Verdict: ⚠️ — click to expand

Patch Validation Report

PR: #1159 — FROMLIST: arm64: dts: qcom: glymur: add coresight nodes (3-commit series)
Upstream: https://lore.kernel.org/all/20260515-add-coresight-nodes-for-glymur-v3-1-83ab39db275d@oss.qualcomm.com/ (commit 3 only)
Verdict: ⚠️ PARTIAL

---

Per-Commit Analysis

---

Commit 1/3 — Revert "WORKAROUND: arm64: dts: qcom: Mahua: Removing Qdss DSP node"

Lore link: None — this is a revert of a WORKAROUND: commit; no upstream lore link is expected.

Commit Message

Check	Status	Note
Subject matches upstream	✅ N/A	Revert of a vendor-only WORKAROUND: commit; no lore source to compare
Body preserves rationale	✅	Explains why the revert is needed ("addressed in Coresight DT patch V3")
Fixes tag present/correct	✅ N/A	Not applicable for a revert
Authorship preserved	✅	From: Jie Gan is the reverting author — correct
Signed-off-by present	❌	Missing Signed-off-by: line — required for all commits in this tree
Prefix before Revert	❌	Subject is bare Revert "WORKAROUND: ..." — per tree convention, a prefix such as QCLINUX: should precede Revert (e.g. QCLINUX: Revert "WORKAROUND: ...")

Diff

File	Status	Notes
arch/arm64/boot/dts/qcom/glymur.dtsi	✅	Restores QDSS_DSP: label on cti@111ab000 — correct inverse of the WORKAROUND commit
arch/arm64/boot/dts/qcom/mahua.dtsi	✅	Removes /delete-node/ &QDSS_DSP; — correct inverse

---

Commit 2/3 — Revert "FROMLIST: arm64: dts: qcom: glymur: add coresight nodes"

Lore link: None — this is a revert of a FROMLIST: commit; no lore link required for the revert itself.

Commit Message

Check	Status	Note
Subject matches upstream	✅ N/A	Revert of a prior FROMLIST commit; no lore source to compare
Body preserves rationale	⚠️	Body is very terse ("Update the Coresight DT patch to V3") — acceptable but minimal
Fixes tag present/correct	✅ N/A	Not applicable
Authorship preserved	✅	From: Jie Gan is the reverting author — correct
Signed-off-by present	❌	Missing Signed-off-by: line — required for all commits
Prefix before Revert	❌	Subject is bare Revert "FROMLIST: ..." — should be prefixed (e.g. QCLINUX: Revert "FROMLIST: ...")

Diff

File	Status	Notes
arch/arm64/boot/dts/qcom/glymur.dtsi	✅	Large revert (−1303/+206 lines) — correctly undoes the prior FROMLIST coresight patch, restoring the pre-coresight state (SMMU, GIC, timer, mailbox nodes)

---

Commit 3/3 — FROMLIST: arm64: dts: qcom: glymur: add coresight nodes

Lore link: https://lore.kernel.org/all/20260515-add-coresight-nodes-for-glymur-v3-1-83ab39db275d@oss.qualcomm.com/

Note: Network access is restricted in this environment; the lore patch could not be fetched for a line-by-line diff comparison. The analysis below is based on the PR patch content and message-ID metadata.

Commit Message

Check	Status	Note
Subject matches upstream	✅	FROMLIST: prefix added to arm64: dts: qcom: glymur: add coresight nodes — correct adaptation
Body preserves rationale	✅	Describes trace paths (TPDM→ETF/STM→ETF), subsystems covered, and the Mahua cti_wpss deletion rationale
Fixes tag present/correct	✅ N/A	No Fixes: tag; not a bugfix backport
Authorship (FROMLIST: rule)	✅	From: Jie Gan is the submitter; Signed-off-by: Jie Gan is present — for FROMLIST: the submitter and original author are the same person, so this is correct
Lore link present	✅	Link: https://lore.kernel.org/all/20260515-add-coresight-nodes-for-glymur-v3-1-83ab39db275d@oss.qualcomm.com/
Commit date vs lore date	⚠️	Date mismatch: commit Date: is Wed, 18 Mar 2026 but the linked lore message-ID encodes 20260515 (May 15, 2026). The commit was authored for an earlier revision (v1/v2) and the Link: was updated to point to v3 without rebasing the commit date. This is a minor hygiene issue but means the commit date does not correspond to the v3 posting.
Backport note	✅ N/A	FROMLIST: — no backport note required

Diff

File	Status	Notes
arch/arm64/boot/dts/qcom/glymur.dtsi	⚠️ REVIEW	+1304/−206 lines; adds full coresight topology (STM, TPDA, TPDM, funnels, ETF, replicator, CTI, TraceNoc, static-TPDM nodes). Cannot verify line-for-line against lore v3 due to network restriction — manual comparison against lore v3 required
arch/arm64/boot/dts/qcom/mahua.dtsi	✅	Adds /delete-node/ &cti_wpss; — consistent with commit message rationale

Upstream Patch Status

Commit	Community Verdict
arm64: dts: qcom: glymur: add coresight nodes (v3)	⏳ Decision Pending — posted to lore 2026-05-15 as v3; network-restricted environment prevents checking for maintainer ACK/NACK or merge into qcom-next. Verify manually at the lore link.

qcom-next Presence

Commit	Status
FROMLIST: arm64: dts: qcom: glymur: add coresight nodes	⏭️ Skipped — no local kernel repo and network access blocked; verify manually

---

Issues Found

1. Commits 1 and 2 missing Signed-off-by: — Both revert commits lack a Signed-off-by: Jie Gan <jie.gan@oss.qualcomm.com> line. This is required by the kernel's Developer Certificate of Origin (DCO) process for every commit, including reverts.

2. Commits 1 and 2 missing prefix before Revert — Per tree convention (SKILL.md: "Revert "..." → Should have prefix before Revert"), the subjects should be:

   • QCLINUX: Revert "WORKAROUND: arm64: dts: qcom: Mahua: Removing Qdss DSP node"
   • QCLINUX: Revert "FROMLIST: arm64: dts: qcom: glymur: add coresight nodes"

3. Commit 3 date/lore version mismatch — The commit Date: header (2026-03-18) predates the linked lore v3 posting (2026-05-15). The commit content should correspond to v3; if it was rebased/amended to match v3, the date should be updated accordingly. Reviewers should confirm the diff in commit 3 matches the v3 lore patch exactly.

4. Lore diff unverifiable — Network access is blocked in this environment; the lore v3 patch at https://lore.kernel.org/all/20260515-add-coresight-nodes-for-glymur-v3-1-83ab39db275d@oss.qualcomm.com/ could not be fetched. A manual b4 am --single-message or curl comparison is required to confirm commit 3's diff is faithful to v3.

---

Verdict

Request changes before merging: add Signed-off-by: to commits 1 and 2, add the appropriate QCLINUX: prefix before Revert in both revert commit subjects, and manually verify that commit 3's diff matches the linked lore v3 patch (the commit date predating the v3 posting warrants a close check).

Final Summary

1. Lore link present: Commit 3 only — https://lore.kernel.org/all/20260515-add-coresight-nodes-for-glymur-v3-1-83ab39db275d@oss.qualcomm.com/; commits 1 and 2 are reverts of vendor-only commits and require no lore link.
2. Lore link matches PR commits: ⚠️ Unverifiable — network blocked; commit 3 date (2026-03-18) predates lore v3 (2026-05-15), raising a version-alignment concern that requires manual verification.
3. Upstream patch status: ⏳ Decision Pending — v3 posted 2026-05-15; acceptance status unverifiable without network access.
4. PR present in qcom-next: ⏭️ Skipped — no local kernel repo and network blocked; verify manually.

[sgaud-quic]

PR #1159 — checker-log-analyzer

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

Checker	Result	Summary
Checker	Result	Summary
checkpatch	❌	Merge conflict in glymur.dtsi — checker never ran
dt-binding-check	❌	Merge conflict in glymur.dtsi — checker never ran
dtb-check	❌	Merge conflict in glymur.dtsi — checker never ran
sparse-check	❌	Merge conflict in glymur.dtsi — checker never ran
check-uapi-headers	❌	Merge conflict in glymur.dtsi — checker never ran
check-patch-compliance	❌	Merge conflict in glymur.dtsi — checker never ran
tag-check	❌	Commits 1 & 2 are bare Revert "..." with no required prefix
qcom-next-check	N/A	Branch is tech/all/dt/glymur, not qcom-next

Detailed report: Full report

Checker analysis — click to expand

🤖 CI Checker Analysis (checker-log-analyzer)

PR: #1159 — FROMLIST: arm64: dts: qcom: glymur: add coresight nodes (3 commits)
Run: https://github.com/qualcomm-linux/kernel-config/actions/runs/25912078252
Base branch: tech/all/dt/glymur

Checker	Result	Summary
checkpatch	❌	Merge conflict in glymur.dtsi — checker never ran
dt-binding-check	❌	Merge conflict in glymur.dtsi — checker never ran
dtb-check	❌	Merge conflict in glymur.dtsi — checker never ran
sparse-check	❌	Merge conflict in glymur.dtsi — checker never ran
check-uapi-headers	❌	Merge conflict in glymur.dtsi — checker never ran
check-patch-compliance	❌	Merge conflict in glymur.dtsi — checker never ran
tag-check	❌	Commits 1 & 2 are bare Revert "..." with no required prefix
qcom-next-check	N/A	Branch is tech/all/dt/glymur, not qcom-next

---

❌ All Checkers — Merge Conflict (CI Infrastructure Failure)

Root cause: Every checker job failed during the integration-branch setup step because arch/arm64/boot/dts/qcom/glymur.dtsi has a content conflict between the PR branch and the topic/tech/all/dt/glymur topic branch already in the integration tree.

Failure details:

Auto-merging arch/arm64/boot/dts/qcom/glymur.dtsi
CONFLICT (content): Merge conflict in arch/arm64/boot/dts/qcom/glymur.dtsi
Automatic merge failed; fix conflicts and then commit the result.
Merge failed, manual merge
##[error]Process completed with exit code 1.

This is identical across all six checker jobs (checkpatch, dt-binding-check, dtb-check, sparse-check, check-uapi-headers, check-patch-compliance). None of the actual checker scripts were reached — the failure is entirely in the pre-check merge step.

Root cause analysis: The tech/all/dt/glymur topic branch already contains commits that touch glymur.dtsi, and this PR also modifies the same file. The CI integration branch cannot auto-merge them. This is a merge conflict between the PR and the existing topic branch, not a patch defect.

Fix: Rebase the PR branch on top of the current tip of tech/all/dt/glymur (or the integration branch) to resolve the conflict in glymur.dtsi, then force-push.

git fetch origin tech/all/dt/glymur
git rebase origin/tech/all/dt/glymur
# resolve any conflicts in arch/arm64/boot/dts/qcom/glymur.dtsi
git add arch/arm64/boot/dts/qcom/glymur.dtsi
git rebase --continue
git push --force-with-lease

Reproduce locally:

git fetch origin tech/all/dt/glymur
git checkout -b integ origin/tech/all/dt/glymur
git merge <pr-head-sha>
# observe conflict in arch/arm64/boot/dts/qcom/glymur.dtsi

---

❌ tag-check — Missing Subject Prefix on Revert Commits

Root cause: Commits 1 and 2 are bare Revert "..." subjects with no required prefix tag before Revert, violating the mandatory prefix rule for branch tech/all/dt/glymur.

Failure details:

Commit	Subject	Status
5deaad04	Revert "WORKAROUND: arm64: dts: qcom: Mahua: Removing Qdss DSP node"	❌ No prefix
0e4b1cb9	Revert "FROMLIST: arm64: dts: qcom: glymur: add coresight nodes"	❌ No prefix
0d956d04	FROMLIST: arm64: dts: qcom: glymur: add coresight nodes	✅ Valid

The rule requires every commit subject to start with FROMLIST:, FROMGIT:, UPSTREAM:, BACKPORT:, QCLINUX:, PENDING:, or WORKAROUND:. A bare Revert "..." does not satisfy this — the prefix must appear before the word Revert.

Fix: Amend both revert commits to prepend the appropriate prefix. Since these reverts are vendor-tree-only cleanup commits (reverting a WORKAROUND: and a FROMLIST: to replace them with a v3 patch), QCLINUX: is the most appropriate prefix:

git rebase -i <base_sha>   # mark commits 1 and 2 as 'edit'

# For commit 1:
git commit --amend -m 'QCLINUX: Revert "WORKAROUND: arm64: dts: qcom: Mahua: Removing Qdss DSP node"

This reverts commit 7dbe137534c06846a165523c4dc28f5956d82428.
This issue has been addressed in Coresight DT patch V3. Revert this
commit for updating the Coresight DT patch to V3.'
git rebase --continue

# For commit 2:
git commit --amend -m 'QCLINUX: Revert "FROMLIST: arm64: dts: qcom: glymur: add coresight nodes"

This reverts commit 245e0672b7d535079e61f806845092a43aed2c26.
Update the Coresight DT patch to V3.'
git rebase --continue

Note: If these reverts are considered part of the upstream patch series (i.e., they will be posted to lore as part of the v3 series), use FROMLIST: instead of QCLINUX:.

---

Verdict

2 blockers to fix before merge:

1. Merge conflict in arch/arm64/boot/dts/qcom/glymur.dtsi — rebase the PR on tech/all/dt/glymur to resolve. This is the primary blocker; once resolved, all 6 checkers need to be re-run to get their actual results.
2. Missing subject prefix on 2 revert commits — prepend QCLINUX: (or FROMLIST: if posting upstream) to the Revert "..." subject lines of commits 1 and 2.

[jiegan0107]

update to V4

[sgaud-quic]

🔨 Build Failure Analysis — PR #1159

PR: #1159
Build run: https://github.com/qualcomm-linux/kernel-config/actions/runs/26016243330

#	Error	File:Line	PR-introduced?	Root Cause
1	Merge conflict	arch/arm64/boot/dts/qcom/glymur.dtsi	Yes	PR's 3-patch Coresight DT V3 rewrite conflicts with independent changes to glymur.dtsi on the qcom-next baseline
2	Merge conflict	drivers/media/platform/qcom/iris/iris_hfi_queue.c	No	Pre-existing conflict between another topic branch in tech/all/dt/glymur and qcom-next; not touched by this PR
3	Merge conflict	drivers/media/platform/qcom/iris/iris_vpu3x.c	No	Pre-existing conflict between another topic branch in tech/all/dt/glymur and qcom-next; not touched by this PR
4	Merge conflict	drivers/media/platform/qcom/iris/iris_vpu_common.c	No	Pre-existing conflict between another topic branch in tech/all/dt/glymur and qcom-next; not touched by this PR

Note: The build never reached compilation. All failures are git merge conflicts during the CI auto-merge step (ci-merge), not compiler errors.

Verdict

1 of 4 merge conflicts is introduced by this PR (glymur.dtsi); the remaining 3 (iris_hfi_queue.c, iris_vpu3x.c, iris_vpu_common.c) are pre-existing conflicts unrelated to this PR's changes.

📎 Detailed analysis: Full report

[sgaud-quic]

🔨 Build Failure Analysis — PR #1159

PR: #1159
Build run: https://github.com/qualcomm-linux/kernel-config/actions/runs/26016243330

#	Error	File:Line	PR-introduced?	Root Cause
1	Merge conflict (content)	arch/arm64/boot/dts/qcom/glymur.dtsi	Yes	PR patches 1–3 perform a large-scale rewrite of glymur.dtsi (revert old Coresight V2 nodes, add V3 nodes); the qcom-next baseline has independently modified the same region of this file, causing an unresolvable auto-merge conflict
2	Merge conflict (content)	drivers/media/platform/qcom/iris/iris_hfi_queue.c	No	Pre-existing conflict between another topic branch already in the integration tree and qcom-next; this file is not touched by PR #1159
3	Merge conflict (content)	drivers/media/platform/qcom/iris/iris_vpu3x.c	No	Pre-existing conflict between another topic branch and qcom-next; not touched by PR #1159
4	Merge conflict (content)	drivers/media/platform/qcom/iris/iris_vpu_common.c	No	Pre-existing conflict between another topic branch and qcom-next; not touched by PR #1159

Verdict

1 of 4 merge conflicts is introduced by this PR (glymur.dtsi); the remaining 3 (iris_hfi_queue.c, iris_vpu3x.c, iris_vpu_common.c) are pre-existing conflicts unrelated to this PR's changes.

📎 Detailed analysis: Full report

[sgaud-quic]

PR #1159 — validate-patch

PR: #1159

Verdict	Issues	Detailed Report
⚠️	0	Full report

Verdict: ⚠️ — click to expand

🔍 Patch Validation

PR: PR #1159 — "FROMLIST: arm64: dts: qcom: glymur: add coresight nodes (V4)" (3-commit series)
Upstream commit: https://lore.kernel.org/all/20260518-add-coresight-nodes-for-glymur-v4-1-45f54f441899@oss.qualcomm.com/
Verdict: ⚠️ PARTIAL

---

Per-Commit Analysis

Commit 1/3 — Revert "WORKAROUND: arm64: dts: qcom: Mahua: Removing Qdss DSP node"

Prefix: Revert "WORKAROUND: …" — reverting a WORKAROUND: commit. No lore link expected or required; validation is not applicable per skill rules.

Check	Status	Note
Subject matches upstream	N/A	Revert of a WORKAROUND commit — no lore link by design
Body preserves rationale	✅	Explains why the workaround is no longer needed ("addressed in Coresight DT patch V3")
Fixes tag present/correct	N/A	Not applicable for a revert
Authorship preserved	✅	Signed-off-by: Jie Gan present; author is the reverter, correct
Backport note	N/A	Not a backport
Prefix before "Revert"	⚠️	Subject is Revert "WORKAROUND: …" — the skill convention expects a prefix before Revert (e.g. QCLINUX: Revert "WORKAROUND: …"). No prefix is present.

Diff: glymur.dtsi (rename QDSS_DSP: label back to anonymous cti@111ab000) and mahua.dtsi (remove /delete-node/ &QDSS_DSP). Both hunks are a clean mechanical revert of the WORKAROUND commit — correct.

---

Commit 2/3 — Revert "FROMLIST: arm64: dts: qcom: glymur: add coresight nodes"

Prefix: Revert "FROMLIST: …" — reverting a previous FROMLIST: commit. No lore link expected for the revert itself; the original FROMLIST commit had its own lore link.

Check	Status	Note
Subject matches upstream	N/A	Revert of a FROMLIST commit — no lore link required for the revert
Body preserves rationale	✅	States "Update the Coresight DT patch to V3" — sufficient context
Fixes tag present/correct	N/A	Not applicable
Authorship preserved	✅	Signed-off-by: Jie Gan present
Backport note	N/A	Not a backport
Prefix before "Revert"	⚠️	Same issue as commit 1: no prefix before Revert. Convention expects e.g. FROMLIST: Revert "FROMLIST: …" or QCLINUX: Revert "FROMLIST: …"

Diff: Large mechanical revert of glymur.dtsi (1509-line change, 206 insertions / 1303 deletions). This is the exact inverse of the FROMLIST V2 commit being reverted — structurally correct.

---

Commit 3/3 — FROMLIST: arm64: dts: qcom: glymur: add coresight nodes

This is the only commit with a lore link. Full validation applies.

Lore link: https://lore.kernel.org/all/20260518-add-coresight-nodes-for-glymur-v4-1-45f54f441899@oss.qualcomm.com/

Note: Network access is restricted in this environment; the lore patch could not be fetched via curl or b4. The diff comparison below is based on structural analysis of the PR patch itself against the commit message claims.

Check	Status	Note
Subject matches upstream	✅	FROMLIST: arm64: dts: qcom: glymur: add coresight nodes — FROMLIST: prefix correctly added; base subject matches the lore message-ID slug add-coresight-nodes-for-glymur-v4-1
Body preserves rationale	✅	Describes TPDM→ETF/STM→ETF trace paths, AOSS/CDSP/QDSS/PCIe5/TraceNoc subsystems, and the Mahua cti_wpss deletion rationale
Fixes tag present/correct	N/A	No bug fix; new feature addition
Authorship preserved	✅	FROMLIST: rule: submitter (Jie Gan) is legitimately in From:; original lore author is also Jie Gan <jie.gan@oss.qualcomm.com> with Signed-off-by: present — consistent
Backport note	N/A	Not a backport
Link: tag present	✅	Link: https://lore.kernel.org/all/20260518-add-coresight-nodes-for-glymur-v4-1-45f54f441899@oss.qualcomm.com/

Upstream patch status: ⏳ Decision Pending — the lore message-ID is dated 2026-05-18 (same day as this PR), indicating V4 was posted and the PR submitted simultaneously. No merge evidence available; patch is freshly posted.

Diff

File	Status	Notes
arch/arm64/boot/dts/qcom/glymur.dtsi (commit 1)	✅	Clean revert: QDSS_DSP: label removed, /delete-node/ line removed
arch/arm64/boot/dts/qcom/mahua.dtsi (commit 1)	✅	Clean revert of WORKAROUND
arch/arm64/boot/dts/qcom/glymur.dtsi (commit 2)	✅	Mechanical revert of prior FROMLIST V2 coresight nodes
arch/arm64/boot/dts/qcom/glymur.dtsi (commit 3)	⚠️	Cannot diff against lore (network restricted); structurally consistent with V4 claim — manual verification recommended
arch/arm64/boot/dts/qcom/mahua.dtsi (commit 3)	✅	Adds /delete-node/ &cti_wpss — matches commit message rationale

qcom-next Presence

Commit	Status
Revert "WORKAROUND: …"	⏭️ Skipped — no kernel repo / network available
Revert "FROMLIST: …"	⏭️ Skipped — no kernel repo / network available
FROMLIST: glymur: add coresight nodes	⏭️ Skipped — no kernel repo / network available

---

Issues

1. Missing prefix before Revert (commits 1 & 2): Both revert commits lack a vendor prefix before the Revert keyword. The tree convention requires a prefix such as QCLINUX: or the same prefix as the commit being reverted (e.g. FROMLIST: Revert "FROMLIST: …"). Without a prefix, tooling cannot classify these commits correctly.

   • Commit 1 subject: Revert "WORKAROUND: arm64: dts: qcom: Mahua: Removing Qdss DSP node" → should be QCLINUX: Revert "WORKAROUND: …" (or similar)
   • Commit 2 subject: Revert "FROMLIST: arm64: dts: qcom: glymur: add coresight nodes" → should be FROMLIST: Revert "FROMLIST: …" (or similar)

2. Lore diff not verifiable (network restricted): Commit 3's diff against the lore V4 patch (20260518-add-coresight-nodes-for-glymur-v4-1-45f54f441899@oss.qualcomm.com) could not be fetched. The message-ID and V4 label are consistent with the PR date (2026-05-18), but a manual b4 am --single-message comparison is recommended before merge.

3. Upstream status pending: The lore V4 patch was posted the same day as this PR. No community review, ACK, or merge evidence exists yet. This is expected for a FROMLIST: commit but should be tracked.

---

Verdict

Commits 1 and 2 are clean mechanical reverts with correct diffs but missing the required vendor prefix before Revert — fix the subject lines before merging. Commit 3 (FROMLIST:) has correct structure, authorship, and a valid lore link, but the diff against the upstream lore patch must be verified manually (network was unavailable); the upstream patch is freshly posted and pending community review.

[sgaud-quic]

PR #1159 — checker-log-analyzer

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

Checker	Result	Summary
Checker	Result	Summary
checkpatch	❌	CI infra failure — automerge conflict, checker never ran
dt-binding-check	❌	CI infra failure — automerge conflict, checker never ran
dtb-check	❌	CI infra failure — automerge conflict, checker never ran
sparse-check	❌	CI infra failure — automerge conflict, checker never ran
check-uapi-headers	❌	CI infra failure — automerge conflict, checker never ran
check-patch-compliance	❌	CI infra failure — automerge conflict, checker never ran
tag-check	❌	2 of 3 commits missing required prefix before Revert
qcom-next-check	N/A	Target branch is tech/all/dt/glymur, not qcom-next

Detailed report: Full report

Checker analysis — click to expand

🤖 CI Checker Analysis (checker-log-analyzer)

PR: #1159 — FROMLIST: arm64: dts: qcom: glymur: add coresight nodes (3 commits)
Source: https://github.com/qualcomm-linux/kernel-config/actions/runs/26016273224

Checker	Result	Summary
checkpatch	❌	CI infra failure — automerge conflict, checker never ran
dt-binding-check	❌	CI infra failure — automerge conflict, checker never ran
dtb-check	❌	CI infra failure — automerge conflict, checker never ran
sparse-check	❌	CI infra failure — automerge conflict, checker never ran
check-uapi-headers	❌	CI infra failure — automerge conflict, checker never ran
check-patch-compliance	❌	CI infra failure — automerge conflict, checker never ran
tag-check	❌	2 of 3 commits missing required prefix before Revert
qcom-next-check	N/A	Target branch is tech/all/dt/glymur, not qcom-next

---

❌ All 6 Checkers — CI Infrastructure Failure (Automerge Conflict)

Root cause: The CI automerge step failed to integrate topic branch topic/tech/all/dt/glymur onto the integration baseline (9f3cbcbfaa5a143d339bcabf1a6a6ac98107e084), producing 19 merge conflicts; no checker actually executed.

Failure details:

Running automerge...
CONFLICT (content): Merge conflict in Makefile
CONFLICT (content): Merge conflict in arch/arm64/boot/dts/qcom/glymur.dtsi
CONFLICT (content): Merge conflict in drivers/acpi/acpi_tad.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_dma_buf.c
CONFLICT (content): Merge conflict in drivers/media/platform/qcom/iris/iris_hfi_queue.c
CONFLICT (content): Merge conflict in drivers/media/platform/qcom/iris/iris_vpu3x.c
CONFLICT (content): Merge conflict in drivers/media/platform/qcom/iris/iris_vpu_common.c
CONFLICT (content): Merge conflict in drivers/nvme/host/pci.c
CONFLICT (content): Merge conflict in drivers/nvme/target/tcp.c
CONFLICT (content): Merge conflict in io_uring/napi.c
CONFLICT (content): Merge conflict in kernel/cgroup/cgroup.c
CONFLICT (content): Merge conflict in kernel/cgroup/cpuset.c
CONFLICT (content): Merge conflict in kernel/sched/ext.c
CONFLICT (content): Merge conflict in net/netfilter/nf_tables_api.c
CONFLICT (content): Merge conflict in net/sched/sch_cake.c
CONFLICT (content): Merge conflict in sound/soc/codecs/ab8500-codec.c
CONFLICT (content): Merge conflict in sound/soc/codecs/tas2770.c
Merge failed, manual merge
automerge returned non-zero; check logs for conflicts
##[error]Process completed with exit code 1.

Assessment: This is a CI infrastructure / tree-integration issue, not a defect in the PR's patches themselves. The PR only touches arch/arm64/boot/dts/qcom/glymur.dtsi and arch/arm64/boot/dts/qcom/mahua.dtsi. The 19 conflicts are in unrelated files (kernel scheduler, NVMe, DRM, networking, etc.) that belong to other topic branches being merged into the same integration baseline. The PR's own file (glymur.dtsi) is among the conflicts, which means another topic branch has also modified it.

Fix: No patch change needed for the 6 checker failures. The integration tree needs to be rebased or the conflicting topic branches need to be resolved by the tree maintainer. Re-triggering CI after the integration tree is fixed will allow the checkers to run properly.

---

❌ tag-check — Missing Prefix on Revert Commits

Root cause: Two of the three commits are bare Revert "..." subjects with no required prefix tag before Revert; the target branch tech/all/dt/glymur is not qcom-next or qcom-next-staging, so all commits must carry a prefix.

Failure details:

Commit	Subject	Status
0016241f	Revert "WORKAROUND: arm64: dts: qcom: Mahua: Removing Qdss DSP node"	❌ No prefix
db2bf22e	Revert "FROMLIST: arm64: dts: qcom: glymur: add coresight nodes"	❌ No prefix
c54193bc	FROMLIST: arm64: dts: qcom: glymur: add coresight nodes	✅ OK

Fix: Amend the two Revert commits to add a prefix before Revert. Since these revert vendor/topic-tree commits (not upstream), QCLINUX: is appropriate:

git rebase -i <base_sha>   # mark both Revert commits as 'edit'

# For commit 0016241f:
git commit --amend -m 'QCLINUX: Revert "WORKAROUND: arm64: dts: qcom: Mahua: Removing Qdss DSP node"

This reverts commit 7dbe137534c06846a165523c4dc28f5956d82428.
This issue has been addressed in Coresight DT patch V3. Revert this
commit for updating the Coresight DT patch to V3.

Signed-off-by: Jie Gan <jie.gan@oss.qualcomm.com>'
git rebase --continue

# For commit db2bf22e:
git commit --amend -m 'QCLINUX: Revert "FROMLIST: arm64: dts: qcom: glymur: add coresight nodes"

This reverts commit 245e0672b7d535079e61f806845092a43aed2c26.
Update the Coresight DT patch to V3.

Signed-off-by: Jie Gan <jie.gan@oss.qualcomm.com>'
git rebase --continue

Note: If the reverted FROMLIST: commit was already posted upstream, FROMLIST: Revert "..." is also acceptable. Use QCLINUX: if the revert is purely internal to the vendor tree.

Reproduce locally:

git log <base>..<head> --format="%H %s" | while read sha subject; do
  if ! echo "$subject" | grep -qE '^(FROMLIST|FROMGIT|UPSTREAM|BACKPORT|QCLINUX|PENDING|WORKAROUND):'; then
    echo "MISSING prefix: $sha $subject"
  fi
done

---

Verdict

2 blockers to fix before merge:

1. CI infra (automerge conflict) — not caused by this PR; tree maintainer must resolve the integration conflicts (particularly the concurrent modification of glymur.dtsi by another topic branch) and re-trigger CI.
2. tag-check — add QCLINUX: (or FROMLIST:) prefix to the two bare Revert "..." commit subjects before re-triggering.