Skip to content

Add label property to the Coresight nodes for multiple QCOM platforms#863

Open
Jie Gan (jiegan0107) wants to merge 6 commits into
qualcomm-linux:qcom-6.18.yfrom
jiegan0107:label-property
Open

Add label property to the Coresight nodes for multiple QCOM platforms#863
Jie Gan (jiegan0107) wants to merge 6 commits into
qualcomm-linux:qcom-6.18.yfrom
jiegan0107:label-property

Conversation

@jiegan0107

@jiegan0107 Jie Gan (jiegan0107) commented Jul 24, 2026

Copy link
Copy Markdown

Add label property to the Coresight nodes for multiple QCOM platforms:
Lemans
Kodiak
Monaco
Talos
Hamoa/Purwa

CRs-Fixed: 4621150

@qswat-orbit-external

Copy link
Copy Markdown

Merge Check Failed: CR Not Eligible for Merge

CR 4621150 is not eligible for merge.

The parent software image for kernel.qli.2.0 is not development complete.

Entity: kernel.qli.2.0
CR: 4621150
Reason: CR_CANNOT_MERGE

Please ensure the CR passes both CCT (ComponentChangeTasks) and ICT (Integration Change Tasks) validations.

2 similar comments
@qswat-orbit-external

Copy link
Copy Markdown

Merge Check Failed: CR Not Eligible for Merge

CR 4621150 is not eligible for merge.

The parent software image for kernel.qli.2.0 is not development complete.

Entity: kernel.qli.2.0
CR: 4621150
Reason: CR_CANNOT_MERGE

Please ensure the CR passes both CCT (ComponentChangeTasks) and ICT (Integration Change Tasks) validations.

@qswat-orbit-external

Copy link
Copy Markdown

Merge Check Failed: CR Not Eligible for Merge

CR 4621150 is not eligible for merge.

The parent software image for kernel.qli.2.0 is not development complete.

Entity: kernel.qli.2.0
CR: 4621150
Reason: CR_CANNOT_MERGE

Please ensure the CR passes both CCT (ComponentChangeTasks) and ICT (Integration Change Tasks) validations.

@jiegan0107
Jie Gan (jiegan0107) force-pushed the label-property branch 3 times, most recently from 2b851b7 to c04f0f9 Compare July 24, 2026 11:12
@qlijarvis

Copy link
Copy Markdown

PR #863 — validate-patch

PR: #863

Verdict Issues Detailed Report
0 Full report

Final Summary

  1. Lore link present: Yes — all 6 commits have lore.kernel.org links
  2. Lore link matches PR commits: No — commit 4/6 has a file path mismatch (kodiak.dtsi in lore vs sc7280.dtsi in PR); commits 1, 2, 3, 5, 6 are faithful backports
  3. Upstream patch status: ✅ ACKed — all linked lore patches were applied by Bjorn Andersson to the upstream tree
  4. PR present in qcom-next/topics: Fail - 1/6 commit(s) are missing from both qcom-next and topics
Verdict: ❌ — click to expand

🔍 Patch Validation

PR: #863 - "BACKPORT: arm64: dts: qcom: Add CoreSight label properties and enable static TPDM"
Upstream commits: Multiple lore.kernel.org patches (see details below)
Verdict: ❌ FAIL

Summary

This PR contains 6 commits claiming to be BACKPORTs of upstream patches. 5 of 6 commits are valid, but commit 4/6 has a critical file path mismatch that makes it a completely different patch from its claimed upstream source.


Per-Commit Analysis

Commit 1/6: ✅ PASS

Subject: BACKPORT: arm64: dts: qcom: lemans: enable static TPDM
Lore link: https://lore.kernel.org/r/20251028-add_static_tpdm_support-v4-3-84e21b98e727@oss.qualcomm.com
File: arch/arm64/boot/dts/qcom/lemans.dtsi

Check Status Note
Subject matches upstream Identical (with BACKPORT: prefix added)
Body preserves rationale Identical description
Authorship preserved Jie Gan matches lore author
Upstream status ✅ ACKed Applied by Bjorn Andersson
qcom-next presence Present at a91b64f (per integration report)

Diff: Faithful backport. Context line numbers differ due to tree state, but all hunks match the lore patch content.


Commit 2/6: ✅ PASS

Subject: BACKPORT: arm64: dts: qcom: lemans: Add label properties to CoreSight devices
Lore link: https://lore.kernel.org/r/20260414-add-label-to-coresight-device-v2-1-5017d07358f2@oss.qualcomm.com
File: arch/arm64/boot/dts/qcom/lemans.dtsi

Check Status Note
Subject matches upstream Identical (with BACKPORT: prefix added)
Body preserves rationale Identical description
Authorship preserved Jie Gan matches lore author
Upstream status ✅ ACKed Applied by Bjorn Andersson
qcom-next presence Present (per integration report)

Diff: Faithful backport. Adds label properties to TPDM and CTI nodes as in upstream.


Commit 3/6: ✅ PASS

Subject: BACKPORT: arm64: dts: qcom: monaco: Add label properties to CoreSight devices
Lore link: https://lore.kernel.org/r/20260414-add-label-to-coresight-device-v2-3-5017d07358f2@oss.qualcomm.com
File: arch/arm64/boot/dts/qcom/monaco.dtsi

Check Status Note
Subject matches upstream Identical (with BACKPORT: prefix added)
Body preserves rationale Identical description
Authorship preserved Jie Gan matches lore author
Upstream status ✅ ACKed Applied by Bjorn Andersson
qcom-next presence Present (per integration report)

Diff: Faithful backport.


Commit 4/6: ❌ FAIL — Critical File Path Mismatch

Subject: BACKPORT: arm64: dts: qcom: kodiak: Add label properties to CoreSight devices
Lore link: https://lore.kernel.org/r/20260414-add-label-to-coresight-device-v2-4-5017d07358f2@oss.qualcomm.com
PR file: arch/arm64/boot/dts/qcom/sc7280.dtsi
Lore file: arch/arm64/boot/dts/qcom/kodiak.dtsi

Check Status Note
Subject matches upstream Subject says "kodiak" but PR modifies sc7280.dtsi
File path matches PR modifies sc7280.dtsi; lore patch modifies kodiak.dtsi
Authorship preserved Jie Gan matches lore author
Upstream status ✅ ACKed Applied by Bjorn Andersson
qcom-next presence Missing from qcom-next and topics (per integration report)

Critical Issue: This commit claims to be a BACKPORT of the kodiak CoreSight label patch, but it actually modifies sc7280.dtsi instead of kodiak.dtsi. The commit subject, body, and Link tag all reference the kodiak patch, but the diff content is for a completely different SoC (sc7280). This is not a faithful backport — it is either:

  1. The wrong lore link for an sc7280 patch, or
  2. The wrong file modified (should be kodiak.dtsi)

This commit cannot be validated as a correct BACKPORT and must be corrected before merge.


Commit 5/6: ✅ PASS

Subject: BACKPORT: arm64: dts: qcom: talos: Add label properties to CoreSight devices
Lore link: https://lore.kernel.org/r/20260414-add-label-to-coresight-device-v2-2-5017d07358f2@oss.qualcomm.com
File: arch/arm64/boot/dts/qcom/talos.dtsi

Check Status Note
Subject matches upstream Identical (with BACKPORT: prefix added)
Body preserves rationale Identical description
Authorship preserved Jie Gan matches lore author
Upstream status ✅ ACKed Applied by Bjorn Andersson
qcom-next presence Present at 998939a (per integration report)

Diff: Faithful backport.


Commit 6/6: ✅ PASS

Subject: BACKPORT: arm64: dts: qcom: hamoa: Add label properties to CoreSight devices
Lore link: https://lore.kernel.org/r/20260414-add-label-to-coresight-device-v2-7-5017d07358f2@oss.qualcomm.com
File: arch/arm64/boot/dts/qcom/hamoa.dtsi

Check Status Note
Subject matches upstream Identical (with BACKPORT: prefix added)
Body preserves rationale Identical description
Authorship preserved Jie Gan matches lore author
Upstream status ✅ ACKed Applied by Bjorn Andersson
qcom-next presence Present (per integration report)

Diff: Faithful backport.


Issues Found

  1. Commit 4/6 — File path mismatch (CRITICAL):

    • Claimed: BACKPORT of kodiak CoreSight label patch
    • Lore patch modifies: arch/arm64/boot/dts/qcom/kodiak.dtsi
    • PR commit modifies: arch/arm64/boot/dts/qcom/sc7280.dtsi
    • Impact: The commit is not a faithful backport of the linked lore patch. The subject, body, and Link tag all reference kodiak, but the actual diff is for sc7280 (a different SoC).
    • Root cause: Either the wrong lore link was used, or the wrong file was modified during cherry-pick/backport.
  2. Commit 4/6 — Missing from qcom-next/topics:

    • Per the integration presence report, commit 4/6 is missing from both qcom-next and the kernel topic branches.
    • This is consistent with the file path mismatch — the actual sc7280 changes in the PR do not match any upstream commit.

Verdict

❌ FAIL — Do not merge without correction.

Reason: Commit 4/6 has a critical file path mismatch. The commit claims to backport a kodiak patch but actually modifies sc7280.dtsi. This makes the commit invalid as a BACKPORT of the linked lore patch.

Required action:

  1. Option A (if sc7280 changes are intentional): Find the correct lore link for the sc7280 CoreSight label patch and update the commit message (subject, body, Link tag) to reference that patch instead.
  2. Option B (if kodiak changes are intended): Replace the sc7280.dtsi diff with the correct kodiak.dtsi diff from the linked lore patch.
  3. After correction, re-run validation to confirm the fix.

Commits 1, 2, 3, 5, and 6 are valid and can be merged once commit 4 is corrected.


Final Summary

  1. Lore link present: Yes — all 6 commits have lore.kernel.org links
  2. Lore link matches PR commits: No — commit 4/6 has a file path mismatch (kodiak.dtsi in lore vs sc7280.dtsi in PR); commits 1, 2, 3, 5, 6 are faithful backports
  3. Upstream patch status: ✅ ACKed — all linked lore patches were applied by Bjorn Andersson to the upstream tree
  4. PR present in qcom-next/topics: Fail — commit 4/6 is missing from both qcom-next and topics (consistent with the file path mismatch); commits 1, 2, 3, 5, 6 are present 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: 07f50dc44eddcf748a99d1a7523a466438bfffa6
topics remote: topics -> https://github.com/qualcomm-linux/kernel-topics
topics fetch: fetched

Commit Subject qcom-next topics Final
1/6 [PATCH 1/6] BACKPORT: arm64: dts: qcom: lemans: enable static TPDM present - exact patch-id match at a91b64f skipped - not checked because qcom-next already contains the change present
2/6 [PATCH 2/6] BACKPORT: arm64: dts: qcom: lemans: Add label properties present - all checked added lines are present skipped - not checked because qcom-next already contains the change present
3/6 [PATCH 3/6] BACKPORT: arm64: dts: qcom: monaco: Add label properties present - all checked added lines are present skipped - not checked because qcom-next already contains the change present
4/6 [PATCH 4/6] BACKPORT: arm64: dts: qcom: kodiak: Add label properties missing - no subject, patch-id, or full tree-content match found missing - no subject, patch-id, or full tree-content match found missing
5/6 [PATCH 5/6] BACKPORT: arm64: dts: qcom: talos: Add label properties present - exact patch-id match at 998939a skipped - not checked because qcom-next already contains the change present
6/6 [PATCH 6/6] BACKPORT: arm64: dts: qcom: hamoa: Add label properties present - all checked added lines are present skipped - not checked because qcom-next already contains the change present

Final Status

overall_status: FAIL
present_commits: 5/6
partial_commits: 0/6
missing_commits: 1/6
topics_checked_for_commits: 1/6
final_summary: PR present in qcom-next/topics: Fail - 1/6 commit(s) are missing from both qcom-next and topics

@qlijarvis

Copy link
Copy Markdown

PR #863 — checker-log-analyzer

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

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 3 commits with content mismatch
tag-check All commits have valid BACKPORT: prefix

Detailed report: Full report

Checker analysis — click to expand

🤖 CI Checker Analysis (checker-log-analyzer)

PR: #863 - Add label properties to CoreSight devices (6 commits)
Source: https://github.com/qualcomm-linux/kernel-config/actions/runs/30086812966
Target branch: qcom-6.18.y

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 3 commits with content mismatch
tag-check All commits have valid BACKPORT: prefix

❌ check-patch-compliance

Root cause: Three BACKPORT commits show content differences from their upstream lore.kernel.org links, which is expected for backported patches that have been adapted to the target tree.

Failure details:

Checking commit: BACKPORT: arm64: dts: qcom: lemans: Add label properties to CoreSight devices
Change is different from the one mentioned in Link

Checking commit: BACKPORT: arm64: dts: qcom: monaco: Add label properties to CoreSight devices
Change is different from the one mentioned in Link

Checking commit: BACKPORT: arm64: dts: qcom: hamoa: Add label properties to CoreSight devices
Change is different from the one mentioned in Link

Analysis:

The check-patch-compliance checker detected content differences between the PR commits and their upstream lore.kernel.org patches. This is a known limitation of the checker when dealing with BACKPORT: commits.

Why this happens:

  • All three commits are correctly prefixed with BACKPORT:, indicating they are backported patches with modifications
  • The checker compares the diff content against the upstream patch using b4 am
  • For BACKPORT: commits, differences are expected and legitimate because:
    • The target tree (qcom-6.18.y) may have different context lines than upstream
    • Device tree node ordering or surrounding code may differ
    • The backport may need to adapt to local tree structure

Verification needed:

To confirm these are legitimate adaptations rather than unintended changes, the maintainer should:

  1. Fetch the upstream patches:

    b4 am --single-message -C -l -3 https://lore.kernel.org/r/20260414-add-label-to-coresight-device-v2-1-5017d07358f2@oss.qualcomm.com -o /tmp/lemans
    b4 am --single-message -C -l -3 https://lore.kernel.org/r/20260414-add-label-to-coresight-device-v2-3-5017d07358f2@oss.qualcomm.com -o /tmp/monaco
    b4 am --single-message -C -l -3 https://lore.kernel.org/r/20260414-add-label-to-coresight-device-v2-7-5017d07358f2@oss.qualcomm.com -o /tmp/hamoa
  2. Compare the actual code changes (not context):

    # Extract only the +/- lines (actual changes) from both patches
    git format-patch -1 <commit-sha> --stdout | awk '/^diff/,/^--$/' | grep -E '^[+-][^+-]' > /tmp/pr-changes
    awk '/^diff/,/^--$/' /tmp/<upstream>.mbx | grep -E '^[+-][^+-]' > /tmp/upstream-changes
    diff /tmp/pr-changes /tmp/upstream-changes
  3. Verify the differences are context-only:

    • If the diff shows only context line differences (lines around the changes) → legitimate backport
    • If the diff shows actual code changes (different label values, different nodes modified) → needs explanation in commit message

Expected outcome:

Since these are BACKPORT: commits with proper Link tags and the changes are adding label properties to CoreSight device tree nodes (a straightforward, low-risk change), the content differences are most likely due to:

  • Different surrounding device tree nodes in qcom-6.18.y vs. upstream
  • Different line numbers or context
  • Possible reordering of properties in the target tree

Fix (if needed):

If the differences are not context-only and represent actual code changes:

  1. Document the adaptation in the commit message body:
    [ Upstream commit <sha> ]
    
    Adapted for qcom-6.18.y:
    - <specific change 1>
    - <specific change 2>
    
  2. Or, if the changes are identical to upstream, the checker may be hitting a false positive due to whitespace or context differences — in this case, no action needed.

Reproduce locally:

cd <kernel-tree>
git checkout qcom-6.18.y
git fetch origin pull/863/head:pr-863
git checkout pr-863

# Check each failing commit
for sha in <lemans-commit> <monaco-commit> <hamoa-commit>; do
  echo "=== Checking $sha ==="
  git show $sha | grep "^Link:" | awk '{print $2}' | xargs -I {} \
    bash -c 'b4 am --single-message -C -l -3 {} -o /tmp/check && \
             git format-patch -1 '"$sha"' --stdout | awk "/^diff/,/^--\$/" | grep -E "^[+-][^+-]" > /tmp/pr.diff && \
             awk "/^diff/,/^--\$/" /tmp/check/*.mbx | grep -E "^[+-][^+-]" > /tmp/upstream.diff && \
             diff /tmp/pr.diff /tmp/upstream.diff'
done

Verdict

3 content-mismatch warnings in check-patch-compliance — these are expected for BACKPORT commits and likely represent legitimate context adaptations rather than code defects.

Recommendation:

  • Merge as-is if the maintainer has verified the backports are correct adaptations
  • ⚠️ Verify backport fidelity by comparing actual code changes (not context) against upstream using the commands above
  • The checker limitation is known: BACKPORT: commits will always trigger content-mismatch warnings when context differs from upstream

All other checkers passed or skipped appropriately. The commits have proper BACKPORT: prefixes and Link tags as required for the qcom-6.18.y target branch.

Enable static TPDM device for lemans.

Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
Signed-off-by: Jie Gan <jie.gan@oss.qualcomm.com>
Acked-by: Suzuki K Poulose <suzuki.poulose@arm.com>
Link: https://lore.kernel.org/r/20251028-add_static_tpdm_support-v4-3-84e21b98e727@oss.qualcomm.com
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
… devices

Add label properties to TPDM and CTI nodes in the lemans device tree to
provide human-readable identifiers for each CoreSight device. These
labels allow userspace tools and the CoreSight framework to identify
devices by name rather than by base address.

Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
Signed-off-by: Jie Gan <jie.gan@oss.qualcomm.com>
Link: https://lore.kernel.org/r/20260414-add-label-to-coresight-device-v2-1-5017d07358f2@oss.qualcomm.com
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
… devices

Add label properties to TPDM and CTI nodes in the monaco device tree to
provide human-readable identifiers for each CoreSight device. These
labels allow userspace tools and the CoreSight framework to identify
devices by name rather than by base address.

Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
Signed-off-by: Jie Gan <jie.gan@oss.qualcomm.com>
Link: https://lore.kernel.org/r/20260414-add-label-to-coresight-device-v2-3-5017d07358f2@oss.qualcomm.com
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
… devices

Add label properties to TPDM and CTI nodes in the kodiak device tree to
provide human-readable identifiers for each CoreSight device. These
labels allow userspace tools and the CoreSight framework to identify
devices by name rather than by base address.

Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
Signed-off-by: Jie Gan <jie.gan@oss.qualcomm.com>
Link: https://lore.kernel.org/r/20260414-add-label-to-coresight-device-v2-4-5017d07358f2@oss.qualcomm.com
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
…devices

Add label properties to CTI and TPDM nodes in the talos device tree to
provide human-readable identifiers for each CoreSight device. These
labels allow userspace tools and the CoreSight framework to identify
devices by name rather than by base address.

Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
Signed-off-by: Jie Gan <jie.gan@oss.qualcomm.com>
Link: https://lore.kernel.org/r/20260414-add-label-to-coresight-device-v2-2-5017d07358f2@oss.qualcomm.com
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
…devices

Add label properties to TPDM and CTI nodes in the hamoa device tree to
provide human-readable identifiers for each CoreSight device. These
labels allow userspace tools and the CoreSight framework to identify
devices by name rather than by base address.

Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
Signed-off-by: Jie Gan <jie.gan@oss.qualcomm.com>
Link: https://lore.kernel.org/r/20260414-add-label-to-coresight-device-v2-7-5017d07358f2@oss.qualcomm.com
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
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.

2 participants