WORKAROUND: Add qref and refgen regulator support for QCS8300 and SA8775p PCIe PHYs by ziyuezhang-123 · Pull Request #1611 · qualcomm-linux/kernel-topics

ziyuezhang-123 · 2026-07-31T02:03:14Z

The PCIe QMP PHYs on QCS8300 and SA8775p require dedicated qref and refgen voltage supplies for stable operation. Without enabling these supplies, PCIe may be unstable and the system can occasionally crash under certain scenarios.

The refgen supply works around a hardware issue where both QREF and the PCIe PHY are expected to depend on refgen2, but QREF actually depends on refgen3. This series therefore votes for refgen3 manually via the refgen supply.

Change 1: phy: qcom: qmp-pcie: Add qref and refgen regulator vote for QCS8300 and SA8775p PHY
Change 2: arm64: dts: qcom: qcs8300: Add qref and refgen supply for PCIe PHYs
Change 3: arm64: dts: qcom: sa8775p: Add qref and refgen supply for PCIe PHYs

This patch series is currently under internal review and will be submitted to the upstream Linux kernel community.

Link: http://shc-kerarch-hyd:8080/kernel_archive/20260703094224.990231-1-ziyue.zhang@oss.qualcomm.com/

CRs-Fixed:

…oth USB and UART On Hamoa boards, a single M.2 slot may host either a UART-based or a USB-based Bluetooth device. As a result, the UART controller node is always present in DT, while the USB path is hot-pluggable. When Bluetooth operates over USB, the presence of the UART DT node still causes the hci_qca UART driver to probe. During probe or power sequencing, the driver may deassert BT_EN, cutting power to the shared Bluetooth device and disconnecting the USB interface. Model BT_EN as an always-on fixed regulator so it cannot be toggled by the UART probe. This prevents the UART driver from interfering with Bluetooth operation when the device is connected over USB. Workaround will be reverted once the M.2 solutionis available upstream. Signed-off-by: Shuai Zhang <shuai.zhang@oss.qualcomm.com>

…nable GPIO If a Bluetooth consumer device does not have a bt-enable GPIO configured in the power sequencer (for example, when BT_EN is tied high via a hardware pull-up and therefore absent from the DT), the power sequencer should not match the device. In this case, the Bluetooth consumer driver will fall back to its legacy power control path and correctly set power_ctrl_enabled to false. Bluetooth device nodes are conventionally named "bluetooth" in the device tree, so use of_node_name_eq() as a generic check instead of enumerating specific compatible strings. Workaround will be reverted once the M.2 solution is available upstream. Signed-off-by: Shuai Zhang <shuai.zhang@oss.qualcomm.com>

Bootup crash seen on kaanapali-mtp board. [ 8.114249][ C0] [drm:dpu_encoder_frame_done_timeout:2731] [dpu error]enc33 frame done timeout [ 8.116480][ T284] Unable to handle kernel paging request at virtual address ffff800080e5e000 [ 8.116488][ T284] Mem abort info: [ 8.116492][ T284] ESR = 0x0000000096000007 [ 8.116497][ T284] EC = 0x25: DABT (current EL), IL = 32 bits [ 8.116502][ T284] SET = 0, FnV = 0 [ 8.116507][ T284] EA = 0, S1PTW = 0 [ 8.116511][ T284] FSC = 0x07: level 3 translation fault [ 8.116516][ T284] Data abort info: [ 8.116519][ T284] ISV = 0, ISS = 0x00000007, ISS2 = 0x00000000 [ 8.116524][ T284] CM = 0, WnR = 0, TnD = 0, TagAccess = 0 [ 8.116529][ T284] GCS = 0, Overlay = 0, DirtyBit = 0, Xs = 0 [ 8.116535][ T284] swapper pgtable: 4k pages, 48-bit VAs, pgdp=00000009bf36c000 [ 8.116541][ T284] [ffff800080e5e000] pgd=0000000000000000, p4d=1000000880346403, pud=1000000880347403, pmd=1000000881e2d403, pte=0000000000000000 [ 8.116567][ T284] Internal error: Oops: 0000000096000007 [qualcomm-linux#1] SMP Revert the change for now to unblock. This reverts commit b0907ee. Signed-off-by: Salendarsingh Gaud <sgaud@qti.qualcomm.com>

…oth USB and UART On Purwa boards, a single M.2 slot may host either a UART-based or a USB-based Bluetooth device. As a result, the UART controller node is always present in DT, while the USB path is hot-pluggable. When Bluetooth operates over USB, the presence of the UART DT node still causes the hci_qca UART driver to probe. During probe or power sequencing, the driver may deassert BT_EN, cutting power to the shared Bluetooth device and disconnecting the USB interface. Model BT_EN as an always-on fixed regulator so it cannot be toggled by the UART probe. This prevents the UART driver from interfering with Bluetooth operation when the device is connected over USB. Workaround will be reverted once the M.2 solutionis available upstream. Signed-off-by: Wei Deng <wei.deng@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>

…nable GPIO Add a bt_gpio_required flag to the per-platform data to indicate that a chip's BT enable path requires a dedicated GPIO. Only skip matching the "bluetooth" device node when this flag is set and bt_gpio is absent. Previously the bt_gpio check was applied unconditionally, which caused chips like WCN3990 that have no separate BT/WLAN enable pins by design to fail matching even when bt-enable GPIO is legitimately absent from the DT. Set bt_gpio_required for WCN6855 and WCN7850 which do require a dedicated BT enable GPIO. Signed-off-by: Shuai Zhang <shuai.zhang@oss.qualcomm.com>

Add the new compatible string for the QCC2072 BT SoC to the Qualcomm Bluetooth DT binding schema. Link: https://lore.kernel.org/all/20260529175342.3363935-1-yepuri.siddu@oss.qualcomm.com/ Signed-off-by: Yepuri Siddu <yepuri.siddu@oss.qualcomm.com>

QCC2072 is a BT/WiFi combo SoC that uses different firmware filenames and requires no external voltage regulators, so add it as a new SoC type. The chip supports the wideband speech and valid LE states capabilities. Its firmware is named using the "orn" prefix and follows the standard rom-version-based scheme: - qca/ornbtfw<ver>.tlv - qca/ornnv<ver>.bin These firmware files are already present in the linux-firmware repository. Link: https://lore.kernel.org/all/20260529175822.3366535-1-yepuri.siddu@oss.qualcomm.com/ Signed-off-by: Yepuri Siddu <yepuri.siddu@oss.qualcomm.com>

…2 industrial mezzanine Add DTS support for M.2 QCC2072 on Qualcomm qcs6490-rb3gen2 industrial mezzanine board. Link: https://lore.kernel.org/all/20260529180234.3373056-1-yepuri.siddu@oss.qualcomm.com/ Signed-off-by: Yepuri Siddu <yepuri.siddu@oss.qualcomm.com>

QCC2072 requires the NVM and calibration data to be delivered to the controller bundled together in an outer TLV of type 4. After loading the NVM file, load the calibration file (qca/ornbcscal<ver>.bin) and combine both into a single buffer with the outer TLV header before passing it to qca_tlv_check_data(). The outer TLV header encodes the combined payload length in the high 24 bits and type 4 in the low 8 bits of the type_len field. If the calibration file is unavailable, fall back to downloading the NVM alone. Link: https://lore.kernel.org/all/20260529180431.3373856-1-yepuri.siddu@oss.qualcomm.com/ Signed-off-by: Yepuri Siddu <yepuri.siddu@oss.qualcomm.com>

On compute targets, PCIe is dependent on the UEFI. In UEFI, when a PCIe link-up fails on a given root port, the default behavior is to power down that root port. The power-down sequence disables the PHY, removes all clock votes, and drops the Interconnect Bandwidth (ICB) votes that were applied in UEFI for that PCIe controller. The HLOS PCIe driver when probes the PCIe6 root port, but probe fails because the PHY is already powered down and there is no PHY bring-up sequence in HLOS for any controller. Since PCIe probe fails, the Interconnect driver's sync_state callback never gets invoked. As a result, the max boot votes applied to other peripherals are never released or reduced, keeping the system stuck at max bandwidth votes and causing the sync state errors observed, this also blocks XO shutdown. Fix this temporarly, by disabling pcie6 now as modem is not functional in this release. we will revert this after finding proper fix. Signed-off-by: Krishna Chaitanya Chundru <krishna.chundru@oss.qualcomm.com>

…nule issue Qualcomm SMMU-500 has an issue with TLBIVA/TLBIVAL where only the base-page-size entry at the base IOVA is invalidated, leaving stale TLB entries for the rest of the range. This causes use-after-free: after dma_free_coherent() unmaps a large buffer, the device can still access freed physical memory through stale TLB entries. On FastRPC workloads this manifests as ADSP crashes when the ELF loader writes to a freed PA that has been reallocated. Force the TLB invalidation step granule to the minimum page size for all Qualcomm SMMU-500 domains, ensuring each page in the range is individually invalidated. The minimum page size from pgsize_bitmap is used rather than hardcoded 4K to correctly handle 16K and 64K granule configurations. This increases the number of TLB invalidation operations for large ranges, but correctness takes precedence. Signed-off-by: Prakash Gupta <prakash.gupta@oss.qualcomm.com> Signed-off-by: Sibi Sankar <sibi.sankar@oss.qualcomm.com>

…or QCS8300 and SA8775p PHY Add a new sa8775p_qmp_phy_vreg_l that includes vdda-phy, vdda-pll, vdda-qref, vdda-refgen and refgen supplies, and use it for QCS8300 and SA8775p PCIe PHY configurations. This avoids modifying sm8550_qmp_phy_vreg_l and breaking SM8550 and SM8650. Note that due to a hardware issue, QREF actually depends on refgen3 rather than refgen2 as documented; refgen3 is therefore voted manually via the refgen supply as a workaround. Fixes: a05b6d5 ("phy: qcom-qmp-pcie: add support for sa8775p") Fixes: ebf198f ("phy: qcom-qmp-pcie: add dual lane PHY support for QCS8300") Link: http://shc-kerarch-hyd:8080/kernel_archive/20260703094224.990231-3-ziyue.zhang@oss.qualcomm.com/ Signed-off-by: Ziyue Zhang <ziyue.zhang@oss.qualcomm.com>

… PCIe PHYs The QMP PCIe PHYs on QCS8300 require dedicated qref and refgen voltage supplies for stable operation. Without these supplies, the system may occasionally crash. Add vdda-qref-supply and vdda-refgen-supply in the board files (QCS8300-RIDE, Monaco-EVK and Monaco-Arduino-Monza), and add refgen-supply in the SoC DTSI (monaco.dtsi) since refgen is an on-chip regulator shared across boards. The refgen supply votes for refgen3 as a workaround for a hardware issue where both QREF and the PCIe PHY are expected to depend on refgen2, but QREF actually depends on refgen3. Fixes: 33967ea ("arm64: dts: qcom: qcs8300-ride: enable pcie0 interface") Fixes: cdb613a ("arm64: dts: qcom: qcs8300-ride: enable pcie1 interface") Fixes: 41e2424 ("arm64: dts: qcom: monaco-evk: Enable PCIe0 and PCIe1.") Fixes: 5238f4e ("arm64: dts: qcom: Add Monaco Monza SoM") Link: http://shc-kerarch-hyd:8080/kernel_archive/20260703094224.990231-4-ziyue.zhang@oss.qualcomm.com/ Signed-off-by: Ziyue Zhang <ziyue.zhang@oss.qualcomm.com>

… PCIe PHYs The QMP PCIe PHYs on SA8775p require dedicated qref and refgen voltage supplies for stable operation. Without these supplies, the system may occasionally crash. Add vdda-qref-supply and vdda-refgen-supply in the board files (Lemans-EVK, Lemans-RIDE, QCS9100-RIDE, QCS9100-RIDE-R3, SA8775P-RIDE and SA8775P-RIDE-R3), and add refgen-supply in the SoC DTSI (lemans.dtsi) since refgen is an on-chip regulator shared across boards. The refgen supply votes for refgen3 as a workaround for a hardware errata (see cover letter). Fixes: 94d7d37 ("arm64: dts: qcom: lemans-evk: Enable PCIe support") Fixes: 76326da ("arm64: dts: qcom: lemans: Refactor ride/ride-r3 boards based on daughter cards") Link: http://shc-kerarch-hyd:8080/kernel_archive/20260703094224.990231-5-ziyue.zhang@oss.qualcomm.com/ Signed-off-by: Ziyue Zhang <ziyue.zhang@oss.qualcomm.com>

qlijarvis · 2026-07-31T02:20:20Z

🔨 Build Failure Analysis — PR #1611

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

#	Error	File:Line	PR-introduced?	Root Cause
1	Merge conflict	`arch/arm64/boot/dts/qcom/qcs8300-ride.dts`	No	Pre-existing conflict with integration branch topic/tech/all/workaround
2	Merge conflict	`drivers/bluetooth/hci_qca.c`	No	Pre-existing conflict with integration branch topic/tech/all/workaround
3	Duplicate symbol definition (would fail compilation)	`drivers/phy/qualcomm/phy-qcom-qmp-pcie.c:3495`	Yes	PR defines `sa8775p_qmp_phy_vreg_l` twice (lines 3492 and 3495)

Verdict

The build failed during automerge due to 2 pre-existing merge conflicts. However, the PR introduces a critical compilation error: duplicate definition of sa8775p_qmp_phy_vreg_l that would cause build failure even if merge conflicts were resolved.

📎 Detailed analysis: Full report

qlijarvis · 2026-07-31T02:25:08Z

🔨 Build Failure Analysis — PR #1611

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

#	Error	File:Line	PR-introduced?	Root Cause
1	Merge conflict during automerge	`arch/arm64/boot/dts/qcom/qcs8300-ride.dts`	No	Integration conflict: PR modifies PCIe PHY supply assignments in the same file region that was changed in the baseline branch
2	Merge conflict during automerge	`drivers/bluetooth/hci_qca.c`	No	Integration conflict: Unrelated changes in baseline branch conflict with PR changes

Verdict

This is not a compilation failure. The build failed during the pre-build automerge/integration step due to merge conflicts between the PR branch and the baseline integration branch. Both conflicts are integration issues, not PR-introduced compilation errors.

📎 Detailed analysis: Full report

qlijarvis · 2026-07-31T02:37:27Z

PR #1611 — validate-patch

PR: #1611

Verdict	Issues	Detailed Report
N/A	0	Full report

Final Summary

Lore link present: No — WORKAROUND: prefix; no lore.kernel.org link expected or required
Lore link matches PR commits: N/A — no lore link to compare against
Upstream patch status: N/A — vendor-only workaround, not posted upstream
PR present in qcom-next/topics: Partial - 3/3 commit(s) only have partial integration evidence

Note: The WORKAROUND: prefix correctly indicates these are temporary vendor-only fixes for hardware issues. However, the duplicate symbol definition in commit 1/3 is a critical error that will prevent compilation and must be fixed before merging.

Verdict: N/A — click to expand

🔍 Patch Validation

PR: #1611 - WORKAROUND: Add qref and refgen regulator support for QCS8300 and SA8775p PCIe PHYs (3 commits)
Upstream commit: N/A (vendor-only workarounds)
Verdict: ⏭️ NOT APPLICABLE — WORKAROUND commits; no upstream validation required

Summary

This PR contains 3 commits, all prefixed with WORKAROUND::

WORKAROUND: phy: qcom: qmp-pcie: Add qref and refgen regulator vote for QCS8300 and SA8775p PHY

WORKAROUND: arm64: dts: qcom: qcs8300: Add qref and refgen supply for PCIe PHYs

WORKAROUND: arm64: dts: qcom: sa8775p: Add qref and refgen supply for PCIe PHYs

All commits include Link: tags pointing to an internal kernel archive server (http://shc-kerarch-hyd:8080/kernel_archive/), not to lore.kernel.org.

Commit Prefix Analysis

According to the validate-patch skill's prefix pattern table:

Prefix Meaning Lore link required?

WORKAROUND: Temporary fix, not suitable for upstream No — skip validation

The WORKAROUND: prefix indicates these are vendor-only temporary fixes that address hardware issues or limitations and are not intended for upstream submission. Therefore:

No lore.kernel.org link is expected or required

Validation against upstream sources is not applicable

These commits are designed to remain in the vendor tree only

Commit Message Review

All three commits follow a consistent structure:

✅ Clear subject lines describing the workaround scope

✅ Detailed commit bodies explaining the hardware issue and the workaround approach

✅ Fixes: tags referencing the original commits that introduced the affected code

✅ Proper Signed-off-by: trailers

✅ Internal Link: tags for vendor tracking

Note on commit 1/3: The commit message states "Note that due to a hardware issue, QREF actually depends on refgen3 rather than refgen2 as documented; refgen3 is therefore voted manually via the refgen supply as a workaround." This explicitly documents the hardware errata being worked around, which is appropriate for a WORKAROUND: commit.

Diff Review

The changes are internally consistent across all three commits:

Commit 1/3 (driver):

✅ Adds a new sa8775p_qmp_phy_vreg_l[] array including the additional "refgen" supply

⚠️ Issue detected: The code adds a duplicate definition of sa8775p_qmp_phy_vreg_l[]. The original definition at line 3492 already exists, and the patch adds another at line 3495. This will cause a compilation error (redefinition).

Commits 2/3 and 3/3 (device trees):

✅ Add vdda-qref-supply and vdda-refgen-supply properties to board-level PHY nodes

✅ Add refgen-supply properties to SoC-level PHY nodes in DTSI files

✅ Changes are consistent across QCS8300 (Monaco) and SA8775p (Lemans) platforms

Issues Found
❌ CRITICAL: Duplicate symbol definition in commit 1/3

The patch adds:
+static const char * const sa8775p_qmp_phy_vreg_l[] = {
+	"vdda-phy", "vdda-pll", "vdda-qref", "vdda-refgen", "refgen",
+};
But the context shows that sa8775p_qmp_phy_vreg_l[] already exists at line 3492:
static const char * const sa8775p_qmp_phy_vreg_l[] = {
	"vdda-phy", "vdda-pll", "vdda-qref", "vdda-refgen",
};
Root cause: The patch should modify the existing array to add "refgen", not create a duplicate definition.

Fix required: Change the patch to update the existing definition:
@@ -3492,7 +3492,7 @@ static const char * const sa8775p_qmp_phy_vreg_l[] = {
-	"vdda-phy", "vdda-pll", "vdda-qref", "vdda-refgen",
+	"vdda-phy", "vdda-pll", "vdda-qref", "vdda-refgen", "refgen",
 };
⚠️ WARNING: Missing usage of the new regulator array

After adding/modifying sa8775p_qmp_phy_vreg_l[], the patch does not show where this array is used in the driver configuration structures (e.g., qmp_phy_cfg for SA8775p or QCS8300). The driver must reference this new array for the additional regulators to be requested at runtime.

Recommendation: Verify that the full patch series (or a related commit) updates the relevant qmp_phy_cfg structures to use sa8775p_qmp_phy_vreg_l instead of the previous regulator list.
Integration Presence

According to integration_presence_report.md:

Commit qcom-next topics Final

1/3 partial partial partial

2/3 partial missing partial

3/3 partial partial partial

Overall status: PARTIAL — 3/3 commits have only partial integration evidence.

Interpretation: The commits may have been partially integrated (e.g., subject lines or file paths match), but the full change content has not been verified in qcom-next or topic branches. This is expected for workaround commits that may be under active development or testing.

Verdict

❌ FAIL — Critical compilation error in commit 1/3 due to duplicate symbol definition.

Recommendation

Do not merge until the following issue is resolved:

Fix commit 1/3: Remove the duplicate sa8775p_qmp_phy_vreg_l[] definition. The patch should modify the existing array at line 3492, not add a new one.

Verify driver configuration: Ensure that the SA8775p and QCS8300 PHY configuration structures (qmp_phy_cfg) are updated to reference the modified sa8775p_qmp_phy_vreg_l[] array. This may be in a separate commit or may need to be added.

Build verification: After fixing the duplicate definition, verify that the driver compiles cleanly with the changes.

Once the duplicate definition is resolved and the driver configuration is verified, the workaround changes are appropriate for a vendor tree.

Final Summary

Lore link present: No — WORKAROUND: prefix; no lore.kernel.org link expected or required

Lore link matches PR commits: N/A — no lore link to compare against

Upstream patch status: N/A — vendor-only workaround, not posted upstream

PR present in qcom-next/topics: Partial — 3/3 commits have partial integration evidence; full content not verified

Note: The WORKAROUND: prefix correctly indicates these are temporary vendor-only fixes for hardware issues. However, the duplicate symbol definition in commit 1/3 is a critical error that will prevent compilation and must be fixed before merging.

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: 36229361f23e694eb897225a6a859064e11471c5
topics remote: topics -> https://github.com/qualcomm-linux/kernel-topics
topics fetch: fetched

Commit Subject qcom-next topics Final

1/3 [PATCH 1/3] WORKAROUND: phy: qcom: qmp-pcie: Add qref and refgen partial - subject or partial tree evidence found, but full change was not verified partial - subject or partial tree evidence found, but full change was not verified partial

2/3 [PATCH 2/3] WORKAROUND: arm64: dts: qcom: qcs8300: Add qref and 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

3/3 [PATCH 3/3] WORKAROUND: arm64: dts: qcom: sa8775p: Add qref and partial - subject or partial tree evidence found, but full change was not verified partial - subject or partial tree evidence found, but full change was not verified partial

Final Status

overall_status: PARTIAL
present_commits: 0/3
partial_commits: 3/3
missing_commits: 0/3
topics_checked_for_commits: 3/3
final_summary: PR present in qcom-next/topics: Partial - 3/3 commit(s) only have partial integration evidence

qlijarvis · 2026-07-31T02:37:28Z

PR #1611 — checker-log-analyzer

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

Checker	Result	Summary
Checker	Result	Summary
checkpatch	⏭️	Not executed - merge conflict blocked CI
dt-binding-check	⏭️	Not executed - merge conflict blocked CI
dtb-check	⏭️	Not executed - merge conflict blocked CI
sparse-check	⏭️	Not executed - merge conflict blocked CI
check-uapi-headers	⏭️	Not executed - merge conflict blocked CI
check-patch-compliance	⏭️	Not executed - merge conflict blocked CI
tag-check	✅	All commits have valid `WORKAROUND:` prefix
qcom-next-check	N/A	Unable to determine target branch

Detailed report: Full report

Checker analysis — click to expand

🤖 CI Checker Analysis (checker-log-analyzer)

PR: #1611 - WORKAROUND: Add qref and refgen regulator support for QCS8300/SA8775p PCIe PHYs
Source: https://github.com/qualcomm-linux/kernel-config/actions/runs/30598063415

Checker Result Summary

checkpatch ⏭️ Not executed - merge conflict blocked CI

dt-binding-check ⏭️ Not executed - merge conflict blocked CI

dtb-check ⏭️ Not executed - merge conflict blocked CI

sparse-check ⏭️ Not executed - merge conflict blocked CI

check-uapi-headers ⏭️ Not executed - merge conflict blocked CI

check-patch-compliance ⏭️ Not executed - merge conflict blocked CI

tag-check ✅ All commits have valid WORKAROUND: prefix

qcom-next-check N/A Unable to determine target branch

⚠️ CI Infrastructure Issue: Merge Conflicts During Automerge

Root cause: The kernel-checkers CI workflow failed during the automerge/integration step before any actual checker validation could run. Merge conflicts were encountered when merging the PR branch with the integration baseline.

Failure details:
Merging topic branches...
 ** Merging topic branch: topic/tech/all/workaround
Auto-merging arch/arm64/boot/dts/qcom/qcs8300-ride.dts
CONFLICT (content): Merge conflict in arch/arm64/boot/dts/qcom/qcs8300-ride.dts
Auto-merging drivers/bluetooth/hci_qca.c
CONFLICT (content): Merge conflict in drivers/bluetooth/hci_qca.c
Automatic merge failed; fix conflicts and then commit the result.
Merge failed, manual merge
##[error]Process completed with exit code 1.
Affected files:

arch/arm64/boot/dts/qcom/qcs8300-ride.dts

drivers/bluetooth/hci_qca.c

Analysis:

This is not a patch quality issue — the CI infrastructure could not complete the integration merge required to run the checkers. The conflicts indicate that:

The PR branch (topic/tech/all/workaround) has diverged from the current integration baseline

Changes in qcs8300-ride.dts and hci_qca.c conflict with other topic branches being merged

Fix:

The PR author needs to rebase the topic branch onto the latest integration baseline to resolve these conflicts:
# Fetch the latest baseline
git fetch origin <baseline-branch>

# Rebase the PR branch
git checkout topic/tech/all/workaround
git rebase origin/<baseline-branch>

# Resolve conflicts in:
#   - arch/arm64/boot/dts/qcom/qcs8300-ride.dts
#   - drivers/bluetooth/hci_qca.c

# For each conflicted file:
git add <file>
git rebase --continue

# Force-push the rebased branch
git push --force-with-lease
Reproduce locally:
# Clone the kernel-config repo to get automerge tooling
git clone https://github.com/qualcomm-linux/kernel-config
cd kernel-config

# Run automerge with the PR branch
./automerge.sh --pr 1611
✅ tag-check — PASS

All three commits in the PR use the WORKAROUND: prefix, which is valid:

WORKAROUND: phy: qcom: qmp-pcie: Add qref and refgen regulator vote for QCS8300 and SA8775p PHY

WORKAROUND: arm64: dts: qcom: qcs8300: Add qref and refgen supply for PCIe PHYs

WORKAROUND: arm64: dts: qcom: sa8775p: Add qref and refgen supply for PCIe PHYs

The WORKAROUND: prefix is appropriate for temporary fixes addressing hardware issues (as documented in the commit messages: "refgen3 is voted manually via the refgen supply as a workaround for a hardware issue").

⚠️ check-patch-compliance — Predicted Failure

Note: This checker did not run due to the merge conflict, but based on the patch content, it would likely fail with the following issues:

Issue 1: Non-lore.kernel.org Link URLs

All three commits use internal archive links instead of lore.kernel.org:
Link: http://shc-kerarch-hyd:8080/kernel_archive/20260703094224.990231-3-ziyue.zhang@oss.qualcomm.com/
The check-patch-compliance checker requires public lore.kernel.org URLs for FROMLIST:, FROMGIT:, UPSTREAM:, and BACKPORT: prefixes.

Issue 2: WORKAROUND prefix not in allowed list

The check-patch-compliance checker only accepts these prefixes:

FROMLIST:

FROMGIT:

UPSTREAM:

BACKPORT:

The WORKAROUND: prefix (while valid for the tree) is not in the checker's allowed list, so these commits will fail check-patch-compliance validation.

This is a known limitation — vendor-specific prefixes like WORKAROUND:, QCLINUX:, and PENDING: always fail this checker even though they are valid for internal topic branches.

Expected behavior: The checker will fail, but this is acceptable for WORKAROUND: commits that are not intended for upstream submission.

Verdict

Cannot merge until merge conflicts are resolved.

The PR cannot be evaluated by the kernel-checkers CI until the author rebases onto the latest integration baseline and resolves the conflicts in:

arch/arm64/boot/dts/qcom/qcs8300-ride.dts

drivers/bluetooth/hci_qca.c

Once rebased and conflicts resolved:

Re-trigger the CI run

The checkers will execute and provide validation results

check-patch-compliance will fail (expected for WORKAROUND: prefix) — this is acceptable for vendor-internal workarounds

Action required: Rebase the PR branch and resolve merge conflicts, then re-run CI.

shuaz-shuai and others added 16 commits July 24, 2026 09:48

qcomlnxci requested review from a team, Nicolas Dechesne (ndechesne), Ricardo Salveti (ricardosalveti) and Shiraz Hashim (shashim-quic) and removed request for a team July 31, 2026 02:05

Komal Bajaj (Komal-Bajaj) force-pushed the tech/all/workaround branch from feffe10 to 219d869 Compare August 12, 2026 05:45

Navigation Menu

Uh oh!

WORKAROUND: Add qref and refgen regulator support for QCS8300 and SA8775p PCIe PHYs - #1611

WORKAROUND: Add qref and refgen regulator support for QCS8300 and SA8775p PCIe PHYs#1611
ziyuezhang-123 wants to merge 16 commits into
qualcomm-linux:tech/all/workaroundfrom
ziyuezhang-123:for-all-workaround-qcs8300-sa8775p-qref-refgen-20260731

ziyuezhang-123 commented Jul 31, 2026

Uh oh!

qlijarvis commented Jul 31, 2026

Uh oh!

qlijarvis commented Jul 31, 2026

Uh oh!

qlijarvis commented Jul 31, 2026

🔍 Patch Validation

Summary

Commit Prefix Analysis

Commit Message Review

Diff Review

Issues Found

Integration Presence

Verdict

Recommendation

Final Summary

Deterministic Integration Presence

Integration Presence Report

Final Status

Uh oh!

qlijarvis commented Jul 31, 2026

🤖 CI Checker Analysis (checker-log-analyzer)

⚠️ CI Infrastructure Issue: Merge Conflicts During Automerge

✅ tag-check — PASS

⚠️ check-patch-compliance — Predicted Failure

Verdict

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

Uh oh!

Conversation

ziyuezhang-123 commented Jul 31, 2026

Uh oh!

qlijarvis commented Jul 31, 2026

🔨 Build Failure Analysis — PR #1611

Verdict

Uh oh!

qlijarvis commented Jul 31, 2026

🔨 Build Failure Analysis — PR #1611

Verdict

Uh oh!

qlijarvis commented Jul 31, 2026

PR #1611 — validate-patch

Final Summary

🔍 Patch Validation

Summary

Commit Prefix Analysis

Commit Message Review

Diff Review

Issues Found

Integration Presence

Verdict

Recommendation

Final Summary

Deterministic Integration Presence

Integration Presence Report

Final Status

Uh oh!

qlijarvis commented Jul 31, 2026

PR #1611 — checker-log-analyzer

🤖 CI Checker Analysis (checker-log-analyzer)

⚠️ CI Infrastructure Issue: Merge Conflicts During Automerge

✅ tag-check — PASS

⚠️ check-patch-compliance — Predicted Failure

Verdict

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants