Revert "FROMLIST: clk: qcom: smd-rpm: Skip proxy votes on clocks for QCM2290"

[imrashai]

Dropping the proxy votes on RPM clock resources is causing BT use-case related issues, hence revert this change until the consumers vote on the respective resources required for their use-cases.

CRs-Fixed: 4682568

[qswat-orbit-external]

Dev Completion validation failed

CR: 4682568
Change Task: kernel.qli.0.0
Error: GenAI Assisted field must be set before moving change tasks to Development Complete. Please provide GenAI information.

The change task for this CR could not be moved to Dev Complete because of the error above. Please resolve the issue in Orbit and re-run the failed Orbit check.

[qlijarvis]

🔨 Build Failure Analysis — PR #1859

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

#	Error	File:Line	PR-introduced?	Root Cause
N/A	Automerge failure (165 merge conflicts)	Multiple files	No	Pre-existing conflicts between baseline qcom-next and topic branch tech/all/shikra

Verdict

Zero compilation errors. The build failed during the automerge step due to 165 pre-existing merge conflicts between the baseline branch and the tech/all/shikra topic branch. The PR changes to drivers/clk/qcom/clk-smd-rpm.c merged cleanly and did not cause any conflicts or compilation errors.

📎 Detailed analysis: Full report

[qlijarvis]

🔨 Build Failure Analysis — PR #1859

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

#	Error	File:Line	PR-introduced?	Root Cause
1	Merge conflict during automerge	Documentation/devicetree/bindings/arm/qcom,coresight-tnoc.yaml	No	Pre-existing merge conflict between topic branches during integration; unrelated to PR changes

Verdict

The build failure is not caused by this PR. The failure occurred during the automerge/integration phase when merging multiple topic branches together, before the PR changes were even tested. The merge conflict in qcom,coresight-tnoc.yaml is unrelated to the PR's changes to drivers/clk/qcom/clk-smd-rpm.c.

📎 Detailed analysis: Full report

[qlijarvis]

PR #1859 — validate-patch

PR: #1859

Verdict	Issues	Detailed Report
⚠️	1	Full report

Final Summary

1. Lore link present: No — Revert commit without reference to original FROMLIST patch's lore link
2. Lore link matches PR commits: N/A — no lore link to compare against (revert commits don't have upstream equivalents)
3. Upstream patch status: N/A — Revert is a local decision; the original FROMLIST patch may still be under review upstream
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: #1859 - Revert "FROMLIST: clk: qcom: smd-rpm: Skip proxy votes on clocks for QCM2290"
Upstream commit: N/A (Revert commit - no lore link to original FROMLIST patch)
Verdict: ⚠️ PARTIAL

Commit Message

Check	Status	Note
Subject matches upstream	N/A	Revert commit - no upstream equivalent
Body preserves rationale	✅	Clear rationale: "Dropping the proxy votes on RPM clock resources is causing BT use-case related issues"
Fixes tag present/correct	N/A	Not applicable for revert commits
Authorship preserved	✅	Author is the person performing the revert (correct for revert commits)
Backport note (if applicable)	N/A	Not a backport

Diff

File	Status	Notes
drivers/clk/qcom/clk-smd-rpm.c	✅	Revert diff correctly removes the skip_clks_handoff field and restores handoff logic for all platforms

Issues

• Missing lore link to original patch: The commit being reverted (5ed31c2650950dc0d15bacf1c4f6d37d3ef95e54) was a FROMLIST: patch, which should have had a lore.kernel.org link. For completeness, the revert commit message should reference the original lore link to provide full context for reviewers. This is a minor documentation issue, not a functional problem.

Verdict

Acceptable to merge with minor documentation gap. The revert is technically correct and addresses a real issue (BT use-case failures). The commit message clearly explains why the revert is needed. However, adding a reference to the original lore link would improve traceability.

Final Summary

1. Lore link present: No — Revert commit without reference to original FROMLIST patch's lore link
2. Lore link matches PR commits: N/A — no lore link to compare against (revert commits don't have upstream equivalents)
3. Upstream patch status: N/A — Revert is a local decision; the original FROMLIST patch may still be under review upstream
4. PR present in qcom-next/topics: Yes — commit is 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: d49c33864d06e9672dce57738be8851384578fcf
topics remote: topics -> https://github.com/qualcomm-linux/kernel-topics
topics fetch: fetched

Commit	Subject	qcom-next	topics	Final
1/1	[PATCH] Revert "FROMLIST: clk: qcom: smd-rpm: Skip proxy votes on	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 #1859 — checker-log-analyzer

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

Checker	Result	Summary
Checker	Result	Summary
checkpatch	❌	Merge conflict during automerge
dt-binding-check	❌	Merge conflict during automerge
dtb-check	❌	Merge conflict during automerge
sparse-check	❌	Merge conflict during automerge
check-uapi-headers	❌	Merge conflict during automerge
check-patch-compliance	❌	Merge conflict during automerge
tag-check	❌	Subject prefix missing before "Revert"

Detailed report: Full report

Checker analysis — click to expand

🤖 CI Checker Analysis (checker-log-analyzer)

PR: #1859 - Revert "FROMLIST: clk: qcom: smd-rpm: Skip proxy votes on clocks for QCM2290"
Source: https://github.com/qualcomm-linux/kernel-config/actions/runs/35421958197

Checker	Result	Summary
checkpatch	❌	Merge conflict during automerge
dt-binding-check	❌	Merge conflict during automerge
dtb-check	❌	Merge conflict during automerge
sparse-check	❌	Merge conflict during automerge
check-uapi-headers	❌	Merge conflict during automerge
check-patch-compliance	❌	Merge conflict during automerge
tag-check	❌	Subject prefix missing before "Revert"

---

❌ All Checkers — Merge Conflict

Root cause: Automerge failed due to a merge conflict in Documentation/devicetree/bindings/arm/qcom,coresight-tnoc.yaml, preventing all checkers from running.

Failure details:

Normal merge conflict for 'Documentation/devicetree/bindings/arm/qcom,coresight-tnoc.yaml':
  {local}: modified file
  {remote}: modified file
automerge returned non-zero; check logs for conflicts
##[error]Process completed with exit code 1.

Fix: Resolve the merge conflict in Documentation/devicetree/bindings/arm/qcom,coresight-tnoc.yaml

Steps to resolve:

# In your local kernel tree
git fetch origin
git checkout <PR-branch>
git merge <target-branch>

# Resolve conflicts in Documentation/devicetree/bindings/arm/qcom,coresight-tnoc.yaml
# Edit the file to resolve conflict markers (<<<<<<, ======, >>>>>>)

git add Documentation/devicetree/bindings/arm/qcom,coresight-tnoc.yaml
git commit
git push

Note: This PR only modifies drivers/clk/qcom/clk-smd-rpm.c, so the conflict is coming from changes in the target branch that also touched the coresight-tnoc binding file. The conflict must be resolved before any checkers can run.

---

❌ tag-check — Subject Prefix Missing

Root cause: Revert commit subject line does not start with a required prefix before "Revert".

Failure details:

Subject: [PATCH] Revert "FROMLIST: clk: qcom: smd-rpm: Skip proxy votes on
 clocks for QCM2290"

The subject line starts with Revert but lacks a prefix tag (FROMLIST:, FROMGIT:, UPSTREAM:, BACKPORT:, etc.) before it.

Fix: Add an appropriate prefix before "Revert"

According to the skill reference (Section 11 of log-patterns.md), revert commits must carry a prefix before the word "Revert". The correct format should be:

git commit --amend -m "UPSTREAM: Revert \"FROMLIST: clk: qcom: smd-rpm: Skip proxy votes on clocks for QCM2290\""

Or if the revert itself is being posted to the mailing list:

git commit --amend -m "FROMLIST: Revert \"FROMLIST: clk: qcom: smd-rpm: Skip proxy votes on clocks for QCM2290\""

Choose the correct prefix based on:

• If this revert is merged upstream → UPSTREAM:
• If this revert is posted to lore but not merged → FROMLIST:
• If this revert is in a maintainer tree → FROMGIT:
• If this is a vendor-only revert → QCLINUX: (note: will fail check-patch-compliance)

Note: This check applies to all branches except qcom-next and qcom-next-staging. If the target branch is one of those two, this check can be skipped.

---

Verdict

2 blockers must be fixed before merge:

1. Merge conflict — Resolve the conflict in Documentation/devicetree/bindings/arm/qcom,coresight-tnoc.yaml to allow checkers to run
2. Subject prefix — Add a prefix tag before "Revert" in the commit subject (unless target branch is qcom-next or qcom-next-staging)

After resolving the merge conflict and updating the subject prefix, re-trigger CI to get actual checker results for the code changes.