Skip to content

Enable ETR and CTCU devices for Monaco#583

Open
jiegan0107 wants to merge 3 commits into
qualcomm-linux:qcom-6.18.yfrom
jiegan0107:qcom-6.18.y
Open

Enable ETR and CTCU devices for Monaco#583
jiegan0107 wants to merge 3 commits into
qualcomm-linux:qcom-6.18.yfrom
jiegan0107:qcom-6.18.y

Conversation

@jiegan0107
Copy link
Copy Markdown

Patchset 1 adds DT nodes for enabling CTCU and ETR devices.
Patchset 2 fixes a wrong connection bug that is introduced by Patchset1.

CRs-Fixed: 4537337

@jiegan0107 jiegan0107 requested review from a team, idlethread, quic-tingweiz and sgaud-quic May 15, 2026 01:12
@sgaud-quic
Copy link
Copy Markdown
Contributor

PR #583 — validate-patch

PR: #583

Verdict Issues Detailed Report
⚠️ 0 Full report
Verdict: ⚠️ — click to expand

Patch Validation Report

PR: qualcomm-linux/kernel #583arm64: dts: qcom: monaco: Add CTCU and ETR nodes + fix
Commits: 2 (BACKPORT + FROMLIST)
Verdict: ⚠️ PARTIAL


Commit 1 — BACKPORT: arm64: dts: qcom: monaco: Add CTCU and ETR nodes

Upstream: https://lore.kernel.org/r/20251103-enable-ctcu-for-monaco-v4-2-92ff83201584@oss.qualcomm.com

Commit Message

Check Status Note
Subject matches upstream BACKPORT: prefix added; bare subject matches lore v4-2
Body preserves rationale Brief but captures intent ("enable expected functionalities")
Fixes tag present/correct N/A Not a bug-fix commit
Authorship preserved From: Jie Gan matches lore author; Acked-by: Konrad Dybcio and Signed-off-by: Bjorn Andersson (maintainer) preserved
Backport note ([ upstream commit <sha> ]) ⚠️ Missing — standard BACKPORT convention requires a [ upstream commit <sha> ] line in the commit body identifying the upstream SHA
Co-developed-by misuse Not present; no issue

Diff

File Status Notes
arch/arm64/boot/dts/qcom/monaco.dtsi 153-line addition; adds ctcu@4001000, port@0 in swao_rep out-ports, replicator@4046000, tmc@4048000 (ETR0), replicator@404e000, tmc@404f000 (ETR1) — consistent with subject "Add CTCU and ETR nodes"; network unavailable for line-by-line lore diff comparison

Upstream Patch Status

Commit Community Verdict
arm64: dts: qcom: monaco: Add CTCU and ETR nodes ✅ ACKed — Signed-off-by: Bjorn Andersson <andersson@kernel.org> (Qualcomm DTS maintainer) present in commit; Acked-by: Konrad Dybcio also present; strong acceptance signal. Exact upstream SHA not verifiable (network unavailable)

qcom-next Presence

Commit Status
arm64: dts: qcom: monaco: Add CTCU and ETR nodes ⏭️ Skipped — could not fetch qcom-next (network restricted); verify manually

Commit 2 — FROMLIST: arm64: dts: qcom: monaco: fix wrong connection for the replicator

Upstream: https://lore.kernel.org/all/20260428-fix-monaco-coresight-dt-v2-1-2293259bbd10@oss.qualcomm.com/

Commit Message

Check Status Note
Subject matches upstream FROMLIST: prefix added; bare subject matches lore v2-1
Body preserves rationale "Fix the wrong connection for the qdss replicator device" — adequate for a targeted fix
Fixes tag present/correct ⚠️ Fixes: 4f791e008807a ("arm64: dts: qcom: monaco: Add CTCU and ETR nodes") — SHA 4f791e008807a does not match the PR's own backport commit SHA (4a9fb182386f). This SHA must be the upstream merged commit. If commit 1 has not yet landed in the target tree under that SHA, the Fixes: tag will not resolve correctly for stable tooling. Verify that 4f791e008807a is the actual upstream SHA in the target branch.
Authorship preserved FROMLIST: rule applies — From: Jie Gan is the lore author; Signed-off-by: Jie Gan present ✓
Backport note N/A Not a backport
Co-developed-by misuse Not present; no issue

Diff

File Status Notes
arch/arm64/boot/dts/qcom/monaco.dtsi Moves swao_rep_out0: endpoint (port@0) from the wrong out-ports block (~line 2894) to the correct one (~line 3603); 8 deletions + 8 insertions — consistent with "fix wrong connection for the replicator"; network unavailable for lore diff comparison

Upstream Patch Status

Commit Community Verdict
arm64: dts: qcom: monaco: fix wrong connection for the replicator ⏳ Decision Pending — lore link is v2 (2026-04-28); no maintainer ACK/SOB in PR commit; network unavailable to check thread for merge signals

qcom-next Presence

Commit Status
arm64: dts: qcom: monaco: fix wrong connection for the replicator ⏭️ Skipped — could not fetch qcom-next (network restricted); verify manually

Issues Found

  1. ⚠️ Commit 1 — Missing [ upstream commit <sha> ] backport note. The BACKPORT: prefix requires a [ upstream commit <sha> ] line in the commit body to identify the upstream SHA being backported. This is absent. Add the upstream SHA (the one Bjorn Andersson applied) to the commit body, e.g.:

    [ upstream commit 4f791e008807a ]
    

    (or the full SHA once confirmed).

  2. ⚠️ Commit 2 — Fixes: tag SHA may not resolve in the target tree. Fixes: 4f791e008807a references what appears to be the upstream merged SHA of commit 1, not the PR's backport SHA (4a9fb182386f). If the target branch carries commit 1 under the backport SHA, stable tooling (scripts/check_fixes.sh) will fail to resolve this tag. Two options:

    • If commit 1 is already merged upstream as 4f791e008807a and the target branch tracks that SHA, the tag is correct — no change needed.
    • If the target branch only has the backport SHA (4a9fb182386f), update the Fixes: tag to match the backport SHA.
  3. ℹ️ Commit 1 — Diff faithfulness unverifiable (network restricted). The lore patch could not be fetched for line-by-line comparison. The content is structurally consistent with the subject ("Add CTCU and ETR nodes") and the maintainer's Signed-off-by is a strong acceptance signal, but a manual diff against the lore raw patch is recommended before merge.

  4. ℹ️ Commit 2 — Upstream status unverifiable (network restricted). The lore thread for v2 (2026-04-28) could not be fetched. Confirm that no maintainer NAK or newer revision (v3+) exists before merging.


Recommendation

Request minor changes before merging. Both commits are structurally sound and well-attributed. The two items requiring attention are: (1) add the [ upstream commit <sha> ] note to the BACKPORT: commit body, and (2) confirm the Fixes: SHA in commit 2 resolves correctly in the target branch. Once those are addressed and the lore diffs are manually verified (network was unavailable), the PR is safe to merge.

@sgaud-quic
Copy link
Copy Markdown
Contributor

PR #583 — checker-log-analyzer

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

Checker Result Summary
Checker Result Summary
checkpatch 2 WARNINGs across 2 commits
dt-binding-check ⏭️ No changes in Documentation/devicetree/bindings
dtb-check New failed to match any schema errors for ctcu@4001000 in all monaco DTBs
sparse-check ⏭️ No C/H changes — skipped
check-uapi-headers ⏭️ No C/H changes — skipped
check-patch-compliance BACKPORT: commit content differs from upstream link
tag-check Both commits carry valid prefixes (BACKPORT:, FROMLIST:)
qcom-next-check ⏭️ Network unavailable — could not fetch qcom-next

Detailed report: Full report

Checker analysis — click to expand

🤖 CI Checker Analysis (checker-log-analyzer)

PR: #583 — arm64: dts: qcom: monaco: Add CTCU/ETR nodes + fix replicator connection
Run: https://github.com/qualcomm-linux/kernel-config/actions/runs/25894847976
Target branch: qcom-6.18.y (not qcom-next / qcom-next-staging)
Commits:

  • 4a9fb182386fBACKPORT: arm64: dts: qcom: monaco: Add CTCU and ETR nodes
  • 52dfc42ee9d4FROMLIST: arm64: dts: qcom: monaco: fix wrong connection for the replicator
Checker Result Summary
checkpatch 2 WARNINGs across 2 commits
dt-binding-check ⏭️ No changes in Documentation/devicetree/bindings
dtb-check New failed to match any schema errors for ctcu@4001000 in all monaco DTBs
sparse-check ⏭️ No C/H changes — skipped
check-uapi-headers ⏭️ No C/H changes — skipped
check-patch-compliance BACKPORT: commit content differs from upstream link
tag-check Both commits carry valid prefixes (BACKPORT:, FROMLIST:)
qcom-next-check ⏭️ Network unavailable — could not fetch qcom-next

❌ checkpatch

Root cause: Two style warnings — one UNDOCUMENTED_DT_STRING for the new qcom,qcs8300-ctcu compatible, and one UNKNOWN_COMMIT_ID for the Fixes: tag referencing a SHA not present in the local tree.

Failure details:

Commit 4a9fb182386f ("BACKPORT: arm64: dts: qcom: monaco: Add CTCU and ETR nodes")
WARNING: DT compatible string "qcom,qcs8300-ctcu" appears un-documented -- check ./Documentation/devicetree/bindings/
#25: FILE: arch/arm64/boot/dts/qcom/monaco.dtsi:2839:
+			compatible = "qcom,qcs8300-ctcu", "qcom,sa8775p-ctcu";
4a9fb182386f total: 0 errors, 1 warnings, 0 checks, 171 lines checked

Commit 52dfc42ee9d4 ("FROMLIST: arm64: dts: qcom: monaco: fix wrong connection for the replicator")
WARNING: Unknown commit id '4f791e008807a', maybe rebased or not pulled?
#10:
Fixes: 4f791e008807a ("arm64: dts: qcom: monaco: Add CTCU and ETR nodes")
52dfc42ee9d4 total: 0 errors, 1 warnings, 0 checks, 28 lines checked

Fix:

  1. UNDOCUMENTED_DT_STRING (commit 1): The qcom,qcs8300-ctcu compatible string is not yet documented in Documentation/devicetree/bindings/. Since this is a BACKPORT: of an upstream commit that already has a binding (qcom,coresight-ctcu.yaml exists — the dtb-check references it), the binding YAML needs to be updated to include qcom,qcs8300-ctcu in its enum: list. Either:

    • Add a companion patch updating Documentation/devicetree/bindings/arm/qcom,coresight-ctcu.yaml to add qcom,qcs8300-ctcu to the compatible enum, or
    • Confirm the upstream binding already includes it (the dtb-check failure below suggests it does not yet).
  2. UNKNOWN_COMMIT_ID (commit 2): The Fixes: tag references 4f791e008807a which is the upstream mainline SHA, not the SHA in this qcom-6.18.y branch. Update the Fixes: tag to reference the local branch SHA of the BACKPORT commit (4a9fb182386f):

    Fixes: 4a9fb182386f ("BACKPORT: arm64: dts: qcom: monaco: Add CTCU and ETR nodes")
    

    Or, since this is a FROMLIST: fix for the upstream patch, use the upstream SHA with the upstream subject (without the BACKPORT: prefix):

    Fixes: 4f791e008807a ("arm64: dts: qcom: monaco: Add CTCU and ETR nodes")
    

    The second form is technically correct for upstream but triggers the warning in the local tree. The first form (local SHA) is preferred for the vendor branch.

Reproduce locally:

./scripts/checkpatch.pl --strict --summary-file --ignore FILE_PATH_CHANGES \
  --git e1d76deb7eb03609ab42329527fc6cac9bc1ab52..52dfc42ee9d4eac0e21a2b621e7044440eb382e8

❌ dtb-check

Root cause: The BACKPORT: commit adds ctcu@4001000 with compatible = "qcom,qcs8300-ctcu", "qcom,sa8775p-ctcu" to monaco.dtsi, but the qcom,coresight-ctcu.yaml binding schema in this tree only allows qcom,sa8775p-ctcuqcom,qcs8300-ctcu is not in the schema's enum:, causing all monaco-based DTBs to fail validation. These errors are new (confirmed by grep -vFf base_dtbs_errors.log head_dtbs_errors.log in the CI script).

Failure details:

Log Summary: Test failed

monaco-ac-evk.dtb: ctcu@4001000 (qcom,qcs8300-ctcu): compatible:0:
  'qcom,qcs8300-ctcu' is not one of ['qcom,sa8775p-ctcu']
  from schema $id: http://devicetree.org/schemas/arm/qcom,coresight-ctcu.yaml#

monaco-ac-evk.dtb: ctcu@4001000 (qcom,qcs8300-ctcu): compatible:
  ['qcom,qcs8300-ctcu', 'qcom,sa8775p-ctcu'] is too long
  from schema $id: http://devicetree.org/schemas/arm/qcom,coresight-ctcu.yaml#

monaco-ac-evk.dtb: /soc@0/ctcu@4001000: failed to match any schema
  with compatible: ['qcom,qcs8300-ctcu', 'qcom,sa8775p-ctcu']

(same errors repeated for monaco-evk.dtb, monaco-evk-el2.dtb,
 monaco-ac-evk-ifp-mezzanine.dtb, monaco-camx-el2.dtb, ...)

Fix: Update Documentation/devicetree/bindings/arm/qcom,coresight-ctcu.yaml to add qcom,qcs8300-ctcu to the compatible string enum. The binding currently only lists qcom,sa8775p-ctcu; it needs to be extended to accept qcom,qcs8300-ctcu as a valid first compatible. This should be done as a separate patch (ideally the upstream binding update is already in-flight or merged — check the lore thread for the BACKPORT). Example fix in the binding:

  compatible:
    items:
      - enum:
          - qcom,qcs8300-ctcu   # add this line
          - qcom,sa8775p-ctcu
      - const: qcom,sa8775p-ctcu

Reproduce locally:

make -j$(nproc) O=out CHECK_DTBS=y arch/arm64/boot/dts/qcom/monaco-ac-evk.dtb

❌ check-patch-compliance

Root cause: The BACKPORT: commit (4a9fb182386f) has a Link: pointing to the upstream lore message, but the checker found the diff content differs from what is at that link — expected for a BACKPORT: since the patch was adapted for the vendor branch.

Failure details:

Checking commit: BACKPORT: arm64: dts: qcom: monaco: Add CTCU and ETR nodes
Change is different from the one mentioned in Link

Checking commit: FROMLIST: arm64: dts: qcom: monaco: fix wrong connection for the replicator
(no error — passed)

Fix: This is a known limitation of check-patch-compliance for BACKPORT: commits — the checker compares the diff verbatim against the upstream mbox and flags any difference. For a legitimate backport with adaptations, the options are:

  1. Preferred: Add a brief note in the commit body explaining what was adapted from upstream (e.g., [Backport note: adapted for qcom-6.18.y — <reason>]). This does not suppress the checker warning but documents the intent.
  2. If the diff is identical to upstream: Verify the Link: URL is correct and points to the exact patch version that matches the committed diff. The link used is https://lore.kernel.org/r/20251103-enable-ctcu-for-monaco-v4-2-92ff83201584@oss.qualcomm.com — confirm this is the right version.
  3. If the diff genuinely differs: This is expected for BACKPORT: and the checker failure is a known false-positive for this prefix. No patch change is strictly required, but the reviewer should manually verify the adaptation is correct.

Reproduce locally:

b4 am --single-message -C -l -3 \
  https://lore.kernel.org/r/20251103-enable-ctcu-for-monaco-v4-2-92ff83201584@oss.qualcomm.com \
  -o /tmp/out
# Then diff the committed patch against the fetched mbox

✅ tag-check

Both commits carry valid prefixes for the qcom-6.18.y target branch:

  • BACKPORT:4a9fb182386f
  • FROMLIST:52dfc42ee9d4

⏭️ qcom-next-check

The FROMLIST: commit (52dfc42ee9d4) should be checked for presence in qcom-next, but network access was unavailable in this analysis environment.

Manual verification:

git remote add qcom-linux https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git
git fetch qcom-linux qcom-next
git log qcom-linux/qcom-next --oneline \
  --grep="arm64: dts: qcom: monaco: fix wrong connection for the replicator"

Verdict

2 hard blockers before merge:

  1. dtb-check ❌qcom,qcs8300-ctcu is not in the qcom,coresight-ctcu.yaml binding schema; all monaco DTBs fail validation. The binding YAML must be updated (either as a companion patch in this PR or as a prerequisite) to add qcom,qcs8300-ctcu to the compatible enum.

  2. check-patch-compliance ❌ — The BACKPORT: commit diff differs from the upstream lore link. Reviewer must manually verify the adaptation is intentional and correct; if the diff is genuinely different from upstream, document the delta in the commit message.

1 advisory (non-blocking):

  • checkpatch ⚠️UNDOCUMENTED_DT_STRING for qcom,qcs8300-ctcu (resolved by fixing the binding YAML above) and UNKNOWN_COMMIT_ID in the Fixes: tag of commit 2 (update to use the local branch SHA 4a9fb182386f).

@jiegan0107 jiegan0107 force-pushed the qcom-6.18.y branch 2 times, most recently from 49cd214 to 0c8b735 Compare May 15, 2026 02:55
@sgaud-quic
Copy link
Copy Markdown
Contributor

PR #583 — validate-patch

PR: #583

Verdict Issues Detailed Report
⚠️ 0 Full report
Verdict: ⚠️ — click to expand

Patch Validation Report

PR: qualcomm-linux/kernel #583arm64: dts: qcom: monaco: Add CTCU and ETR nodes (3 commits)
Upstream:

Verdict: ⚠️ PARTIAL


Commit 1 — BACKPORT: dt-bindings: arm: add CTCU device for monaco

Upstream: https://lore.kernel.org/r/20251103-enable-ctcu-for-monaco-v4-1-92ff83201584@oss.qualcomm.com

Commit Message

Check Status Note
Subject matches upstream BACKPORT: prefix added; bare subject consistent with lore v4 series patch 1/N (dt-bindings patch)
Body preserves rationale Body captures intent; note: "compitable" is a typo (likely carried verbatim from lore original — not introduced by PR)
Fixes tag present/correct N/A Not a bug-fix commit
Authorship preserved From: Jie Gan matches lore author; Signed-off-by: Suzuki K Poulose (arm/coresight maintainer, applied the patch) preserved
Backport note ([ upstream commit <sha> ]) ⚠️ MissingBACKPORT: convention requires a [ upstream commit <sha> ] line in the commit body
Co-developed-by misuse Not present; no issue

Diff

File Status Notes
Documentation/devicetree/bindings/arm/qcom,coresight-ctcu.yaml Converts compatible: enum: [qcom,sa8775p-ctcu] to oneOf: with qcom,qcs8300-ctcu + qcom,sa8775p-ctcu fallback; structurally correct for adding a new SoC variant; consistent with subject; lore fetch unavailable for line-by-line comparison

Upstream Patch Status

Commit Community Verdict
dt-bindings: arm: add CTCU device for monaco ✅ ACKed — Reviewed-by: Krzysztof Kozlowski (dt-bindings maintainer), Acked-by: Suzuki K Poulose (arm/coresight maintainer), Reviewed-by: Bjorn Andersson (Qualcomm DTS maintainer), Signed-off-by: Suzuki K Poulose (applied); strong acceptance signal; exact upstream SHA unverifiable (network restricted)

qcom-next Presence

Commit Status
dt-bindings: arm: add CTCU device for monaco ⏭️ Skipped — could not fetch qcom-next (network restricted); verify manually

Commit 2 — BACKPORT: arm64: dts: qcom: monaco: Add CTCU and ETR nodes

Upstream: https://lore.kernel.org/r/20251103-enable-ctcu-for-monaco-v4-2-92ff83201584@oss.qualcomm.com

Commit Message

Check Status Note
Subject matches upstream BACKPORT: prefix added; bare subject matches lore v4 series patch 2/N
Body preserves rationale "Add CTCU and ETR nodes in DT to enable expected functionalities" — adequate
Fixes tag present/correct N/A Not a bug-fix commit
Authorship preserved From: Jie Gan matches lore author; Acked-by: Konrad Dybcio and Signed-off-by: Bjorn Andersson (Qualcomm DTS maintainer, applied) preserved
Backport note ([ upstream commit <sha> ]) ⚠️ Missing — same issue as commit 1; no [ upstream commit <sha> ] line in body
Co-developed-by misuse Not present; no issue

Diff

File Status Notes
arch/arm64/boot/dts/qcom/monaco.dtsi 153-line addition; adds ctcu@4001000 (using qcom,qcs8300-ctcu + qcom,sa8775p-ctcu — consistent with binding added in commit 1), replicator@4046000, tmc@4048000 (ETR0), replicator@404e000, tmc@404f000 (ETR1), and port@0 in swao_rep out-ports; structurally consistent with subject; lore fetch unavailable for line-by-line comparison

Upstream Patch Status

Commit Community Verdict
arm64: dts: qcom: monaco: Add CTCU and ETR nodes ✅ ACKed — Acked-by: Konrad Dybcio, Signed-off-by: Bjorn Andersson (applied by Qualcomm DTS maintainer); strong acceptance signal; exact upstream SHA unverifiable (network restricted)

qcom-next Presence

Commit Status
arm64: dts: qcom: monaco: Add CTCU and ETR nodes ⏭️ Skipped — could not fetch qcom-next (network restricted); verify manually

Commit 3 — FROMLIST: arm64: dts: qcom: monaco: fix wrong connection for the replicator

Upstream: https://lore.kernel.org/all/20260428-fix-monaco-coresight-dt-v2-1-2293259bbd10@oss.qualcomm.com/

Commit Message

Check Status Note
Subject matches upstream FROMLIST: prefix added; bare subject matches lore v2-1
Body preserves rationale "Fix the wrong connection for the qdss replicator device" — adequate for a targeted fix
Fixes tag present/correct ⚠️ Fixes: 4f791e008807a ("arm64: dts: qcom: monaco: Add CTCU and ETR nodes") — SHA 4f791e008807a is the upstream merged SHA of commit 2, not the PR backport SHA (14021fdfbe7c). If the target branch carries commit 2 under the backport SHA, stable tooling will fail to resolve this tag. Verify that 4f791e008807a is present in the target branch under that exact SHA.
Authorship preserved FROMLIST: rule applies — From: Jie Gan is the lore author; Signed-off-by: Jie Gan present ✓
Backport note N/A Not a backport
Co-developed-by misuse Not present; no issue

Diff

File Status Notes
arch/arm64/boot/dts/qcom/monaco.dtsi Moves swao_rep_out0: endpoint (port@0) from the wrong out-ports block (~line 2894) to the correct one (~line 3603); 8 deletions + 8 insertions; structurally consistent with "fix wrong connection for the replicator"; lore fetch unavailable for line-by-line comparison

Upstream Patch Status

Commit Community Verdict
arm64: dts: qcom: monaco: fix wrong connection for the replicator ⏳ Decision Pending — lore link is v2 (2026-04-28); no maintainer Signed-off-by or Acked-by in PR commit; network unavailable to check thread for merge signals or newer revision

qcom-next Presence

Commit Status
arm64: dts: qcom: monaco: fix wrong connection for the replicator ⏭️ Skipped — could not fetch qcom-next (network restricted); verify manually

Issues Found

  1. ⚠️ Commits 1 & 2 — Missing [ upstream commit <sha> ] backport note. Both BACKPORT: commits lack the standard [ upstream commit <sha> ] line in the commit body. Add the upstream SHA (as applied by the respective maintainer) to each commit body, e.g.:

    [ upstream commit <full-sha> ]
    
  2. ⚠️ Commit 3 — Fixes: tag SHA may not resolve in the target tree. Fixes: 4f791e008807a references the upstream merged SHA of commit 2, not the PR backport SHA (14021fdfbe7c). If the target branch only carries the backport SHA, scripts/check_fixes.sh will fail to resolve this tag. Confirm that 4f791e008807a is present in the target branch; if not, update the Fixes: tag to the backport SHA.

  3. ℹ️ Commits 1, 2, 3 — Diff faithfulness unverifiable (network restricted). Lore patches could not be fetched for line-by-line comparison. Content is structurally consistent with subjects and maintainer sign-offs are strong acceptance signals, but a manual diff against the raw lore patches is recommended before merge.

  4. ℹ️ Commit 3 — Upstream status unverifiable (network restricted). The lore thread for v2 (2026-04-28) could not be fetched. Confirm no maintainer NAK or newer revision (v3+) exists before merging.

  5. ℹ️ Commit 1 — "compitable" typo in commit body. The word "compitable" (should be "compatible") appears in the commit body. This is likely carried verbatim from the lore original and is not a PR-introduced error, but worth noting.


Recommendation

Request minor changes before merging. All three commits are well-attributed and structurally sound. The two actionable items are: (1) add [ upstream commit <sha> ] notes to both BACKPORT: commit bodies (commits 1 and 2), and (2) confirm the Fixes: SHA in commit 3 resolves correctly in the target branch. Once those are addressed and the lore diffs are manually verified (network was unavailable during this analysis), the PR is safe to merge.

@sgaud-quic
Copy link
Copy Markdown
Contributor

PR #583 — checker-log-analyzer

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

Checker Result Summary
Checker Result Summary
checkpatch WARNING on commit 3: unknown Fixes: SHA 4f791e008807a
dt-binding-check dt_binding_check and dtbs_check passed for qcom,coresight-ctcu.yaml
dtb-check Log Summary: Test passed (no new errors introduced by PR)
sparse-check ⏭️ Skipped — no C/H files changed
check-uapi-headers ⏭️ Skipped — no UAPI-relevant files changed
check-patch-compliance Commit 2 (BACKPORT: …Add CTCU and ETR nodes): content differs from upstream link
tag-check All 3 commits carry valid prefixes (BACKPORT:, BACKPORT:, FROMLIST:)
qcom-next-check ⚠️ Commit 3 (FROMLIST:) — cannot confirm presence in qcom-next (network unavailable); manual verification required

Detailed report: Full report

Checker analysis — click to expand

🤖 CI Checker Analysis (checker-log-analyzer)

PR: #583 — BACKPORT/FROMLIST: arm64: dts: qcom: monaco CTCU/ETR coresight nodes
Run: https://github.com/qualcomm-linux/kernel-config/actions/runs/25897783465
Target branch: qcom-6.18.y (not qcom-next / qcom-next-staging → tag-check applies)
Base SHA: e1d76deb7eb03609ab42329527fc6cac9bc1ab52 | Head SHA: 0c8b7351fc7bc8b3383aed039c0f9be65c29e670

Commits in PR:

  1. 10198e6be255BACKPORT: dt-bindings: arm: add CTCU device for monaco
  2. 14021fdfbe7cBACKPORT: arm64: dts: qcom: monaco: Add CTCU and ETR nodes
  3. 0c8b7351fc7bFROMLIST: arm64: dts: qcom: monaco: fix wrong connection for the replicator

Checker Result Summary
checkpatch WARNING on commit 3: unknown Fixes: SHA 4f791e008807a
dt-binding-check dt_binding_check and dtbs_check passed for qcom,coresight-ctcu.yaml
dtb-check Log Summary: Test passed (no new errors introduced by PR)
sparse-check ⏭️ Skipped — no C/H files changed
check-uapi-headers ⏭️ Skipped — no UAPI-relevant files changed
check-patch-compliance Commit 2 (BACKPORT: …Add CTCU and ETR nodes): content differs from upstream link
tag-check All 3 commits carry valid prefixes (BACKPORT:, BACKPORT:, FROMLIST:)
qcom-next-check ⚠️ Commit 3 (FROMLIST:) — cannot confirm presence in qcom-next (network unavailable); manual verification required

❌ checkpatch

Root cause: Commit 0c8b7351fc7b has a Fixes: tag referencing a short SHA (4f791e008807a) that is not reachable in the checked-out tree, triggering WARNING: UNKNOWN_COMMIT_ID.

Failure details:

Commit 0c8b7351fc7b ("FROMLIST: arm64: dts: qcom: monaco: fix wrong connection for the replicator")
WARNING: Unknown commit id '4f791e008807a', maybe rebased or not pulled?
#10:
Fixes: 4f791e008807a ("arm64: dts: qcom: monaco: Add CTCU and ETR nodes")

0c8b7351fc7bc8b3383aed039c0f9be65c29e670 total: 0 errors, 1 warnings, 0 checks, 28 lines checked

Root cause analysis: The Fixes: tag points to commit 14021fdfbe7c (the second commit in this same PR, "BACKPORT: arm64: dts: qcom: monaco: Add CTCU and ETR nodes"). The short SHA 4f791e008807a is the upstream mainline SHA of that commit, not the backported SHA in this branch. Checkpatch cannot resolve it because the mainline commit is not present in the qcom-6.18.y tree.

Fix: Update the Fixes: tag in commit 0c8b7351fc7b to reference the actual SHA of the backported commit in this branch (14021fdfbe7c):

Fixes: 14021fdfbe7c ("arm64: dts: qcom: monaco: Add CTCU and ETR nodes")

Then amend the commit:

git rebase -i e1d76deb7eb03609ab42329527fc6cac9bc1ab52  # mark commit 3 as 'edit'
git commit --amend   # update the Fixes: line
git rebase --continue

Reproduce locally:

./scripts/checkpatch.pl --strict --summary-file --ignore FILE_PATH_CHANGES \
  --git e1d76deb7eb03609ab42329527fc6cac9bc1ab52..0c8b7351fc7bc8b3383aed039c0f9be65c29e670

❌ check-patch-compliance

Root cause: Commit 14021fdfbe7c (BACKPORT: arm64: dts: qcom: monaco: Add CTCU and ETR nodes) has content that differs from the upstream patch referenced by its Link: tag.

Failure details:

Checking commit: BACKPORT: dt-bindings: arm: add CTCU device for monaco
  → PASS

Checking commit: BACKPORT: arm64: dts: qcom: monaco: Add CTCU and ETR nodes
  Change is different from the one mentioned in Link

Checking commit: FROMLIST: arm64: dts: qcom: monaco: fix wrong connection for the replicator
  → PASS

Root cause analysis: The Link: in commit 2 points to https://lore.kernel.org/r/20251103-enable-ctcu-for-monaco-v4-2-92ff83201584@oss.qualcomm.com. The checker fetched the upstream mbox and found the diff does not match. This is expected for a BACKPORT: commit — the PR adds 153 lines of DTS content to monaco.dtsi, while the upstream patch likely targets a different file or has context differences due to the backport adaptation. The BACKPORT: prefix is correct, but the checker's content-match sub-check does not automatically exempt BACKPORT: commits.

Fix options:

  1. If the diff difference is only due to legitimate backport adaptation (context shifts, file location differences, or cherry-pick conflicts resolved correctly): this is a known checker limitation for BACKPORT: commits. No patch change is needed — document the adaptation in the commit message body, e.g.:
    [Backport note: Applied to monaco.dtsi; upstream targets a different tree context.]
    
  2. Verify the actual diff delta to confirm no unintended hunks were introduced:
    b4 am --single-message -C -l -3 \
      https://lore.kernel.org/r/20251103-enable-ctcu-for-monaco-v4-2-92ff83201584@oss.qualcomm.com \
      -o /tmp/out
    diff <(git format-patch -1 14021fdfbe7c --stdout | grep -E '^[+-][^+-]') \
         <(awk '/^diff/,/^--$/' /tmp/out/*.mbx | grep -E '^[+-][^+-]')

Reproduce locally:

bash kernel-checkers/check-patch-compliance.sh \
  --kernel-src <kernel-src> \
  --base e1d76deb7eb03609ab42329527fc6cac9bc1ab52 \
  --head 0c8b7351fc7bc8b3383aed039c0f9be65c29e670

ℹ️ dt-binding-check — PASS (with informational note)

The checker reports dt_binding_check passed and dtbs_check passed for Documentation/devicetree/bindings/arm/qcom,coresight-ctcu.yaml. However, the log contains many oneOf conditional failed errors for existing DTBs (hamoa, purwa, x1e, x1p families) that already use qcom,hamoa-ctcu as a compatible string:

hamoa-iot-evk.dtb: ctcu@10001000 (qcom,hamoa-ctcu): compatible: 'oneOf' conditional failed, one must be fixed:
    ['qcom,hamoa-ctcu', 'qcom,sa8775p-ctcu'] is too long
    'qcom,hamoa-ctcu' is not one of ['qcom,qcs8300-ctcu']
    'qcom,hamoa-ctcu' is not one of ['qcom,sa8775p-ctcu']

Analysis: The binding's oneOf schema (added by commit 1) defines two valid forms:

  • [qcom,qcs8300-ctcu, qcom,sa8775p-ctcu] (2-item list with fallback)
  • [qcom,sa8775p-ctcu] (standalone)

The existing hamoa/purwa/x1e/x1p DTBs use ["qcom,hamoa-ctcu", "qcom,sa8775p-ctcu"] — a 2-item list where the first item is qcom,hamoa-ctcu, not qcom,qcs8300-ctcu. The binding only allows qcom,qcs8300-ctcu as the device-specific compatible in the 2-item form. These DTBs need to be updated to use qcom,qcs8300-ctcu instead of qcom,hamoa-ctcu, or the binding needs to add qcom,hamoa-ctcu to the enum list in the first items entry. The checker script considers this a pass because it only checks the binding file itself, not all downstream DTBs — but this is a real schema inconsistency that should be addressed.

Recommended fix: Add qcom,hamoa-ctcu to the binding's oneOf first item enum, or update all hamoa/purwa DTBs to use qcom,qcs8300-ctcu as the device-specific compatible (if hamoa is a variant of qcs8300).


⚠️ qcom-next-check

Commit 0c8b7351fc7b (FROMLIST: arm64: dts: qcom: monaco: fix wrong connection for the replicator) carries a FROMLIST: prefix with Link: https://lore.kernel.org/all/20260428-fix-monaco-coresight-dt-v2-1-2293259bbd10@oss.qualcomm.com/. Network access is unavailable in this environment to fetch qcom-next and verify presence.

⚠️ qcom-next-check — SKIPPED (could not fetch qcom-next)
Manually verify:
  git remote add qcom-linux https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git
  git fetch qcom-linux qcom-next
  git log qcom-linux/qcom-next --oneline --grep="fix wrong connection for the replicator"

Verdict

2 blockers to fix before merge:

  1. checkpatch — Update the Fixes: SHA in commit 0c8b7351fc7b from the upstream mainline SHA 4f791e008807a to the in-branch backported SHA 14021fdfbe7c.
  2. check-patch-compliance — Verify commit 14021fdfbe7c (BACKPORT:) diff against the lore link; if the difference is only legitimate backport adaptation, document it in the commit message. If unintended hunks exist, correct them.

Additionally, the dt-binding-check oneOf failures for hamoa/purwa/x1e/x1p DTBs (not counted as a CI blocker since the checker reports pass) should be investigated — the binding schema introduced by commit 1 does not cover qcom,hamoa-ctcu as a valid device-specific compatible in the 2-item form, which will cause downstream dtbs_check failures for those boards.

@jiegan0107
Copy link
Copy Markdown
Author

jiegan0107 commented May 15, 2026

image

I have cross checked the patchset I have posted. The issue is introduced by maintainer when apply the patch, not introduced by the patchset itself. That's why content differs from upstream link because the commit is cherry-picked from upstream tree.

screenshot from my posted patch, modification is in the replicator@4b06000:
image

screenshot from the linux-next tree, modification is in the tpda@4004000:
image

The fix patch was posted to fix this wrong connection issue.

The CTCU device for monaco shares the same configurations as SA8775p. Add
a fallback to enable the CTCU for monaco to utilize the compitable of the
SA8775p.

Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Acked-by: Suzuki K Poulose <suzuki.poulose@arm.com>
Reviewed-by: Bjorn Andersson <andersson@kernel.org>
Signed-off-by: Jie Gan <jie.gan@oss.qualcomm.com>
Signed-off-by: Suzuki K Poulose <suzuki.poulose@arm.com>
Link: https://lore.kernel.org/r/20251103-enable-ctcu-for-monaco-v4-1-92ff83201584@oss.qualcomm.com
[ upstream commit 51cd1fb ]
Add CTCU and ETR nodes in DT to enable expected functionalities.

Acked-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
Signed-off-by: Jie Gan <jie.gan@oss.qualcomm.com>
Link: https://lore.kernel.org/r/20251103-enable-ctcu-for-monaco-v4-2-92ff83201584@oss.qualcomm.com
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
[ upstream commit 4f791e0 ]
…icator

Fix the wrong connection for the qdss replicator device.

Link: https://lore.kernel.org/all/20260428-fix-monaco-coresight-dt-v2-1-2293259bbd10@oss.qualcomm.com/
Fixes: 4f791e0 ("arm64: dts: qcom: monaco: Add CTCU and ETR nodes")
Signed-off-by: Jie Gan <jie.gan@oss.qualcomm.com>
@jiegan0107
Copy link
Copy Markdown
Author

jiegan0107 commented May 15, 2026

image For this error, the patch is generated with the config, resulting in generate more context with the code diff for easy reviewing: git config diff.context 20

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