Skip to content

Glymur ufs clk - #1837

Open
kona-jagadeesh wants to merge 2 commits into
qualcomm-linux:tech/bsp/clkfrom
kona-jagadeesh:glymur-ufs-clk
Open

kona-jagadeesh wants to merge 2 commits into
qualcomm-linux:tech/bsp/clkfrom
kona-jagadeesh:glymur-ufs-clk

Conversation

@kona-jagadeesh

Copy link
Copy Markdown

This series adds support for rpmh LNBB clocks and update the clocks
ops of UFS muxes on Qualcomm Glymur platform.

Add support for rpmh LN_BB_CLK2 and LN_BB_CLK3 clocks on Qualcomm Glymur
platform.

Fixes: ebcb9db ("clk: qcom: rpmh: Add support for Glymur rpmh clocks")
Link: https://lore.kernel.org/all/20260915-glymur-ufs-clk-changes-v2-1-d0aa1c60c269@oss.qualcomm.com/
Signed-off-by: Jagadeesh Kona <jagadeesh.kona@oss.qualcomm.com>
…FS muxes

Use clk_regmap_phy_mux_ops for GCC UFS muxes so these muxes are
automatically switched to UFS external symbol clocks during enable and
safely parked at XO clk during disable.

Fixes: efe5043 ("clk: qcom: gcc: Add support for Global Clock Controller")
Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
Reviewed-by: Abel Vesa <abel.vesa@oss.qualcomm.com>
Link: https://lore.kernel.org/all/20260915-glymur-ufs-clk-changes-v2-2-d0aa1c60c269@oss.qualcomm.com/
Signed-off-by: Jagadeesh Kona <jagadeesh.kona@oss.qualcomm.com>
@qcomlnxci
qcomlnxci requested review from a team, Mike Tipton (mdtipton) and Taniya Das (taniyadas20) and removed request for a team September 15, 2026 13:36
@qlijarvis

Copy link
Copy Markdown

🔨 Build Failure Analysis — PR #1837

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

# Error File:Line PR-introduced? Root Cause
N/A Automerge failure Multiple files No Build failed during automerge step with merge conflicts in 30+ files when integrating topic branches. No compilation errors occurred.

Verdict

This PR does not introduce any compilation errors. The build failed during the pre-compilation automerge/integration phase due to merge conflicts between topic branches, not due to issues with the PR code itself.

📎 Detailed analysis: Full report

@qlijarvis

Copy link
Copy Markdown

🔨 Build Failure Analysis — PR #1837

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

# Error File:Line PR-introduced? Root Cause
N/A Automerge failure Multiple files No Pre-existing merge conflicts in integration branch

Verdict

This PR does not introduce any build errors. The build failed during the automerge step due to 144 pre-existing merge conflicts in files unrelated to this PR's changes.

📎 Detailed analysis: Full report

@qlijarvis

Copy link
Copy Markdown

PR #1837 — validate-patch

PR: #1837

Verdict Issues Detailed Report
0 Full report

Final Summary

  1. Lore link present: Yes — both patches have correct lore.kernel.org v2 links
  2. Lore link matches PR commits: Yes — diff content is identical to lore v2 patches for both commits
  3. Upstream patch status: ⏳ Decision Pending — both patches posted Sep 15, 2026 (v2) with positive review signals but no maintainer merge confirmation yet
  4. PR present in qcom-next/topics: Fail - 1/2 commit(s) are missing from both qcom-next and topics
Verdict: ✅ — click to expand

🔍 Patch Validation

PR: kernel-topics#1837 - clk: qcom: glymur: Add rpmh LNBB clks support and update UFS mux ops
Upstream commits:


Commit Message Analysis

Patch 1/2: FROMLIST: clk: qcom: rpmhcc: Add LNBB clocks support for Glymur

Check Status Note
Subject matches upstream Subject correctly adapted with FROMLIST: prefix
Body preserves rationale Body text identical to lore patch
Fixes tag present/correct Fixes: ebcb9db98bda matches lore exactly
Authorship preserved From: Jagadeesh Kona <jagadeesh.kona@oss.qualcomm.com> matches lore author
Backport note (if applicable) N/A Not a backport — FROMLIST: prefix indicates pending upstream patch
Link tag Correct lore link present

Patch 2/2: FROMLIST: clk: qcom: gcc-glymur: Use clk_regmap_phy_mux_ops for GCC UFS muxes

Check Status Note
Subject matches upstream Subject correctly adapted with FROMLIST: prefix
Body preserves rationale Body text identical to lore patch
Fixes tag present/correct Fixes: efe504300a17 matches lore exactly
Authorship preserved From: Jagadeesh Kona <jagadeesh.kona@oss.qualcomm.com> matches lore author
Backport note (if applicable) N/A Not a backport — FROMLIST: prefix indicates pending upstream patch
Review tags Both Reviewed-by: Konrad Dybcio and Reviewed-by: Abel Vesa present and match lore
Link tag Correct lore link present

Diff Comparison

Patch 1/2: drivers/clk/qcom/clk-rpmh.c

File Status Notes
drivers/clk/qcom/clk-rpmh.c All 5 added lines match lore patch exactly (1 DEFINE_CLK_RPMH_VRM + 4 array entries)

Diff fingerprint: Identical. All hunks match line-for-line.

Patch 2/2: drivers/clk/qcom/gcc-glymur.c

File Status Notes
drivers/clk/qcom/gcc-glymur.c All changes match lore patch: 30 deleted lines (parent maps/data) + 18 modified lines (mux type/ops changes)

Diff fingerprint: Identical. Structural refactor from clk_regmap_mux to clk_regmap_phy_mux matches lore exactly.


Upstream Patch Status

Commit Community Verdict
Patch 1/2: clk: qcom: rpmhcc: Add LNBB clocks support for Glymur Decision Pending — Posted Sep 15, 2026 (v2). No merge/NAK signals found in lore thread. Received review comments from Konrad Dybcio and Taniya Das but no explicit ACK/applied confirmation.
Patch 2/2: clk: qcom: gcc-glymur: Use clk_regmap_phy_mux_ops for GCC UFS muxes Decision Pending — Posted Sep 15, 2026 (v2). Received Reviewed-by: tags from Konrad Dybcio, Abel Vesa, and Taniya Das. No maintainer applied/queued signal found yet.

Analysis: Both patches are under active review with positive signals (Reviewed-by: tags from subsystem reviewers) but no definitive merge confirmation from the clk maintainer (Stephen Boyd or Bjorn Andersson) yet. The FROMLIST: prefix is appropriate.


Integration Presence (qcom-next / topics)

Per integration_presence_report.md:

Commit Status
Patch 1/2 ⚠️ Missing — Not found in qcom-next or topics branches
Patch 2/2 ⚠️ Partial — Subject or partial tree evidence found, but full change not verified in qcom-next or topics

Overall: FAIL — 1/2 commits missing, 1/2 partial. Neither commit is fully present in the integration branches yet.


Issues Found

None. Both patches are faithful representations of their lore upstream sources.


Verdict

Merge with awareness: Both patches correctly represent their lore upstream sources with proper FROMLIST: prefixes, correct authorship, review tags, and Fixes tags. The diffs are identical to the posted v2 patches.

Integration concern: Neither patch has landed in qcom-next or topics yet, and upstream acceptance is still pending (no maintainer applied/queued signal). The FROMLIST: prefix correctly reflects this status. Consider monitoring the lore thread for maintainer acceptance before final integration.


Final Summary

  1. Lore link present: Yes — both patches have correct lore.kernel.org v2 links
  2. Lore link matches PR commits: Yes — diff content is identical to lore v2 patches for both commits
  3. Upstream patch status: ⏳ Decision Pending — both patches posted Sep 15, 2026 (v2) with positive review signals but no maintainer merge confirmation yet
  4. PR present in qcom-next/topics: Fail — 1/2 commit missing, 1/2 partial; neither commit fully present in integration branches (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/2 [PATCH 1/2] FROMLIST: clk: qcom: rpmhcc: Add LNBB clocks support for missing - no subject, patch-id, or full tree-content match found missing - no subject, patch-id, or full tree-content match found missing
2/2 [PATCH 2/2] FROMLIST: clk: qcom: gcc-glymur: Use 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: FAIL
present_commits: 0/2
partial_commits: 1/2
missing_commits: 1/2
topics_checked_for_commits: 2/2
final_summary: PR present in qcom-next/topics: Fail - 1/2 commit(s) are missing from both qcom-next and topics

@qlijarvis

Copy link
Copy Markdown

PR #1837 — checker-log-analyzer

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

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 Both commits have valid FROMLIST: prefix
qcom-next-check N/A Target branch is qcom-next (no prefix requirement)

Detailed report: Full report

Checker analysis — click to expand

🤖 CI Checker Analysis (checker-log-analyzer)

PR: #1837 - FROMLIST: clk: qcom: rpmhcc/gcc-glymur UFS clock changes
Source: https://github.com/qualcomm-linux/kernel-config/actions/runs/34976107303

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 Both commits have valid FROMLIST: prefix
qcom-next-check N/A Target branch is qcom-next (no prefix requirement)

❌ CI Infrastructure Failure — Automerge Conflicts

Root cause: The CI workflow failed during the automerge step before any checkers could run. Multiple merge conflicts were encountered when integrating the PR with the qcom-next baseline and topic branches.

Failure details:

Running automerge...
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/arm/qcom,coresight-ctcu.yaml
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/arm/qcom,coresight-tnoc.yaml
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/arm/qcom.yaml
CONFLICT (add/add): Merge conflict in Documentation/devicetree/bindings/clock/qcom,glymur-evacc.yaml
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/clock/qcom,qcm2290-dispcc.yaml
CONFLICT (add/add): Merge conflict in Documentation/devicetree/bindings/clock/qcom,shikra-audiocorecc.yaml
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/clock/qcom,sm8550-tcsr.yaml
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/media/qcom,qcm2290-camss.yaml
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.yaml
... (and many more conflicts in sound/soc/qcom/qdsp6/ files)
automerge returned non-zero; check logs for conflicts
##[error]Process completed with exit code 1.

Analysis:

This PR contains only clock driver changes (drivers/clk/qcom/clk-rpmh.c and drivers/clk/qcom/gcc-glymur.c), but the automerge process encountered conflicts in completely unrelated subsystems:

  • Device tree bindings (arm, clock, media, mfd, pci, remoteproc, sound)
  • Sound drivers (sound/soc/qcom/qdsp6/)
  • Many other drivers and DTS files

These conflicts are not caused by this PR. They indicate that:

  1. Other topic branches in the qcom-next integration have conflicting changes
  2. The automerge configuration needs to resolve these conflicts before this PR can be tested
  3. The PR itself is likely clean, but cannot be validated until the baseline integration is fixed

Fix:

This is a CI infrastructure issue, not a patch defect. The PR author cannot fix this directly. Required actions:

  1. For maintainers: Resolve the automerge conflicts in the qcom-next integration:

    # Clone the automerge tool and kernel
    git clone https://github.com/qualcomm-linux/automerge.git
    git clone https://github.com/qualcomm-linux/kernel.git
    cd kernel
    git checkout qcom-next
    
    # Run automerge with the merge.conf
    ../automerge/ci-merge -f ../merge.conf -t head -n
    
    # Resolve conflicts manually, then update the affected topic branches
  2. For PR author: Wait for the integration conflicts to be resolved, then re-trigger CI. The PR commits themselves appear properly formatted:

    • Both commits have valid FROMLIST: prefix ✅
    • Both commits have Link: tags pointing to lore.kernel.org ✅
    • Both commits have Signed-off-by: tags ✅
  3. Alternative: If urgent, the PR can be manually tested by:

    # Apply directly to qcom-next without automerge
    git checkout qcom-next
    git am pr.patch
    # Run checkers manually
    ./scripts/checkpatch.pl --strict --git HEAD~2..HEAD

Reproduce locally:

# Clone and attempt the same automerge that CI does
git clone https://github.com/qualcomm-linux/kernel.git
cd kernel
git checkout qcom-next
git clone https://github.com/qualcomm-linux/automerge.git
# Fetch the merge.conf from kernel-config repo
./automerge/ci-merge -f merge.conf -t head -n

✅ tag-check (Manual Verification)

Status: PASS

Both commits in this PR have valid subject prefixes:

  1. FROMLIST: clk: qcom: rpmhcc: Add LNBB clocks support for Glymur
  2. FROMLIST: clk: qcom: gcc-glymur: Use clk_regmap_phy_mux_ops for GCC UFS muxes

Note: Since the target branch is qcom-next, subject prefix tags are not mandatory per the checker policy. However, both commits correctly use FROMLIST: prefix and include proper Link: tags to lore.kernel.org, following upstream submission best practices.

Verdict

Cannot assess patch quality — all checkers were blocked by automerge conflicts in unrelated subsystems.

Recommended action:

  1. Maintainers should resolve the qcom-next integration conflicts
  2. Re-trigger CI after integration is fixed
  3. The PR commits themselves appear properly formatted and should pass checkers once the infrastructure issue is resolved

No changes required to the PR patches at this time.

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