Skip to content

FROMLIST: wifi: ath12k: set STA EHT MU mode before peer assoc - #2167

Merged
miaoqing-quic merged 1 commit into
qualcomm-linux:tech/net/athfrom
zhuhangtian:tech/net/ath
Oct 30, 2026
Merged

miaoqing-quic merged 1 commit into
qualcomm-linux:tech/net/athfrom
zhuhangtian:tech/net/ath

Conversation

@zhuhangtian

Copy link
Copy Markdown

Currently, ath12k_bss_assoc() sets HE MU mode with WMI_VDEV_PARAM_SET_HEMU_MODE before ath12k_wmi_send_peer_assoc_cmd(), but has no equivalent step for EHT.
This means firmware can process peer assoc without EHT beamformee/OFDMA mode state matching the current peer and bandwidth, which can leave incorrect beamforming/OFDMA state for 11be links.

Fix this by adding ath12k_mac_vif_recalc_sta_eht_txbf() to compute the EHT MU mode bitmask from local and peer EHT capabilities and link bandwidth, and sending WMI_VDEV_PARAM_SET_EHT_MU_MODE before peer assoc, mirroring the existing HE flow.
Also send WMI_VDEV_PARAM_SET_EHT_MU_MODE with zero for non-EHT associations to clear stale EHT mode left from a previous association on the same vdev.

Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.1.c7-00108-QCAHMTSWPL_V1.0_V2.0_SILICONZ_UPSTREAM-3
Link: https://lore.kernel.org/all/20260915055117.546723-1-hangtian.zhu@oss.qualcomm.com

CRs-Fixed: 4602685

@qswat-orbit-external

Copy link
Copy Markdown

Dev Completion validation failed

CR: 4602685
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.

@qcomlnxci
qcomlnxci requested review from a team and miaoqing-quic and removed request for a team October 30, 2026 07:52
Currently, ath12k_bss_assoc() sets HE MU mode with
WMI_VDEV_PARAM_SET_HEMU_MODE before ath12k_wmi_send_peer_assoc_cmd(),
but has no equivalent step for EHT.
This means firmware can process peer assoc without EHT
beamformee/OFDMA mode state matching the current peer and bandwidth,
which can leave incorrect beamforming/OFDMA state for 11be links.

Fix this by adding ath12k_mac_vif_recalc_sta_eht_txbf() to compute the
EHT MU mode bitmask from local and peer EHT capabilities and link
bandwidth, and sending WMI_VDEV_PARAM_SET_EHT_MU_MODE before peer assoc,
mirroring the existing HE flow.
Also send WMI_VDEV_PARAM_SET_EHT_MU_MODE with zero for non-EHT
associations to clear stale EHT mode left from a previous association
on the same vdev.

Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.1.c7-00108-QCAHMTSWPL_V1.0_V2.0_SILICONZ_UPSTREAM-3
Link: https://lore.kernel.org/all/20260915055117.546723-1-hangtian.zhu@oss.qualcomm.com
Signed-off-by: Hangtian Zhu <hangtian.zhu@oss.qualcomm.com>
@qswat-orbit-external

Copy link
Copy Markdown

Dev Completion validation failed

CR: 4602685
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.

@qcomlnxci
qcomlnxci requested a review from a team October 30, 2026 07:59
@qlijarvis

Copy link
Copy Markdown

🔨 Build Failure Analysis — PR #2167

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

# Error File:Line PR-introduced? Root Cause
1 Merge conflict during automerge kernel/reboot.c No Pre-existing conflict between integration baseline and topic branches; PR only modifies drivers/net/wireless/ath/ath12k/mac.c

Verdict

This is not a compilation failure. The build failed during the automerge/integration step with a merge conflict in kernel/reboot.c. The PR does not touch this file and is not responsible for the conflict. 0 of 1 errors are introduced by this PR; 1 is pre-existing.

📎 Detailed analysis: Full report

@miaoqing-quic
miaoqing-quic merged commit fd8c230 into qualcomm-linux:tech/net/ath Oct 30, 2026
4 of 7 checks passed
@qswat-orbit-external

Copy link
Copy Markdown

Dev Completion validation failed

CR: 4602685
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

Copy link
Copy Markdown

🔨 Build Failure Analysis — PR #2167

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

# Error File:Line PR-introduced? Root Cause
1 Merge conflict during automerge kernel/reboot.c No Pre-existing merge conflict between tech/net/ath topic branch and tech/bsp/soc-infra topic branch in an unrelated file

Verdict

This is NOT a compilation failure. The build failed during the automerge step due to a pre-existing merge conflict in kernel/reboot.c, which is completely unrelated to the PR changes in drivers/net/wireless/ath/ath12k/mac.c. The PR code itself has no compilation errors.

📎 Detailed analysis: Full report

@qlijarvis

Copy link
Copy Markdown

PR #2167 — validate-patch

PR: #2167

Verdict Issues Detailed Report
✅ 0 Full report

Final Summary

  1. Lore link present: Yes — Link: https://lore.kernel.org/all/20260915055117.546723-1-hangtian.zhu@oss.qualcomm.com correctly added to commit message
  2. Lore link matches PR commits: Yes — diff content is identical; only line number context differs (3773 vs 3780) due to target tree baseline
  3. Upstream patch status: ⏳ In review — posted to linux-wireless on 2026-09-15; no merge/NAK signals in thread yet; patch targets ath-next tree
  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: #2167 - FROMLIST: wifi: ath12k: set STA EHT MU mode before peer assoc
Upstream commit: https://lore.kernel.org/all/20260915055117.546723-1-hangtian.zhu@oss.qualcomm.com
Verdict: ✅ PASS

Commit Message

Check Status Note
Subject matches upstream ✅ FROMLIST: prefix correctly added; base subject identical
Body preserves rationale ✅ Problem description, fix approach, and testing info preserved verbatim
Fixes tag present/correct N/A No Fixes tag in upstream patch
Authorship preserved ✅ From: matches lore author (Hangtian Zhu); Signed-off-by: present
Backport note (if applicable) N/A FROMLIST: commit; no backport note required

Diff

File Status Notes
drivers/net/wireless/ath/ath12k/mac.c ✅ All 75 added lines identical; 7-line context shift due to target tree baseline (line 3773 vs 3780)

Issues

None. The patch is a faithful representation of the lore posting with only legitimate context-line differences.

Verdict

Merge as-is. The PR correctly applies the FROMLIST: prefix, preserves the original author and commit message, includes the required Link: tag, and the diff content is identical to the lore patch (only line numbers differ due to context).

Final Summary

  1. Lore link present: Yes — Link: https://lore.kernel.org/all/20260915055117.546723-1-hangtian.zhu@oss.qualcomm.com correctly added to commit message
  2. Lore link matches PR commits: Yes — diff content is identical; only line number context differs (3773 vs 3780) due to target tree baseline
  3. Upstream patch status: ⏳ In review — posted to linux-wireless on 2026-09-15; no merge/NAK signals in thread yet; patch targets ath-next tree
  4. PR present in qcom-next/topics: Yes — exact patch-id match at fd8c23078a587b87c916dd00cc77fb14e15fcda7 in topics branch

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

Commit Subject qcom-next topics Final
1/1 [PATCH] FROMLIST: wifi: ath12k: set STA EHT MU mode before peer assoc partial - subject or partial tree evidence found, but full change was not verified present - exact patch-id match at fd8c230 present

Final Status

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

@qlijarvis

Copy link
Copy Markdown

PR #2167 — checker-log-analyzer

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

Checker Result Summary
Checker Result Summary
checkpatch ⚠️ CI infrastructure failure - merge failed
dt-binding-check ⚠️ CI infrastructure failure - merge failed
dtb-check ⚠️ CI infrastructure failure - merge failed
sparse-check ⚠️ CI infrastructure failure - merge failed
check-uapi-headers ⚠️ CI infrastructure failure - merge failed
check-patch-compliance ⚠️ CI infrastructure failure - merge failed
tag-check ✅ Subject has valid FROMLIST: prefix
qcom-next-check N/A Cannot determine target branch

Detailed report: Full report

Checker analysis — click to expand

🤖 CI Checker Analysis (checker-log-analyzer)

PR: #2167 - FROMLIST: wifi: ath12k: set STA EHT MU mode before peer assoc
Source: https://github.com/qualcomm-linux/kernel-config/actions/runs/41023417128

Checker Result Summary
checkpatch ⚠️ CI infrastructure failure - merge failed
dt-binding-check ⚠️ CI infrastructure failure - merge failed
dtb-check ⚠️ CI infrastructure failure - merge failed
sparse-check ⚠️ CI infrastructure failure - merge failed
check-uapi-headers ⚠️ CI infrastructure failure - merge failed
check-patch-compliance ⚠️ CI infrastructure failure - merge failed
tag-check ✅ Subject has valid FROMLIST: prefix
qcom-next-check N/A Cannot determine target branch

⚠️ CI Infrastructure Failure

Root cause: All checker jobs failed during the merge step with "fatal: refusing to merge unrelated histories" when attempting to merge PR #2167 with the integration branch.

Failure details:

Merging topic branch: topic/tech/net/ath
fatal: refusing to merge unrelated histories
Merge failed, manual merge
...
Fetching PR #2167 from https://github.com/qualcomm-linux/kernel-topics.git...
Merging pr-2167 (no-commit)...
fatal: refusing to merge unrelated histories
Merge failed or conflicts detected. Aborting merge.
##[error]Process completed with exit code 3.

Analysis:

This is a CI infrastructure issue, not a patch quality defect. The error "refusing to merge unrelated histories" indicates that:

  1. The PR branch (topic/tech/net/ath) has no common ancestor with the integration baseline (c7896917e523946138ce654d4b6c1e33d5a8f4e5)
  2. Git refuses to merge branches with completely separate histories without the --allow-unrelated-histories flag
  3. The CI merge script does not handle this scenario

This is likely because:

  • The PR is targeting a topic branch (topic/tech/net/ath) that was created independently
  • The topic branch may have been rebased or recreated, breaking the history chain
  • The CI expects all PRs to have a common ancestor with the baseline

Fix:

This requires CI infrastructure changes, not patch changes:

  1. Immediate workaround: Re-trigger the CI after ensuring the PR branch is properly rebased on the target branch
  2. Proper fix: Update the CI merge script to handle topic branches with --allow-unrelated-histories when appropriate, or ensure topic branches are always created from the baseline

Reproduce locally:

git clone https://github.com/qualcomm-linux/kernel-topics.git
cd kernel-topics
git checkout c7896917e523946138ce654d4b6c1e33d5a8f4e5
git checkout -b integ
git merge topic/tech/net/ath  # Will fail with "refusing to merge unrelated histories"

✅ Patch Quality Assessment (Manual Review)

Since the checkers could not run, I performed a manual review of the patch content:

Positive findings:

  • ✅ Subject line has valid FROMLIST: prefix
  • ✅ Includes upstream Link: to lore.kernel.org
  • ✅ Proper Signed-off-by: trailer
  • ✅ Clear commit message explaining the problem and solution
  • ✅ Includes Tested-on: line with hardware details
  • ✅ Code follows kernel coding style (proper indentation, naming conventions)
  • ✅ Mirrors existing HE flow for consistency
  • ✅ Includes error handling and cleanup paths

Potential concerns:

  • ⚠️ Cannot verify checkpatch compliance (CI did not run)
  • ⚠️ Cannot verify sparse warnings (CI did not run)
  • ⚠️ Cannot verify build success (CI did not run)

Code review notes:

  • The patch adds ath12k_mac_vif_recalc_sta_eht_txbf() function mirroring the existing HE equivalent
  • Properly handles non-EHT associations by sending zero to clear stale state
  • Error paths include proper logging and RCU unlock
  • Switch statement for bandwidth is complete with default case

Verdict

CI infrastructure failure prevents automated validation. Manual patch review shows no obvious quality issues.

Required actions:

  1. CI team: Fix the merge infrastructure to handle topic branches with unrelated histories
  2. PR author: Verify the PR branch is properly based on the target branch
  3. Reviewer: Once CI is fixed, re-run checkers to validate:
    • checkpatch compliance
    • sparse warnings
    • build success
    • patch compliance (Link/Author verification)

Recommendation: The patch content appears well-formed, but cannot be merged until CI infrastructure is fixed and all checkers pass successfully.

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.

3 participants