arm64: dts: qcom: Add OPE node for Agatti and Shikra

[Nihal Kumar Gupta (nihal231998)]

This series add dt nodes to enable OPE support for Agatti and Shikra

• FROMLIST: arm64: dts: qcom: agatti: Add OPE node
• FROMLIST: arm64: dts: qcom: shikra: Add OPE node

CR-Fixed: 4677262

[qcomlnxci]

@qualcomm-linux/kernel-topics This pull request has been marked as stale due to 30 days of inactivity and will automatically close after an additional 5 days.

[quic-vikramsa]

Please Keep Loic Signoff also in Shikra commit

[quic-vikramsa]

Signed-off-by: Nihal Kumar Gupta nihal.gupta@oss.qualcomm.com
Signed-off-by: Loic Poulain loic.poulain@oss.qualcomm.com

Keep both in commit text

[qlijarvis]

🔨 Build Failure Analysis — PR #1687

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

#	Error	File:Line	PR-introduced?	Root Cause
1	Automerge failure: 165 merge conflicts	Multiple files (see detailed analysis)	N/A - Pre-existing integration conflicts	The PR introduces a large Shikra SoC platform support (132 commits) that conflicts with parallel development in the integration branch. Conflicts span device tree bindings, DTS files, drivers, and sound subsystem.

Verdict

This is not a compilation failure. The build failed during the automerge step before any compilation could occur. The PR cannot be automatically integrated with the current state of the target branch due to 165 merge conflicts across device tree bindings, DTS files, clock drivers, sound drivers, and other subsystems. Manual conflict resolution is required.

📎 Detailed analysis: Full report

[qlijarvis]

🔨 Build Failure Analysis — PR #1687

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

#	Error	File:Line	PR-introduced?	Root Cause
1	Merge conflict during automerge	arch/arm64/boot/dts/qcom/agatti.dtsi	Yes	PR adds OPE node to agatti.dtsi which conflicts with concurrent changes in the integration branch
2	Merge conflict during automerge	arch/arm64/boot/dts/qcom/shikra.dtsi	Yes	PR adds OPE node to shikra.dtsi which conflicts with concurrent changes in the integration branch

Verdict

Both failures are directly caused by this PR. The PR modifies agatti.dtsi and shikra.dtsi to add OPE device tree nodes, and these exact files have merge conflicts when integrating with the target branch. This is not a compilation error but an integration conflict that must be resolved before the PR can be merged.

📎 Detailed analysis: Full report

[qlijarvis]

🔨 Build Failure Analysis — PR #1687

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

#	Error	File:Line	PR-introduced?	Root Cause
1	Automerge failure: 150+ merge conflicts	Multiple files across kernel tree	No	Pre-existing integration conflicts between target branch and PR base

Verdict

This is NOT a compilation failure. The build failed during the automerge/integration step before compilation could begin. The PR changes themselves (adding OPE device tree nodes to agatti.dtsi and shikra.dtsi) contain no syntax errors or compilation issues. The failure is due to extensive merge conflicts (150+ files) when attempting to integrate the PR's base branch with the target integration branch.

📎 Detailed analysis: Full report

[qlijarvis]

🔨 Build Failure Analysis — PR #1687

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

#	Error	File:Line	PR-introduced?	Root Cause
1	Merge conflict (content)	arch/arm64/boot/dts/qcom/agatti.dtsi	Yes	PR adds OPE node to agatti.dtsi which conflicts with other changes in the integration branch
2	Merge conflict (add/add)	arch/arm64/boot/dts/qcom/shikra.dtsi	Yes	PR adds OPE node to shikra.dtsi which conflicts with other additions in the integration branch
3-157	Merge conflicts (various)	155 other files	No	Pre-existing conflicts in the integration branch unrelated to this PR's changes

Verdict

2 of 157 merge conflicts are directly related to this PR's changes; 155 are pre-existing integration conflicts unrelated to the PR.

Note: This is not a compilation failure. The build failed during the automerge step when attempting to integrate the PR branch topic/tech/all/shikra with the base integration branch. The PR itself adds OPE device tree nodes to two files (agatti.dtsi and shikra.dtsi), both of which have merge conflicts with the integration branch.

📎 Detailed analysis: Full report

[qlijarvis]

PR #1687 — validate-patch

PR: #1687

Verdict	Issues	Detailed Report
❌	0	Full report

Final Summary

1. Lore link present: Yes - both commits have lore.kernel.org links in Upstream-Status: tags (non-standard format)

2. Lore link matches PR commits: Cannot verify - lore patches were not fetched due to (a) network restrictions in validation environment, and (b) Jarvis pre-fetch script looking for Link: tags instead of Upstream-Status: tags

3. Upstream patch status: Cannot verify - lore thread unavailable; links indicate "Submitted" status but cannot confirm if patches were ACKed, NACKed, or still pending review

4. PR present in qcom-next/topics: Partial - 1/2 commit(s) only have partial integration evidence

   • Commit 1/2 (agatti): ✅ Present - found in topics with all added lines verified
   • Commit 2/2 (shikra): ⚠️ Partial - only partial evidence in qcom-next, missing from topics
   • Overall: PARTIAL - 1/2 commits fully present, 1/2 commits only partially integrated

Verdict: ❌ — click to expand

🔍 Patch Validation

PR: #1687 - Add OPE node for agatti and shikra
Upstream commits:

• Commit 1/2: https://lore.kernel.org/all/20260724-camss-isp-ope-v5-5-e70ad4fa39ce@oss.qualcomm.com/
• Commit 2/2: https://lore.kernel.org/all/20260915-camss-isp-ope-v7-8-77b13d131d3d@oss.qualcomm.com/

Verdict: ❌ FAIL

---

Commit 1/2: FROMLIST: arm64: dts: qcom: agatti: Add OPE node

Commit Message

Check	Status	Note
Subject matches upstream	⚠️	Cannot verify - lore fetch failed due to network restrictions
Body preserves rationale	❌	Incorrect register count: commit message says "five register regions (top, bus_read, bus_write, pipeline, qos)" but code adds six regions: cdm, top, qos, pipeline, bus_read, bus_write
Fixes tag present/correct	✅	N/A - new feature, no Fixes tag required
Authorship preserved	⚠️	Cannot verify - lore source unavailable; From: is Loic Poulain, Signed-off-by: chain is correct for FROMLIST
Link tag format	❌	Uses non-standard Upstream-Status: Submitted [URL] instead of kernel-standard Link: URL tag

Diff

File	Status	Notes
arch/arm64/boot/dts/qcom/agatti.dtsi	⚠️	Cannot verify against lore source - network unavailable; code structure appears correct

---

Commit 2/2: FROMLIST: arm64: dts: qcom: shikra: Add OPE node

Commit Message

Check	Status	Note
Subject matches upstream	⚠️	Cannot verify - lore fetch failed due to network restrictions
Body preserves rationale	✅	Correctly states "six register regions (cdm, top, qos, pipeline, bus_read, bus_write)"
Fixes tag present/correct	✅	N/A - new feature, no Fixes tag required
Authorship preserved	⚠️	Cannot verify - lore source unavailable; From: is Nihal Kumar Gupta, both authors in Signed-off-by: chain (correct for FROMLIST co-authored patch)
Link tag format	❌	Uses non-standard Upstream-Status: Submitted [URL] instead of kernel-standard Link: URL tag

Diff

File	Status	Notes
arch/arm64/boot/dts/qcom/shikra.dtsi	⚠️	Cannot verify against lore source - network unavailable; code structure appears correct

---

Issues

Commit 1/2 - Critical:

1. Incorrect register region count in commit message: The commit message states "five register regions (top, bus_read, bus_write, pipeline, qos)" but the actual code adds six register regions: cdm, top, qos, pipeline, bus_read, bus_write. The cdm region is missing from the description.

Both commits - Non-standard tag format:
2. Non-standard upstream link format: Both commits use Upstream-Status: Submitted [URL] instead of the kernel-standard Link: URL tag. The kernel community expects:

Link: https://lore.kernel.org/all/20260724-camss-isp-ope-v5-5-e70ad4fa39ce@oss.qualcomm.com/

not:

Upstream-Status: Submitted [https://lore.kernel.org/all/20260724-camss-isp-ope-v5-5-e70ad4fa39ce@oss.qualcomm.com/]

Lore verification limitation:
3. Cannot verify diff faithfulness: Network restrictions prevented fetching the upstream lore patches. The Jarvis pre-fetch script looked for Link: tags but these commits use Upstream-Status: tags, so no lore evidence was collected. Without the upstream source, I cannot verify:

• Whether the PR diff matches the lore patch exactly
• Whether the lore patch has been updated to a newer revision
• The upstream community acceptance status (ACKed/NACKed/Pending)

---

Verdict

FAIL - Commit 1/2 has an incorrect commit message that misrepresents the code changes. The register region count must be corrected before merge.

Required fixes:

1. Commit 1/2: Update commit message to state "six register regions (cdm, top, qos, pipeline, bus_read, bus_write)" instead of "five register regions (top, bus_read, bus_write, pipeline, qos)"
2. Both commits: Replace Upstream-Status: Submitted [URL] with standard kernel Link: URL format

Recommended (if lore verification is required):
3. Re-run validation after fixing the Link tag format so lore evidence can be fetched and diff faithfulness can be verified

---

Final Summary

1. Lore link present: Yes - both commits have lore.kernel.org links in Upstream-Status: tags (non-standard format)

2. Lore link matches PR commits: Cannot verify - lore patches were not fetched due to (a) network restrictions in validation environment, and (b) Jarvis pre-fetch script looking for Link: tags instead of Upstream-Status: tags

3. Upstream patch status: Cannot verify - lore thread unavailable; links indicate "Submitted" status but cannot confirm if patches were ACKed, NACKed, or still pending review

4. PR present in qcom-next/topics: Partial (per integration_presence_report.md):

   • Commit 1/2 (agatti): ✅ Present - found in topics with all added lines verified
   • Commit 2/2 (shikra): ⚠️ Partial - only partial evidence in qcom-next, missing from topics
   • Overall: PARTIAL - 1/2 commits fully present, 1/2 commits only partially integrated

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: d49c33864d06e9672dce57738be8851384578fcf
topics remote: topics -> https://github.com/qualcomm-linux/kernel-topics
topics fetch: fetched

Commit	Subject	qcom-next	topics	Final
1/2	[PATCH 1/2] FROMLIST: arm64: dts: qcom: agatti: Add OPE node	partial - subject or partial tree evidence found, but full change was not verified	present - all checked added lines are present	present
2/2	[PATCH 2/2] FROMLIST: arm64: dts: qcom: shikra: Add OPE node	partial - subject or partial tree evidence found, but full change was not verified	missing - no subject, patch-id, or full tree-content match found	partial

Final Status

overall_status: PARTIAL
present_commits: 1/2
partial_commits: 1/2
missing_commits: 0/2
topics_checked_for_commits: 2/2
final_summary: PR present in qcom-next/topics: Partial - 1/2 commit(s) only have partial integration evidence

[qlijarvis]

PR #1687 — checker-log-analyzer

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

Checker	Result	Summary
Checker	Result	Summary
checkpatch	⏭️	Skipped - automerge failed
dt-binding-check	⏭️	Skipped - automerge failed
dtb-check	⏭️	Skipped - automerge failed
sparse-check	⏭️	Skipped - automerge failed
check-uapi-headers	⏭️	Skipped - automerge failed
check-patch-compliance	⏭️	Skipped - automerge failed
tag-check	N/A	Cannot determine - automerge failed

Detailed report: Full report

Checker analysis — click to expand

🤖 CI Checker Analysis (checker-log-analyzer)

PR: #1687 - Add OPE (Offline Processing Engine) nodes for Agatti and Shikra
Source: https://github.com/qualcomm-linux/kernel-config/actions/runs/35492191798

Checker	Result	Summary
checkpatch	⏭️	Skipped - automerge failed
dt-binding-check	⏭️	Skipped - automerge failed
dtb-check	⏭️	Skipped - automerge failed
sparse-check	⏭️	Skipped - automerge failed
check-uapi-headers	⏭️	Skipped - automerge failed
check-patch-compliance	⏭️	Skipped - automerge failed
tag-check	N/A	Cannot determine - automerge failed

---

❌ Automerge Failure (Pre-Checker Stage)

Root cause: The CI workflow failed during the automerge stage before any checker jobs could execute. The PR branch could not be automatically merged with the target branch due to extensive merge conflicts across 159 files.

Failure details:

The automerge step encountered conflicts in 159 files across multiple subsystems:

Major conflict areas:

• Device tree files (78 files): agatti.dtsi, shikra.dtsi, glymur.dtsi, kaanapali.dtsi, hamoa.dtsi, lemans-*.dts, sc8280xp-*.dts, and many board-specific DTS files
• Device tree bindings (14 files): qcom,coresight-tnoc.yaml, qcom,qcm2290-camss.yaml, qcom,shikra-audiocorecc.yaml, qcom,glymur-evacc.yaml, and others
• Clock drivers (9 files): gcc-shikra.c, camcc-glymur.c, audiocorecc-shikra.c, evacc-glymur.c, etc.
• Sound subsystem (20 files): sound/soc/qcom/ including common.c, common.h, qaif-*.c, qdsp6/audioreach.c, qdsp6/q6apm-*.c, etc.
• Other drivers (38 files): DRM/MSM DP drivers, PHY drivers, thermal drivers, remoteproc, SMEM, fastrpc, and more

Sample conflicts:

CONFLICT (content): Merge conflict in arch/arm64/boot/dts/qcom/agatti.dtsi
CONFLICT (content): Merge conflict in arch/arm64/boot/dts/qcom/shikra.dtsi
CONFLICT (add/add): Merge conflict in sound/soc/qcom/qaif-cpu.c
CONFLICT (add/add): Merge conflict in drivers/clk/qcom/gcc-shikra.c
CONFLICT (modify/delete): arch/arm64/boot/dts/qcom/lemans-auto.dtsi deleted in topic/tech/all/shikra and modified in HEAD

Fix: The PR needs to be rebased on the current target branch to resolve all merge conflicts. This is a substantial rebase effort given the number of conflicting files.

Steps to resolve:

1. Identify the target branch (likely qcom-next or a topic branch):

   gh pr view 1687 --repo qualcomm-linux/kernel-topics --json baseRefName

2. Rebase the PR branch:

   git fetch origin
   git checkout <pr-branch>
   git rebase origin/<target-branch>

3. Resolve conflicts systematically:

   • Start with the two files modified by this PR: arch/arm64/boot/dts/qcom/agatti.dtsi and arch/arm64/boot/dts/qcom/shikra.dtsi
   • For each conflict, use git diff to understand what changed in both branches
   • The PR adds OPE nodes at specific addresses (isp@5c42000) — ensure these additions are preserved
   • For conflicts in unrelated files (sound, clock drivers, etc.), accept the target branch version unless the PR explicitly modified those files

4. Verify the rebase:

   git log --oneline origin/<target-branch>..HEAD  # Should show only the 2 OPE commits
   git diff origin/<target-branch>  # Should show only OPE node additions

5. Force-push the rebased branch:

   git push --force-with-lease origin <pr-branch>

6. Re-trigger CI: The kernel-checker workflow will automatically run on the updated PR.

Reproduce locally:

# Clone the repo and checkout the PR
gh pr checkout 1687 --repo qualcomm-linux/kernel-topics

# Attempt the merge to see conflicts
git fetch origin <target-branch>
git merge origin/<target-branch>

---

Verdict

Cannot assess patch quality — the CI run failed before any checkers executed due to extensive merge conflicts (159 files). The PR must be rebased on the current target branch before checker analysis can proceed.

Blocker: Rebase required to resolve 159 merge conflicts across device tree files, bindings, clock drivers, sound subsystem, and other drivers.

Next steps:

1. Rebase the PR branch on the current target branch
2. Resolve all merge conflicts (focus on preserving the OPE node additions in agatti.dtsi and shikra.dtsi)
3. Force-push the rebased branch
4. Wait for CI to re-run with the updated branch
5. Re-analyze checker results after successful automerge