Skip to content

Add qref and refgen regulator for Monaco#1160

Open
ziyuezhang-123 wants to merge 3 commits into
qualcomm-linux:tech/all/workaroundfrom
ziyuezhang-123:monaco_refgen_wa
Open

Add qref and refgen regulator for Monaco#1160
ziyuezhang-123 wants to merge 3 commits into
qualcomm-linux:tech/all/workaroundfrom
ziyuezhang-123:monaco_refgen_wa

Conversation

@ziyuezhang-123
Copy link
Copy Markdown

Add qref and refgen regulator for Monaco

Ziyue Zhang added 3 commits May 15, 2026 18:04
…fgen-supply

The PCIe QMP PHYs on QCS8300 require stable reference voltage provided
by refgen. Add support for vdda-refgen-supply property in the binding.

Workaround will be reverted once the vote qref regulator for PCIe
available in upstream.

Signed-off-by: Ziyue Zhang <ziyue.zhang@oss.qualcomm.com>
…es for Monaco

The PCIe QMP PHYs on Monaco (QCS8300) require stable reference voltage
provided by refgen and reference clock provided by qref. The refgen and
qref require power supplies.

Add a new sa8775p_qmp_phy_vreg_l list with vdda-qref and vdda-refgen
supplies, and use it for qcs8300_qmp_gen4x2, sa8775p_qmp_gen4x2 and
sa8775p_qmp_gen4x4 PCIe PHY configurations.

Workaround will be reverted once the vote qref regulator for PCIe
available in upstream.

Signed-off-by: Ziyue Zhang <ziyue.zhang@oss.qualcomm.com>
…fgen supplies for PCIe PHYs

The PCIe QMP PHYs on QCS8300 require stable reference voltage provided
by refgen and reference clock provided by qref. Add vdda-qref-supply
and vdda-refgen-supply to pcie0_phy and pcie1_phy nodes on the
qcs8300-ride board.

Workaround will be reverted once the vote qref regulator for PCIe
available in upstream.

Signed-off-by: Ziyue Zhang <ziyue.zhang@oss.qualcomm.com>
@qcomlnxci qcomlnxci requested review from a team, aiquny, mukeshojha-linux and shashim-quic and removed request for a team May 15, 2026 10:11
@sgaud-quic
Copy link
Copy Markdown
Contributor

PR #1160 — validate-patch

PR: #1160

Verdict Issues Detailed Report
N/A 1 Full report
Verdict: N/A — click to expand

Patch Validation Report

PR: #1160 — PCIe QMP PHY vdda-refgen/vdda-qref supply workarounds for QCS8300
Upstream: (none — all commits are WORKAROUND: prefixed)
Verdict: ⏭️ N/A — Validation not applicable


Commits in PR

# Subject Prefix Lore Link
1 WORKAROUND: dt-bindings: phy: qcom,sc8280xp-qmp-pcie-phy: Add vdda-refgen-supply WORKAROUND: None (expected)
2 WORKAROUND: phy: qcom: qmp-pcie: Add vdda-refgen and vdda-qref supplies for Monaco WORKAROUND: None (expected)
3 WORKAROUND: arm64: dts: qcom: qcs8300-ride: Add vdda-qref and vdda-refgen supplies for PCIe PHYs WORKAROUND: None (expected)

Commit Message

Check Status Note
Subject matches upstream ⏭️ N/A WORKAROUND: — no upstream equivalent
Body preserves rationale Each commit explains the functional need and includes a revert note
Fixes tag present/correct ⏭️ N/A Not a bug-fix backport; no Fixes: tag expected
Authorship preserved All three commits authored and signed off by Ziyue Zhang
Backport note (if applicable) ⏭️ N/A Not a backport
Co-developed-by misuse Not present; no issue
Revert intent documented Each commit body states "Workaround will be reverted once the vote qref regulator for PCIe available in upstream"

Diff

File Status Notes
Documentation/devicetree/bindings/phy/qcom,sc8280xp-qmp-pcie-phy.yaml Adds vdda-refgen-supply: true property — minimal, self-consistent
drivers/phy/qualcomm/phy-qcom-qmp-pcie.c Introduces sa8775p_qmp_phy_vreg_l[] with vdda-phy, vdda-pll, vdda-qref, vdda-refgen; wires it to qcs8300_qmp_gen4x2, sa8775p_qmp_gen4x2, sa8775p_qmp_gen4x4 configs
arch/arm64/boot/dts/qcom/qcs8300-ride.dts Adds vdda-qref-supply and vdda-refgen-supply to pcie0_phy and pcie1_phy — consistent with the driver and binding changes

Upstream Patch Status

Commit Community Verdict
All three ⏭️ N/A — WORKAROUND: commits are vendor-only; no upstream posting expected

Dependency Check

  • ✅ All three commits form a self-contained series: binding → driver → DTS, in correct order.
  • ✅ No external prerequisite patches identified.

qcom-next Presence

Commit Status
All three ⏭️ Skipped — WORKAROUND: commits are not expected in qcom-next

Issues

  • None. The WORKAROUND: prefix is used correctly per tree conventions: temporary vendor fix, no upstream lore link, revert intent documented in each commit body.

Verdict

All three commits are correctly tagged WORKAROUND: — lore-link validation is not applicable by design. The series is internally consistent (binding → driver → DTS), authorship is clean, and each commit documents its temporary nature with an explicit revert note. Safe to merge as a workaround series; no corrections required.

Final Summary

  1. Lore link present: No — all commits carry WORKAROUND: prefix; no lore.kernel.org link is expected or required.
  2. Lore link matches PR commits: N/A — no upstream lore source to compare against.
  3. Upstream patch status: ⏭️ N/A — vendor-only workaround; not posted upstream.
  4. PR present in qcom-next: ⏭️ Skipped — WORKAROUND: commits are not expected in qcom-next.

@sgaud-quic
Copy link
Copy Markdown
Contributor

PR #1160 — checker-log-analyzer

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

Checker Result Summary
Checker Result Summary
checkpatch Merge conflict blocked execution — no checkpatch output produced
dt-binding-check Merge conflict blocked execution
dtb-check Merge conflict blocked execution
sparse-check Merge conflict blocked execution
check-uapi-headers Merge conflict blocked execution
check-patch-compliance Merge conflict blocked execution
tag-check All 3 commits carry WORKAROUND: prefix — valid for branch tech/all/workaround
qcom-next-check ⏭️ N/A — target branch is tech/all/workaround, not qcom-next

Detailed report: Full report

Checker analysis — click to expand

🤖 CI Checker Analysis (checker-log-analyzer)

PR: WORKAROUND: PCIe QMP PHY vdda-refgen/vdda-qref supply support for QCS8300 — #1160
Source: https://github.com/qualcomm-linux/kernel-config/actions/runs/25912319989

Checker Result Summary
checkpatch Merge conflict blocked execution — no checkpatch output produced
dt-binding-check Merge conflict blocked execution
dtb-check Merge conflict blocked execution
sparse-check Merge conflict blocked execution
check-uapi-headers Merge conflict blocked execution
check-patch-compliance Merge conflict blocked execution
tag-check All 3 commits carry WORKAROUND: prefix — valid for branch tech/all/workaround
qcom-next-check ⏭️ N/A — target branch is tech/all/workaround, not qcom-next

❌ All Checkers — Merge Conflict in arch/arm64/boot/dts/qcom/qcs8300-ride.dts

Root cause: Every checker job aborted at the sync/merge step because PR #1160's patch to arch/arm64/boot/dts/qcom/qcs8300-ride.dts conflicts with the existing topic/tech/all/workaround topic branch that is merged first into the integration branch.

Failure details:

Auto-merging Documentation/devicetree/bindings/phy/qcom,sc8280xp-qmp-pcie-phy.yaml
Auto-merging arch/arm64/boot/dts/qcom/qcs8300-ride.dts
CONFLICT (content): Merge conflict in arch/arm64/boot/dts/qcom/qcs8300-ride.dts
Automatic merge failed; fix conflicts and then commit the result.
Merge failed or conflicts detected. Aborting merge.
##[error]Process completed with exit code 3.

This identical error appears in all six checker logs (checkpatch, check-patch-compliance, dt-binding-check, dtb-check, sparse-check, check-uapi-headers). No checker reached its actual analysis phase — they all failed at the pre-check merge step.

What the PR changes:

  • Patch 1/3: Documentation/devicetree/bindings/phy/qcom,sc8280xp-qmp-pcie-phy.yaml — adds vdda-refgen-supply: true (auto-merged cleanly)
  • Patch 2/3: drivers/phy/qualcomm/phy-qcom-qmp-pcie.c — adds sa8775p_qmp_phy_vreg_l[] and wires it to qcs8300, sa8775p gen4x2/gen4x4 configs (not involved in conflict)
  • Patch 3/3: arch/arm64/boot/dts/qcom/qcs8300-ride.dts — adds vdda-qref-supply and vdda-refgen-supply to pcie0_phy and pcie1_phy nodes (this file conflicts)

Root cause detail: The topic/tech/all/workaround branch (which is merged into the integration branch before the PR is applied) already contains changes to arch/arm64/boot/dts/qcom/qcs8300-ride.dts in the same region as Patch 3/3. The PR's hunk at lines ~638–666 (around &pcie0_phy and &pcie1_phy) overlaps with whatever the topic branch already modified in that file.

Fix:

  1. Identify what topic/tech/all/workaround already has in qcs8300-ride.dts around the pcie0_phy/pcie1_phy nodes:
    git log --oneline topic/tech/all/workaround -- arch/arm64/boot/dts/qcom/qcs8300-ride.dts
    git show topic/tech/all/workaround -- arch/arm64/boot/dts/qcom/qcs8300-ride.dts | grep -A10 "pcie0_phy\|pcie1_phy"
  2. Rebase PR Add qref and refgen regulator for Monaco #1160 on top of the merged integration branch (base + topic branch) rather than on the raw baseline:
    git fetch origin topic/tech/all/workaround
    git rebase origin/topic/tech/all/workaround
    # resolve conflict in arch/arm64/boot/dts/qcom/qcs8300-ride.dts
    git add arch/arm64/boot/dts/qcom/qcs8300-ride.dts
    git rebase --continue
  3. The resolution should keep both the existing topic-branch changes and the new vdda-qref-supply/vdda-refgen-supply lines from Patch 3/3.
  4. Force-push the rebased branch to update the PR.

Reproduce locally:

git checkout -b integ <baseline-sha>
git merge --no-commit topic/tech/all/workaround
git merge --no-commit pr-1160   # ← conflict fires here

✅ tag-check

All three commits carry the WORKAROUND: prefix, which is valid. Target branch is tech/all/workaround (not qcom-next / qcom-next-staging), so the prefix check is mandatory and passes:

  • WORKAROUND: dt-bindings: phy: qcom,sc8280xp-qmp-pcie-phy: Add vdda-refgen-supply
  • WORKAROUND: phy: qcom: qmp-pcie: Add vdda-refgen and vdda-qref supplies for Monaco
  • WORKAROUND: arm64: dts: qcom: qcs8300-ride: Add vdda-qref and vdda-refgen supplies for PCIe PHYs

Verdict

1 blocker to fix before any checker can run: resolve the merge conflict in arch/arm64/boot/dts/qcom/qcs8300-ride.dts between PR #1160 (Patch 3/3) and the topic/tech/all/workaround branch. Rebase the PR on top of the topic branch, resolve the conflict, and re-trigger CI. The patch content itself (binding YAML, driver C code, DTS additions) looks structurally correct — once the conflict is resolved, the checkers should be able to run and evaluate the actual patch quality.

@sgaud-quic
Copy link
Copy Markdown
Contributor

PR #1160 — validate-patch

PR: #1160

Verdict Issues Detailed Report
N/A 3 Full report
Verdict: N/A — click to expand

Patch Validation Report

PR: PR #1160 — WORKAROUND: PCIe QMP PHY vdda-refgen/vdda-qref supply additions for QCS8300/SA8775P (3 commits)
Upstream: (none — WORKAROUND: prefix, no lore link expected)
Verdict: ⏭️ N/A — Validation not applicable


Commit Summary

# Subject Prefix Lore Link
1 dt-bindings: phy: qcom,sc8280xp-qmp-pcie-phy: Add vdda-refgen-supply WORKAROUND: None (expected)
2 phy: qcom: qmp-pcie: Add vdda-refgen and vdda-qref supplies for Monaco WORKAROUND: None (expected)
3 arm64: dts: qcom: qcs8300-ride: Add vdda-qref and vdda-refgen supplies for PCIe PHYs WORKAROUND: None (expected)

Commit Message

Check Status Note
Subject matches upstream ⏭️ N/A No upstream — WORKAROUND: prefix
Body preserves rationale Each commit clearly states the reason (refgen/qref voltage requirement) and the revert condition
Fixes tag present/correct ⏭️ N/A Not required for WORKAROUND: commits
Authorship preserved Single author Ziyue Zhang <ziyue.zhang@oss.qualcomm.com> with matching Signed-off-by: on all three commits
Backport note ⏭️ N/A Not a backport
Co-developed-by misuse Not present; no issue
Revert condition documented All three commits state "Workaround will be reverted once the vote qref regulator for PCIe available in upstream"

Diff

File Status Notes
Documentation/devicetree/bindings/phy/qcom,sc8280xp-qmp-pcie-phy.yaml Adds vdda-refgen-supply: true property — minimal, self-consistent
drivers/phy/qualcomm/phy-qcom-qmp-pcie.c Introduces sa8775p_qmp_phy_vreg_l[] with vdda-phy, vdda-pll, vdda-qref, vdda-refgen; wires it to qcs8300_qmp_gen4x2, sa8775p_qmp_gen4x2, sa8775p_qmp_gen4x4 configs
arch/arm64/boot/dts/qcom/qcs8300-ride.dts Adds vdda-qref-supply and vdda-refgen-supply to pcie0_phy and pcie1_phy — consistent with binding and driver changes

Upstream Patch Status

Commit Community Verdict
All 3 commits ⏭️ N/A — WORKAROUND: commits are vendor-only; no upstream posting expected

qcom-next Presence

Commit Status
All 3 commits ⏭️ Skipped — WORKAROUND: commits are not expected in qcom-next

Issues Found

None. The three commits are internally consistent:

  • The binding (commit 1) adds the property that the DTS (commit 3) uses.
  • The driver (commit 2) adds the vreg list that the DTS supplies feed into.
  • All three carry matching WORKAROUND: prefixes and identical revert-condition prose.

Recommendation

All three commits are correctly tagged WORKAROUND: with no upstream lore link — this is by design and requires no lore validation. The patch series is internally self-consistent across binding, driver, and DTS layers. The revert condition is documented in each commit message. Safe to merge as a workaround series; no changes required from a commit-message or diff-faithfulness perspective.


Final Summary

  1. Lore link present: No — all three commits carry WORKAROUND: prefix; no lore.kernel.org link is expected or required.
  2. Lore link matches PR commits: N/A — no upstream lore source to compare against.
  3. Upstream patch status: ⏭️ N/A — vendor-only workaround; not posted to any mailing list.
  4. PR present in qcom-next: ⏭️ Skipped — WORKAROUND: commits are not expected in qcom-next.

@sgaud-quic
Copy link
Copy Markdown
Contributor

PR #1160 — checker-log-analyzer

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

Checker Result Summary
Checker Result Summary
checkpatch Aborted — merge conflict before checker ran
dt-binding-check Aborted — merge conflict before checker ran
dtb-check Aborted — merge conflict before checker ran
sparse-check Aborted — merge conflict before checker ran
check-uapi-headers Aborted — merge conflict before checker ran
check-patch-compliance Aborted — merge conflict before checker ran
tag-check All 3 commits use WORKAROUND: prefix — valid
qcom-next-check N/A Target branch is tech/all/workaround, not qcom-next

Detailed report: Full report

Checker analysis — click to expand

🤖 CI Checker Analysis (checker-log-analyzer)

PR: WORKAROUND: PCIe QMP PHY vdda-refgen/vdda-qref supply support for QCS8300 — #1160
Source: https://github.com/qualcomm-linux/kernel-config/actions/runs/25912319989

Checker Result Summary
checkpatch Aborted — merge conflict before checker ran
dt-binding-check Aborted — merge conflict before checker ran
dtb-check Aborted — merge conflict before checker ran
sparse-check Aborted — merge conflict before checker ran
check-uapi-headers Aborted — merge conflict before checker ran
check-patch-compliance Aborted — merge conflict before checker ran
tag-check All 3 commits use WORKAROUND: prefix — valid
qcom-next-check N/A Target branch is tech/all/workaround, not qcom-next

❌ All checkers — Merge Conflict in qcs8300-ride.dts

Root cause: Every checker job failed at the integration-branch sync step (exit code 3) because PR #1160's changes to arch/arm64/boot/dts/qcom/qcs8300-ride.dts conflict with the existing topic/tech/all/workaround topic branch — no checker analysis was ever executed.

Failure details:

Auto-merging Documentation/devicetree/bindings/phy/qcom,sc8280xp-qmp-pcie-phy.yaml
Auto-merging arch/arm64/boot/dts/qcom/qcs8300-ride.dts
CONFLICT (content): Merge conflict in arch/arm64/boot/dts/qcom/qcs8300-ride.dts
Automatic merge failed; fix conflicts and then commit the result.
Merge failed or conflicts detected. Aborting merge.
##[error]Process completed with exit code 3.

This pattern appears identically in all 6 checker logs (checkpatch, dt-binding-check, dtb-check, sparse-check, check-uapi-headers, check-patch-compliance).

What the PR changes:

  • Patch 1/3: Adds vdda-refgen-supply: true to Documentation/devicetree/bindings/phy/qcom,sc8280xp-qmp-pcie-phy.yaml (auto-merged cleanly)
  • Patch 2/3: Adds sa8775p_qmp_phy_vreg_l[] and updates vreg_list for qcs8300_qmp_gen4x2, sa8775p_qmp_gen4x2, sa8775p_qmp_gen4x4 in drivers/phy/qualcomm/phy-qcom-qmp-pcie.c
  • Patch 3/3: Adds vdda-qref-supply and vdda-refgen-supply to pcie0_phy and pcie1_phy in arch/arm64/boot/dts/qcom/qcs8300-ride.dtsthis file conflicts

Fix:
The conflict is between the topic/tech/all/workaround branch (already in the integration tree) and this PR's changes to qcs8300-ride.dts. To resolve:

  1. Identify what the tech/all/workaround topic branch already changes in qcs8300-ride.dts:
    git log --oneline topic/tech/all/workaround -- arch/arm64/boot/dts/qcom/qcs8300-ride.dts
    git diff <base>..<topic/tech/all/workaround> -- arch/arm64/boot/dts/qcom/qcs8300-ride.dts
  2. Rebase PR Add qref and refgen regulator for Monaco #1160 on top of the current tech/all/workaround branch tip (not just the base):
    git fetch origin tech/all/workaround
    git rebase origin/tech/all/workaround
    # resolve conflict in arch/arm64/boot/dts/qcom/qcs8300-ride.dts
    git add arch/arm64/boot/dts/qcom/qcs8300-ride.dts
    git rebase --continue
  3. Push the rebased branch and re-trigger CI.

Reproduce locally:

git checkout -b integ <baseline-sha>
git merge topic/tech/all/workaround
git merge <pr1160-head>   # conflict will appear here in qcs8300-ride.dts

✅ tag-check

All 3 commit subjects start with WORKAROUND: — a valid required prefix for branch tech/all/workaround:

  • WORKAROUND: dt-bindings: phy: qcom,sc8280xp-qmp-pcie-phy: Add vdda-refgen-supply
  • WORKAROUND: phy: qcom: qmp-pcie: Add vdda-refgen and vdda-qref supplies for Monaco
  • WORKAROUND: arm64: dts: qcom: qcs8300-ride: Add vdda-qref and vdda-refgen supplies for PCIe PHYs

Verdict

1 blocker to fix before merge: resolve the content conflict in arch/arm64/boot/dts/qcom/qcs8300-ride.dts between this PR and the topic/tech/all/workaround topic branch, then re-trigger CI. No checker has actually evaluated the patch content yet — all failures are infrastructure-level merge aborts, not patch defects.

@sgaud-quic
Copy link
Copy Markdown
Contributor

🔨 Build Failure Analysis — PR #1160

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

# Error File:Line PR-introduced? Root Cause
1 CONFLICT (content): Merge conflictgit merge pr-1160 --no-commit aborts arch/arm64/boot/dts/qcom/qcs8300-ride.dts Yes Patch 3/3 adds vdda-qref-supply / vdda-refgen-supply to &pcie0_phy and &pcie1_phy; the CI first merges the tech/all/workaround topic branch (which already contains these same lines) into the integration branch, then attempts a second merge of pull/1160/head — producing a content conflict in the same DTS region

Verdict

All 1 failure is introduced by this PR: the DTS changes in patch 3/3 conflict with the already-merged tech/all/workaround topic branch during the CI double-merge step, causing both the build / build and build_rt / build jobs to abort before any compilation occurs.

📎 Detailed analysis: Full report

@sgaud-quic
Copy link
Copy Markdown
Contributor

🔨 Build Failure Analysis — PR #1160

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

# Error File:Line PR-introduced? Root Cause
1 CONFLICT (content): Merge conflict arch/arm64/boot/dts/qcom/qcs8300-ride.dts (pcie0_phy / pcie1_phy regions) Yes Patch 3/3 adds vdda-qref-supply and vdda-refgen-supply to &pcie0_phy and &pcie1_phy in a region already modified by the qcom-next integration branch, causing a content conflict during git merge pr-1160

Verdict

1 of 1 failure is introduced by this PR; the merge conflict in arch/arm64/boot/dts/qcom/qcs8300-ride.dts is caused directly by patch 3/3 of PR #1160 touching a DTS region that has already been modified in the integration branch.

📎 Detailed analysis: Full report

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