arm64: dts: shikra: optimize PCIe bandwidth voting and power requirements for Gen1/Gen2 x1 links

[abhi6246-OSS]

Update the PCIe device tree configuration to reduce power requirements and align interconnect bandwidth voting tags with the latest RPMh-based definitions.

Replace legacy interconnect tags:

QCOM_ICC_TAG_ALWAYS → RPM_ALWAYS_TAG
QCOM_ICC_TAG_ACTIVE_ONLY → RPM_ACTIVE_TAG

Reduce PCIe power-domain requirements for Gen1 and Gen2 x1 operating points:

Change required-opps from rpmpd_opp_nom to rpmpd_opp_low_svs
Applied to:
opp-2500000 (Gen1 x1)
opp-5000000 (Gen2 x1)

CRs-Fixed: 4686624

[qswat-orbit-external]

Merge Check Failed: No CR Numbers Found

Error: No Change Request numbers were found.

Please add Change Request numbers to your pull request description in the format CRs-Fixed: 12345 or link GitHub issues that are associated with Change Requests.

[qswat-orbit-external]

Merge Check Failed: No CR Numbers Found

Error: No Change Request numbers were found.

Please add Change Request numbers to your pull request description in the format CRs-Fixed: 12345 or link GitHub issues that are associated with Change Requests.

[qswat-orbit-external]

Merge Check Failed: No CR Numbers Found

Error: No Change Request numbers were found.

Please add Change Request numbers to your pull request description in the format CRs-Fixed: 12345 or link GitHub issues that are associated with Change Requests.

[qswat-orbit-external]

Merge Check Failed: No Change Task Found

No associated change tasks found for CR 4686624 on any of the following entities:

Entities:

• kernel.qli.2.0

CR: 4686624

Please ensure the CR has a change task associated with at least one of the entities for this branch.

[qlijarvis]

PR #1231 — validate-patch

PR: #1231

Verdict	Issues	Detailed Report
❌	17	Full report

Final Summary

1. Lore link present: Yes — https://lore.kernel.org/all/20260831-shikra-upstream-v2-5-406661d75afa@oss.qualcomm.com/
2. Lore link matches PR commits: No — PR contains only 7.5% of lore patch content (12 of 159 lines); omits all PCIe controller and PHY nodes; subject mismatch; author mismatch; missing original author's Signed-off-by
3. Upstream patch status: ⏳ Decision Pending — posted Aug 31, 2026 as v2; under active review with comments from Konrad Dybcio (Sep 2) and Krzysztof Kozlowski (Sep 21); no formal Acked-by/Reviewed-by or merge confirmation yet
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: #1231 - FROMLIST: arm64: dts: qcom: shikra: Replacing legacy ICC tags with RPMh tags
Upstream commit: https://lore.kernel.org/all/20260831-shikra-upstream-v2-5-406661d75afa@oss.qualcomm.com/
Verdict: ❌ FAIL

Commit Message

Check	Status	Note
Subject matches upstream	❌	PR: "Replacing legacy ICC tags" vs Lore: "Add PCIe PHY and controller nodes" — completely different scope
Body preserves rationale	⚠️	PR describes ICC tag changes; lore describes full PCIe enablement — partial match only
Fixes tag present/correct	N/A	No Fixes tag in either commit
Authorship preserved	❌	CRITICAL: PR author is Abhishek Kumar <kumarab@qti.qualcomm.com> but lore author is Sushrut Shree Trivedi <sushrut.trivedi@oss.qualcomm.com>. For FROMLIST: commits, the original lore author's Signed-off-by MUST be present. PR is missing: Signed-off-by: Sushrut Shree Trivedi <sushrut.trivedi@oss.qualcomm.com>
Backport note (if applicable)	N/A	Not a backport; FROMLIST: prefix used

Diff

File	Status	Notes
arch/arm64/boot/dts/qcom/shikra.dtsi	❌	CRITICAL: PR contains only 12 lines (ICC tag changes) from a 159-line lore patch. Lore patch adds complete PCIe controller and PHY nodes (158 lines) which are entirely omitted from PR. This is NOT a faithful FROMLIST: backport — it cherry-picks a minor fix from a major feature patch.

Issues

1. Author Mismatch (FROMLIST: violation)

• PR From: field: Abhishek Kumar <kumarab@qti.qualcomm.com>
• Lore From: field: Sushrut Shree Trivedi <sushrut.trivedi@oss.qualcomm.com>
• PR Signed-off-by: contains only Abhishek Kumar
• Missing: Signed-off-by: Sushrut Shree Trivedi <sushrut.trivedi@oss.qualcomm.com>
• Per FROMLIST: rules: The original lore author's Signed-off-by MUST be present. The submitter (Abhishek) can be in From: but Sushrut's SoB is mandatory.

2. Subject Mismatch

• PR subject: "Replacing legacy ICC tags with RPMh tags"
• Lore subject: "Add PCIe PHY and controller nodes"
• These describe completely different scopes. The PR subject focuses on a minor detail while the lore patch is a major PCIe enablement feature.

3. Incomplete Backport

• Lore patch: 159 lines changed (158 insertions, 1 deletion)
  • Adds pcie: pcie@45e8000 node (95 lines)
  • Adds pcie_phy: phy@45ee000 node (25 lines)
  • Adds pcie_opp_table (14 lines)
  • Updates GCC clock reference (1 line)
  • Also includes ICC tag changes (12 lines)
• PR patch: 12 lines changed (6 insertions, 6 deletions)
  • Only the ICC tag changes
  • Omits all PCIe controller and PHY nodes
• The PR cherry-picks 7.5% of the lore patch content and discards the remaining 92.5%.

4. Misleading FROMLIST: Prefix

• FROMLIST: implies the full lore patch is being applied
• This is actually a partial cherry-pick of a small subset from a larger feature patch
• The main content (PCIe nodes) is missing entirely

5. Missing Dependencies

• Lore patch is part of a 5-patch series:
  1. dt-bindings: phy (Shikra PCIe phy)
  2. dt-bindings: PCI (Shikra PCIe controller)
  3. PCI: qcom driver support
  4. phy: qcom: qmp-pcie driver support
  5. arm64: dts: Add PCIe nodes ← This patch (PR only includes 7.5% of it)
• PR does not include patches 1-4
• The ICC tag changes modify properties of PCIe nodes that don't exist in the PR

Verdict

REJECT — This PR cannot be merged as-is due to multiple critical violations:

1. Missing original author attribution: Sushrut Shree Trivedi's Signed-off-by: is absent, violating FROMLIST: authorship requirements.

2. Incomplete and misleading backport: The PR cherry-picks only 12 lines (ICC tag changes) from a 159-line patch that adds complete PCIe support. Using FROMLIST: for a 7.5% subset is incorrect and misleading.

3. Subject does not match upstream intent: The lore patch is about "Add PCIe PHY and controller nodes" (major feature), not "Replacing legacy ICC tags" (minor detail).

4. Orphaned changes: The ICC tag changes modify properties of PCIe nodes (pcie_opp_table) that are added by the same lore patch but omitted from this PR. Without the PCIe nodes, these changes have no context.

Recommended Fix:

Option A (Preferred): Apply the full lore patch 5/5 with proper attribution:

From: Sushrut Shree Trivedi <sushrut.trivedi@oss.qualcomm.com>
Subject: FROMLIST: arm64: dts: qcom: shikra: Add PCIe PHY and controller nodes

[Full commit message from lore]

Link: https://lore.kernel.org/all/20260831-shikra-upstream-v2-5-406661d75afa@oss.qualcomm.com/
Signed-off-by: Sushrut Shree Trivedi <sushrut.trivedi@oss.qualcomm.com>
[Abhishek can add his SoB if he tested/modified it]

Option B: If only ICC tag changes are needed independently:

• Use QCLINUX: prefix (vendor-only change, not from lore)
• Write a new commit message explaining why only this subset is needed
• Do NOT use FROMLIST: prefix
• Ensure the PCIe nodes exist in the tree before applying these changes

Final Summary

1. Lore link present: Yes — https://lore.kernel.org/all/20260831-shikra-upstream-v2-5-406661d75afa@oss.qualcomm.com/
2. Lore link matches PR commits: No — PR contains only 7.5% of lore patch content (12 of 159 lines); omits all PCIe controller and PHY nodes; subject mismatch; author mismatch; missing original author's Signed-off-by
3. Upstream patch status: ⏳ Decision Pending — posted Aug 31, 2026 as v2; under active review with comments from Konrad Dybcio (Sep 2) and Krzysztof Kozlowski (Sep 21); no formal Acked-by/Reviewed-by or merge confirmation yet
4. PR present in qcom-next/topics: Yes — all checked added lines are present in qcom-next (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: ba86f67908354f41f269ca1d64b22e4624766dcf
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: shikra: Replacing legacy ICC tags	present - all checked added lines are present	skipped - not checked because qcom-next already contains the change	present

Final Status

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

[qlijarvis]

PR #1231 — checker-log-analyzer

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

Checker	Result	Summary
Checker	Result	Summary
checkpatch	❌	1 error, 1 warning: missing Signed-off-by, missing commit description
dt-binding-check	⏭️	No binding changes
dtb-check	✅	Passed
sparse-check	⏭️	No C/H changes
check-uapi-headers	⏭️	No UAPI changes
check-patch-compliance	❌	Missing required prefix
tag-check	❌	Subject prefix missing (mandatory for qcom-6.18.y)

Detailed report: Full report

Checker analysis — click to expand

🤖 CI Checker Analysis (checker-log-analyzer)

PR: #1231 - FROMLIST: arm64: dts: qcom: shikra: Replacing legacy ICC tags with RPMh tags
Source: https://github.com/qualcomm-linux/kernel-config/actions/runs/36981219677
Target branch: qcom-6.18.y

Checker	Result	Summary
checkpatch	❌	1 error, 1 warning: missing Signed-off-by, missing commit description
dt-binding-check	⏭️	No binding changes
dtb-check	✅	Passed
sparse-check	⏭️	No C/H changes
check-uapi-headers	⏭️	No UAPI changes
check-patch-compliance	❌	Missing required prefix
tag-check	❌	Subject prefix missing (mandatory for qcom-6.18.y)

---

❌ checkpatch

Root cause: Commit 2d232a6f6390 ("shikra upadted tag value in dts") is missing the required Signed-off-by: trailer and has an inadequate commit description.

Failure details:

WARNING: Missing commit description - Add an appropriate one

ERROR: Missing Signed-off-by: line(s)

2d232a6f6390d65a20516c6dd8e02906692240bd total: 1 errors, 1 warnings, 0 checks, 30 lines checked

Commit 2d232a6f6390 ("shikra upadted tag value in dts") has style problems, please review.

Fix:

1. Add Signed-off-by: trailer — Every kernel commit must be signed off by the author:

   git rebase -i b5a6060def8769d3fe1818c10062c08c80167958
   # mark commit 2d232a6f6390 as 'edit'
   git commit --amend --signoff --no-edit
   git rebase --continue

2. Add a proper commit description — The commit body is empty. Add a multi-line description explaining what the change does and why:

   git rebase -i b5a6060def8769d3fe1818c10062c08c80167958
   # mark commit 2d232a6f6390 as 'edit'
   git commit --amend
   # In the editor, add a commit body between the subject and Signed-off-by

   Example commit body:

   The PCIe device tree currently uses legacy interconnect bandwidth
   voting tags and nominal power-domain operating points for low-speed
   PCIe links.
   
   Replace QCOM_ICC_TAG_ALWAYS and QCOM_ICC_TAG_ACTIVE_ONLY with
   RPM_ALWAYS_TAG and RPM_ACTIVE_TAG respectively. Also reduce the
   required-opps from rpmpd_opp_nom to rpmpd_opp_low_svs for the
   Gen1 x1 and Gen2 x1 operating points.
   
   This aligns the PCIe configuration with the latest RPMh-based
   definitions and reduces power requirements for lower PCIe link
   speeds.
   

Reproduce locally:

./scripts/checkpatch.pl --strict --summary-file --ignore FILE_PATH_CHANGES --git b5a6060def8769d3fe1818c10062c08c80167958..896bebcc9467a6f51259348bbcc272bf51c13181

---

❌ check-patch-compliance

Root cause: Commit subject "shikra upadted tag value in dts" does not start with a required prefix (FROMLIST:, FROMGIT:, UPSTREAM:, or BACKPORT:).

Failure details:

Checking commit: shikra upadted tag value in dts
Commit summary does not start with a required prefix

Fix:

The commit subject must start with one of the allowed prefixes. Based on the patch file (pr.patch), the correct subject should be:

FROMLIST: arm64: dts: qcom: shikra: Replacing legacy ICC tags with RPMh tags.

The commit currently has subject "shikra upadted tag value in dts" (note the typo "upadted"), which is missing the FROMLIST: prefix and is completely different from the intended subject.

Action:

git rebase -i b5a6060def8769d3fe1818c10062c08c80167958
# mark commit 2d232a6f6390 as 'edit'
git commit --amend -m "FROMLIST: arm64: dts: qcom: shikra: Replacing legacy ICC tags with RPMh tags."
# Add the full commit body and Link: trailer
git rebase --continue

The full commit message should match the one in pr.patch:

• Subject: FROMLIST: arm64: dts: qcom: shikra: Replacing legacy ICC tags with RPMh tags.
• Body: Multi-paragraph description of the change
• Link: Link: https://lore.kernel.org/all/20260831-shikra-upstream-v2-5-406661d75afa@oss.qualcomm.com/
• Signed-off-by: Signed-off-by: Abhishek Kumar <abhishek.kumar@oss.qualcomm.com>

---

❌ tag-check

Root cause: The PR targets branch qcom-6.18.y, which is not qcom-next or qcom-next-staging. Therefore, every commit must start with a valid subject prefix. The commit subject "shikra upadted tag value in dts" is missing the required prefix.

Failure details:

Commit 2d232a6f6390 ("shikra upadted tag value in dts"): subject line does not start with a required prefix.

All branches except qcom-next and qcom-next-staging require one of:

• FROMLIST: / FROMGIT: / UPSTREAM: / BACKPORT: / QCLINUX: / PENDING: / WORKAROUND:

Fix:

Same as the check-patch-compliance fix above — add the FROMLIST: prefix to the subject:

git rebase -i b5a6060def8769d3fe1818c10062c08c80167958
# mark commit 2d232a6f6390 as 'edit'
git commit --amend -m "FROMLIST: arm64: dts: qcom: shikra: Replacing legacy ICC tags with RPMh tags."
# Add the full commit body, Link:, and Signed-off-by:
git rebase --continue

Reproduce locally:

git log b5a6060def8769d3fe1818c10062c08c80167958..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 in commit $sha: $subject"
  fi
done

---

Verdict

3 blockers must be fixed before merge:

1. Add Signed-off-by: trailer to commit 2d232a6f6390
2. Add a proper commit description (multi-line body explaining the change)
3. Fix the commit subject to match the intended subject with FROMLIST: prefix:
   • Current: shikra upadted tag value in dts (typo + missing prefix)
   • Correct: FROMLIST: arm64: dts: qcom: shikra: Replacing legacy ICC tags with RPMh tags.

Root cause: The commit message in the PR branch does not match the patch file (pr.patch). The patch file has the correct subject (FROMLIST: arm64: dts: qcom: shikra: Replacing legacy ICC tags with RPMh tags.), full commit body, Link: trailer, and Signed-off-by: trailer, but the actual commit in the branch has a malformed subject ("shikra upadted tag value in dts"), no body, and no Signed-off-by:.

Recommended action: Amend the commit to match the patch file exactly, ensuring the subject starts with FROMLIST:, includes the full commit body, adds the Link: trailer, and includes the Signed-off-by: trailer.

[qswat-orbit-external]

Merge Check Failed: CR Not Eligible for Merge

CR 4686624 is not eligible for merge.

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

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

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

[qlijarvis]

PR #1231 — validate-patch

PR: #1231

Verdict	Issues	Detailed Report
❌	9	Full report

Final Summary

1. Lore link present: Yes — https://lore.kernel.org/all/20260831-shikra-upstream-v2-5-406661d75afa@oss.qualcomm.com/
2. Lore link matches PR commits: No — lore patch adds 158 lines of new PCIe nodes; PR patch modifies 12 lines of ICC tags and OPP levels in existing nodes. Content is completely different.
3. Upstream patch status: ⏳ Decision Pending — lore thread shows active review with questions about OPP levels (Konrad Dybcio, Sep 2); no merge confirmation found. The PR's changes (OPP level reduction) were discussed as a response to review feedback, suggesting this may be intended for a v3 revision.
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: #1231 - "FROMLIST: arm64: dts: qcom: shikra: Replacing legacy ICC tags with RPMh tags."
Upstream commit: https://lore.kernel.org/all/20260831-shikra-upstream-v2-5-406661d75afa@oss.qualcomm.com/
Verdict: ❌ FAIL

Commit Message

Check	Status	Note
Subject matches upstream	❌	Lore: "Add PCIe PHY and controller nodes" vs PR: "Replacing legacy ICC tags with RPMh tags" — completely different
Body preserves rationale	❌	Lore describes adding PCIe support; PR describes changing ICC tags — unrelated changes
Fixes tag present/correct	N/A	Neither patch has Fixes tag
Authorship preserved	✅	From: matches lore author (Sushrut Shree Trivedi) — correct for FROMLIST:
Backport note (if applicable)	N/A	Not a backport

Diff

File	Status	Notes
arch/arm64/boot/dts/qcom/shikra.dtsi	❌	Content mismatch: Lore adds 158 lines (PCIe controller + PHY nodes); PR modifies 12 lines (ICC tags + OPP levels). These are completely different changes.

Issues

Critical: Wrong lore patch linked

The PR links to patch 5/5 of the "Add PCIe support for Shikra SoC" series, which adds the PCIe controller and PHY device tree nodes (158 new lines). However, the PR's actual diff only changes interconnect tags and OPP levels in an existing PCIe node (12 modified lines).

Evidence from lore patch 5/5:

• Subject: [PATCH v2 5/5] arm64: dts: qcom: shikra: Add PCIe PHY and controller nodes
• Adds new pcie@45e8000 controller node (lines 1001-1160)
• Adds new pcie_phy@45ee000 PHY node (lines 1162-1195)
• Total: +158 lines, -1 line

Evidence from PR patch:

• Subject: FROMLIST: arm64: dts: qcom: shikra: Replacing legacy ICC tags with RPMh tags.
• Changes QCOM_ICC_TAG_ALWAYS → RPM_ALWAYS_TAG (4 lines)
• Changes QCOM_ICC_TAG_ACTIVE_ONLY → RPM_ACTIVE_TAG (2 lines)
• Changes rpmpd_opp_nom → rpmpd_opp_low_svs (2 lines)
• Total: 6 insertions, 6 deletions in existing PCIe node

Additional evidence from lore thread:

The lore thread contains a reply from Konrad Dybcio (Sep 2, 2026) questioning the OPP level change from rpmpd_opp_nom to rpmpd_opp_low_svs, with Sushrut confirming "Gen2 can be supported with low svs corner as per HW team." This confirms the OPP change was discussed in response to the original patch 5/5, not as part of it.

Root cause:

The PR appears to contain a follow-up change that was discussed in review of the lore series, but incorrectly links to the original patch 5/5 instead of a revised version or separate patch.

Verdict

❌ FAIL — Do not merge

The PR's Link: tag points to a lore patch with completely different content. The PR cannot be validated against this link because:

1. The lore patch adds new PCIe nodes; the PR modifies existing nodes
2. The changes are semantically unrelated (new hardware enablement vs. tag/OPP updates)
3. The PR's changes appear to be a follow-up refinement discussed in review, not the original patch

Required action:

1. If this PR represents a revised version of patch 5/5 incorporating review feedback, update the Link: to point to the correct lore message-ID (likely a v3 or later revision)
2. If this is a separate follow-up patch, it should have its own lore posting and Link: tag
3. Update the commit message to accurately describe what the patch does (ICC tag + OPP changes, not "Add PCIe PHY and controller nodes")

Final Summary

1. Lore link present: Yes — https://lore.kernel.org/all/20260831-shikra-upstream-v2-5-406661d75afa@oss.qualcomm.com/
2. Lore link matches PR commits: No — lore patch adds 158 lines of new PCIe nodes; PR patch modifies 12 lines of ICC tags and OPP levels in existing nodes. Content is completely different.
3. Upstream patch status: ⏳ Decision Pending — lore thread shows active review with questions about OPP levels (Konrad Dybcio, Sep 2); no merge confirmation found. The PR's changes (OPP level reduction) were discussed as a response to review feedback, suggesting this may be intended for a v3 revision.
4. PR present in qcom-next/topics: Yes — integration_presence_report.md confirms all checked added lines are present in qcom-next (commit 1a0586064ee1). However, this presence check validates only that the lines added by the PR exist in qcom-next, not that they match the linked lore patch.

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: 1a0586064ee1fbcefe49b6382ee17a236c590879
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: shikra: Replacing legacy ICC tags	present - all checked added lines are present	skipped - not checked because qcom-next already contains the change	present

Final Status

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

[qlijarvis]

PR #1231 — checker-log-analyzer

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

Checker	Result	Summary
Checker	Result	Summary
checkpatch	✅	No style issues
dt-binding-check	⏭️	Skipped (no binding changes)
dtb-check	✅	Test passed
sparse-check	⏭️	Skipped (no C/H changes)
check-uapi-headers	⏭️	Skipped (no UAPI changes)
check-patch-compliance	❌	Content mismatch with upstream link
tag-check	✅	Subject has valid FROMLIST: prefix

Detailed report: Full report

Checker analysis — click to expand

🤖 CI Checker Analysis (checker-log-analyzer)

PR: #1231 - FROMLIST: arm64: dts: qcom: shikra: Replacing legacy ICC tags with RPMh tags
Target branch: qcom-6.18.y
Source: https://github.com/qualcomm-linux/kernel-config/actions/runs/38729558230

Checker	Result	Summary
checkpatch	✅	No style issues
dt-binding-check	⏭️	Skipped (no binding changes)
dtb-check	✅	Test passed
sparse-check	⏭️	Skipped (no C/H changes)
check-uapi-headers	⏭️	Skipped (no UAPI changes)
check-patch-compliance	❌	Content mismatch with upstream link
tag-check	✅	Subject has valid FROMLIST: prefix

---

❌ check-patch-compliance

Root cause: The patch content in the PR differs from the upstream patch referenced in the Link: tag.

Failure details:

Checking commit: FROMLIST: arm64: dts: qcom: shikra: Replacing legacy ICC tags with RPMh tags.
Change is different from the one mentioned in Link

Analysis:

The commit references this upstream link:

Link: https://lore.kernel.org/all/20260831-shikra-upstream-v2-5-406661d75afa@oss.qualcomm.com/

The check-patch-compliance checker fetched the upstream patch using b4 and detected differences between the PR patch and the upstream version. This typically occurs when:

1. Context-only differences — Line numbers shifted but actual changes are identical (false positive)
2. Legitimate adaptations — Backport required modifications for the target kernel version
3. Missing/extra hunks — Incomplete backport or additional changes not in upstream
4. Wrong version — Link points to a different patch version (v1 vs v2, etc.)

Fix:

To diagnose the exact difference:

# Fetch the upstream patch
b4 am --single-message -C -l -3 https://lore.kernel.org/all/20260831-shikra-upstream-v2-5-406661d75afa@oss.qualcomm.com/ -o /tmp/upstream

# Compare the actual code changes (ignoring context)
git format-patch -1 87f7d9d7a3a6b3899356d392648ee40040540474 --stdout | \
  awk '/^diff/,/^--$/' | grep -E '^[+-][^+-]' > /tmp/pr-changes.txt

awk '/^diff/,/^--$/' /tmp/upstream/*.mbx | \
  grep -E '^[+-][^+-]' > /tmp/upstream-changes.txt

diff /tmp/pr-changes.txt /tmp/upstream-changes.txt

Then choose the appropriate action:

• If differences are context-only (line numbers shifted): This is a false positive. Document the context shift in the PR description and note that the functional changes are identical.

• If legitimate adaptations exist (e.g., different base file structure): Add a note to the commit message explaining the adaptation:

  [ Upstream commit adapted for qcom-6.18.y: <explanation> ]
  

• If missing hunks: Add the missing changes from upstream.

• If extra hunks: Either remove them or attribute them separately in a follow-up commit.

• If wrong version: Update the Link: tag to point to the correct patch version.

Reproduce locally:

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

# Run the compliance check
../kernel-checkers/check-patch-compliance.sh \
  --kernel-src . \
  --base c38d121d0c6c7f77298bf9028161b14a9793f2bf \
  --head 87f7d9d7a3a6b3899356d392648ee40040540474

---

Verdict

1 blocker to fix before merge: The check-patch-compliance content mismatch must be resolved. Investigate the difference between the PR patch and the upstream link, then either:

• Document legitimate adaptations in the commit message
• Fix missing/extra hunks
• Update the Link tag if pointing to wrong version
• Note if it's a false positive due to context-only differences

All other checkers passed or skipped appropriately.

[qswat-orbit-external]

Merge Check Failed: CR Not Eligible for Merge

CR 4686624 is not eligible for merge.

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

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

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