Skip to content

arm64: dts: qcom: hamoa: Fix pcie4_port0_ep endpoint stub location - #1675

Closed
weiden (WeiDeng-weiden) wants to merge 1 commit into
qualcomm-linux:tech/all/dt/hamoafrom
WeiDeng-weiden:fix/pcie4-ep-location
Closed

arm64: dts: qcom: hamoa: Fix pcie4_port0_ep endpoint stub location#1675
weiden (WeiDeng-weiden) wants to merge 1 commit into
qualcomm-linux:tech/all/dt/hamoafrom
WeiDeng-weiden:fix/pcie4-ep-location

Conversation

@WeiDeng-weiden

Copy link
Copy Markdown

The pcie4_port0_ep endpoint stub was incorrectly added inside the
pcie5_port0 child node due to a context-matching error during patch
application. Move it to the correct pcie4_port0 child node.

Only hamoa.dtsi changes (5 insertions, 5 deletions — moving the stub
from pcie5_port0 to pcie4_port0).

Fixes: 2d51788 ("FROMLIST: arm64: dts: qcom: hamoa: Add graph port/endpoint anchors to pcie4_port0 and uart14")

CRs-Fixed: 4630764

…ocation

The pcie4_port0_ep endpoint stub was incorrectly added inside the
pcie5_port0 child node due to a context-matching error during patch
application. Move it to the correct pcie4_port0 child node.

Fixes: 2d51788 ("FROMLIST: arm64: dts: qcom: hamoa: Add graph port/endpoint anchors to pcie4_port0 and uart14")
Signed-off-by: Wei Deng <wei.deng@oss.qualcomm.com>
@WeiDeng-weiden weiden (WeiDeng-weiden) changed the title FROMLIST: arm64: dts: qcom: hamoa: Fix pcie4_port0_ep endpoint stub location arm64: dts: qcom: hamoa: Fix pcie4_port0_ep endpoint stub location Aug 12, 2026
@WeiDeng-weiden

Copy link
Copy Markdown
Author

Superseded by #1674 (full rewrite with corrected P1).

@qlijarvis

Copy link
Copy Markdown

🔨 Build Failure Analysis — PR #1675

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

# Error File:Line PR-introduced? Root Cause
1 Merge conflict during automerge arch/arm64/boot/dts/qcom/hamoa-iot-evk.dts No Integration conflict between topic branch and baseline; PR modifies different file (hamoa.dtsi)
2 Merge conflict during automerge arch/arm64/boot/dts/qcom/purwa-iot-evk.dts No Integration conflict between topic branch and baseline; PR modifies different file (hamoa.dtsi)

Verdict

0 of 2 failures are introduced by this PR; both are pre-existing integration conflicts. The build never reached compilation — it failed during the automerge phase when integrating the topic branch with the baseline. The PR itself only modifies hamoa.dtsi and does not touch the conflicting files.

📎 Detailed analysis: Full report

@qlijarvis

Copy link
Copy Markdown

🔨 Build Failure Analysis — PR #1675

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

# Error File:Line PR-introduced? Root Cause
1 Merge conflict during automerge arch/arm64/boot/dts/qcom/hamoa-iot-evk.dts Yes PR modifies hamoa.dtsi which conflicts with concurrent changes in the integration baseline
2 Merge conflict during automerge arch/arm64/boot/dts/qcom/purwa-iot-evk.dts Yes PR modifies hamoa.dtsi which conflicts with concurrent changes in the integration baseline

Verdict

This is not a compilation failure. The build failed during the automerge step due to 2 merge conflicts introduced by this PR when merging topic branch topic/tech/all/dt/hamoa with the baseline. No compilation was attempted.

📎 Detailed analysis: Full report

@qlijarvis

Copy link
Copy Markdown

PR #1675 — validate-patch

PR: #1675

Verdict Issues Detailed Report
9 Full report

Final Summary

  1. Lore link present: No — FROMLIST: prefix requires a lore.kernel.org link, but none found
  2. Lore link matches PR commits: N/A — no lore link to compare against
  3. Upstream patch status: N/A — appears to be a vendor-only integration fix, not an upstream patch
  4. PR present in qcom-next/topics: Yes - all 1 commit(s) are present in qcom-next or topics
Verdict: ❌ — click to expand

🔍 Patch Validation

PR: #1675 - FROMLIST: arm64: dts: qcom: hamoa: Fix pcie4_port0_ep endpoint stub location
Upstream commit: N/A (no lore link found)
Verdict: ❌ FAIL

Commit Message

Check Status Note
Subject matches upstream N/A No lore link to compare against
Body preserves rationale Clear description of the fix
Fixes tag present/correct ⚠️ References internal commit 2d51788, not an upstream commit
Authorship preserved N/A No upstream source to verify
Backport note (if applicable) N/A Not a backport

Diff

File Status Notes
arch/arm64/boot/dts/qcom/hamoa.dtsi ⚠️ Moves pcie4_port0_ep endpoint stub from pcie5_port0 to pcie4_port0 child node

Issues

Critical: Missing lore.kernel.org link

  • This commit uses the FROMLIST: prefix, which according to the skill documentation requires a lore.kernel.org link in the commit message.
  • The FROMLIST: prefix indicates "Posted to mailing list, not yet merged" and must have a Link: https://lore.kernel.org/... tag.
  • No such link was found in the commit message.

Incorrect prefix usage

  • The commit is fixing an internal tree issue (incorrect patch application context matching) that occurred in commit 2d51788.
  • The commit 2d51788 being fixed is itself a FROMLIST: commit in the internal tree.
  • This fix corrects a local integration error, not an upstream issue.
  • The appropriate prefix should be QCLINUX: (vendor-only fix) rather than FROMLIST: (posted to mailing list).

Fixes tag references internal commit

  • The Fixes tag references 2d5178812b14, which is an internal tree commit SHA.
  • If this were truly a FROMLIST: patch, the Fixes tag should reference an upstream commit SHA or the lore message-ID of the patch being fixed.

Verdict

Do not merge without correction. This commit incorrectly uses the FROMLIST: prefix for what is actually a vendor-only integration fix. The commit should be reworked with the QCLINUX: prefix and the lore link requirement removed, or if it was genuinely posted to a mailing list, a Link: tag pointing to the lore.kernel.org posting must be added.

Final Summary

  1. Lore link present: No — FROMLIST: prefix requires a lore.kernel.org link, but none found
  2. Lore link matches PR commits: N/A — no lore link to compare against
  3. Upstream patch status: N/A — appears to be a vendor-only integration fix, not an upstream patch
  4. PR present in qcom-next/topics: Yes — present in topics branch tech/all/dt/hamoa (per integration_presence_report.md)

Deterministic Integration Presence

Integration Presence Report

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

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

Commit Subject qcom-next topics Final
1/1 [PATCH] FROMLIST: arm64: dts: qcom: hamoa: Fix pcie4_port0_ep partial - subject or partial tree evidence found, but full change was not verified present - all checked added lines are present present

Final Status

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

@qlijarvis

Copy link
Copy Markdown

PR #1675 — checker-log-analyzer

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

Checker Result Summary
Checker Result Summary
checkpatch ⏭️ Skipped - automerge failed before checker could run
dt-binding-check ⏭️ Skipped - automerge failed before checker could run
dtb-check ⏭️ Skipped - automerge failed before checker could run
sparse-check ⏭️ Skipped - automerge failed before checker could run
check-uapi-headers ⏭️ Skipped - automerge failed before checker could run
check-patch-compliance ⏭️ Skipped - automerge failed before checker could run
tag-check PASS - commit subject has valid FROMLIST: prefix
qcom-next-check PASS - commit already present in topics (per integration_presence_report.md)

Detailed report: Full report

Checker analysis — click to expand

🤖 CI Checker Analysis (checker-log-analyzer)

PR: #1675 - FROMLIST: arm64: dts: qcom: hamoa: Fix pcie4_port0_ep endpoint stub location
Source: https://github.com/qualcomm-linux/kernel-config/actions/runs/31567842276

Checker Result Summary
checkpatch ⏭️ Skipped - automerge failed before checker could run
dt-binding-check ⏭️ Skipped - automerge failed before checker could run
dtb-check ⏭️ Skipped - automerge failed before checker could run
sparse-check ⏭️ Skipped - automerge failed before checker could run
check-uapi-headers ⏭️ Skipped - automerge failed before checker could run
check-patch-compliance ⏭️ Skipped - automerge failed before checker could run
tag-check PASS - commit subject has valid FROMLIST: prefix
qcom-next-check PASS - commit already present in topics (per integration_presence_report.md)

⚠️ Automerge Failure (Pre-Checker Infrastructure Issue)

Root cause: The CI workflow failed during the automerge step when attempting to integrate the PR's topic branch (topic/tech/all/dt/hamoa) with the baseline and other topic branches. Merge conflicts occurred before any checker jobs could execute.

Failure details:

Merging topic branches...
------------------------------------------
 ** Merging topic branch: topic/tech/all/dt/hamoa
Auto-merging Documentation/devicetree/bindings/crypto/qcom,inline-crypto-engine.yaml
Auto-merging arch/arm64/boot/dts/qcom/hamoa-iot-evk.dts
CONFLICT (content): Merge conflict in arch/arm64/boot/dts/qcom/hamoa-iot-evk.dts
Auto-merging arch/arm64/boot/dts/qcom/purwa-iot-evk.dts
CONFLICT (content): Merge conflict in arch/arm64/boot/dts/qcom/purwa-iot-evk.dts
Automatic merge failed; fix conflicts and then commit the result.

Conflicting files:

  • arch/arm64/boot/dts/qcom/hamoa-iot-evk.dts
  • arch/arm64/boot/dts/qcom/purwa-iot-evk.dts

Analysis:

This is not a patch quality issue. The PR itself modifies only arch/arm64/boot/dts/qcom/hamoa.dtsi and is a valid fix (moving a misplaced PCIe endpoint stub from pcie5_port0 to the correct pcie4_port0 node).

The automerge failure indicates that:

  1. The topic branch topic/tech/all/dt/hamoa contains additional commits beyond this PR
  2. Those commits conflict with changes in the baseline or other topic branches being integrated
  3. The conflicts are in board-level DTS files (hamoa-iot-evk.dts, purwa-iot-evk.dts), not the SoC DTSI file modified by this PR

Fix:

The topic branch maintainer needs to resolve the merge conflicts in the topic branch itself:

# In the kernel-topics repo
git checkout topic/tech/all/dt/hamoa
git fetch origin qcom-next
git rebase origin/qcom-next

# Resolve conflicts in:
#   arch/arm64/boot/dts/qcom/hamoa-iot-evk.dts
#   arch/arm64/boot/dts/qcom/purwa-iot-evk.dts

git add <resolved-files>
git rebase --continue
git push --force-with-lease origin topic/tech/all/dt/hamoa

Alternatively, if the conflicts are with other topic branches (not qcom-next), the integration team needs to coordinate the merge order or resolve conflicts at integration time.

Reproduce locally:

# Clone kernel-config repo and run automerge
git clone https://github.com/qualcomm-linux/kernel-config
cd kernel-config
# Follow the automerge workflow used by CI (see .github/workflows/)

✅ Patch Quality Checks (Manual Review)

Since the checkers didn't run, I performed manual validation on the PR patch:

checkpatch: ✅ PASS

  • Subject has valid FROMLIST: prefix
  • Commit message is well-formatted
  • Has Fixes: tag referencing the commit that introduced the error
  • Has Signed-off-by: trailer
  • Code change is minimal and focused (10 lines: 5 deletions, 5 additions)

dt-binding-check: ✅ N/A

  • No binding changes in this PR

dtb-check: ✅ Expected to pass

  • The change moves a graph port/endpoint stub to the correct parent node
  • This fixes a structural error (endpoint was in wrong PCIe port)
  • No new DT validation errors expected

sparse-check: ✅ N/A

  • No C/H files changed

check-uapi-headers: ✅ N/A

  • No UAPI changes

check-patch-compliance: ✅ PASS

  • Subject starts with FROMLIST: (valid prefix)
  • Commit has proper structure and trailers

tag-check: ✅ PASS

  • Commit subject starts with FROMLIST: (required prefix for non-qcom-next branches)

Integration presence: ✅ PASS

  • Per integration_presence_report.md: commit is already present in topics
  • Status: present - all checked added lines are present

Verdict

The PR patch itself is correct and ready to merge — it's a valid fix for a misplaced DT endpoint stub.

However, the CI cannot validate it due to automerge conflicts in the topic branch. The topic branch topic/tech/all/dt/hamoa needs to be rebased or have its conflicts resolved before CI can run successfully.

Recommended action:

  1. Topic branch maintainer: resolve the merge conflicts in hamoa-iot-evk.dts and purwa-iot-evk.dts
  2. Force-push the rebased topic branch
  3. Re-trigger CI on this PR (or close and reopen to trigger a fresh run)

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