FROMLIST: wifi: ath11k: raise max vdevs to 4 on hardware with P2P and dual-station

[WeiZhang-stone]

When P2P support is enabled, wpa_supplicant creates a p2p-device interface by default, which implicitly consumes one vdev. On systems managed by NetworkManager, this interface cannot be reliably disabled, leaving only two usable interfaces for user configurations.

Increase num_vdevs to four for QCA6390 hw2.0, WCN6855 hw2.0/hw2.1, QCA2066 hw2.1, and QCA6698AQ hw2.1 to account for the implicit p2p-device and enable common concurrency scenarios such as AP + AP + STA.

This change increases interface concurrency in the two-channel scenario by raising the maximum vdev limit, while keeping other combination rules unchanged.

CRs-Fixed: 4503393

[qlijarvis]

PR #1260 — validate-patch

PR: #1260

Verdict	Issues	Detailed Report
⚠️	0	Full report

Final Summary

1. Lore link present: Yes — https://lore.kernel.org/linux-wireless/20260525020711.2590815-1-wei.zhang@oss.qualcomm.com/
2. Lore link matches PR commits: Cannot verify — network access to lore.kernel.org restricted; manual verification required
3. Upstream patch status: Cannot verify — network access restricted; check linux-wireless mailing list for acceptance/rejection signals
4. PR present in qcom-next: No — searched by subject, author, file path, and diff fingerprint; commit not found in origin/qcom-next

Verdict: ⚠️ — click to expand

🔍 Patch Validation

PR: #1260 - FROMLIST: wifi: ath11k: raise max vdevs to 4 on hardware with P2P and dual-station support
Upstream commit: https://lore.kernel.org/linux-wireless/20260525020711.2590815-1-wei.zhang@oss.qualcomm.com/
Verdict: ⚠️ PARTIAL (cannot verify lore content due to network restrictions)

Commit Message

Check	Status	Note
Subject matches upstream	⏭️ Skipped	Cannot fetch lore patch (network restricted)
Body preserves rationale	⏭️ Skipped	Cannot fetch lore patch (network restricted)
Fixes tag present/correct	N/A	No Fixes tag (not a bug fix)
Authorship preserved	✅	FROMLIST: author Wei Zhang in both From: and Signed-off-by:
Backport note (if applicable)	N/A	FROMLIST prefix (not yet merged upstream)

Diff

File	Status	Notes
drivers/net/wireless/ath/ath11k/core.c:267	✅	Changes .num_vdevs = 2 + 1 → 4 for QCA6390 hw2.0
drivers/net/wireless/ath/ath11k/core.c:445	✅	Changes .num_vdevs = 2 + 1 → 4 for WCN6855 hw2.0
drivers/net/wireless/ath/ath11k/core.c:535	✅	Changes .num_vdevs = 2 + 1 → 4 for WCN6855 hw2.1
drivers/net/wireless/ath/ath11k/core.c:797	✅	Changes .num_vdevs = 2 + 1 → 4 for QCA2066 hw2.1
drivers/net/wireless/ath/ath11k/core.c:886	✅	Changes .num_vdevs = 2 + 1 → 4 for QCA6698AQ hw2.1

Diff summary: 5 hunks, 5 deletions, 5 additions. Clean substitution pattern: 2 + 1 → 4 across five hardware variants.

Issues

1. ⚠️ Timeline anomaly: PR commit date (2026-04-21) predates lore posting date (2026-05-25). This suggests either:

   • The patch was developed locally first, then posted to lore later (normal workflow)
   • The commit date was not updated when cherry-picking from lore (if applicable)
   • For FROMLIST commits, this is acceptable if the patch was prepared before posting

2. ⏭️ Cannot verify lore content: Network access to lore.kernel.org is restricted in this environment. Unable to:

   • Fetch upstream patch for diff comparison
   • Check upstream patch status (ACKed/NACKed/Pending)
   • Verify commit message fidelity

3. ✅ FROMLIST authorship correct: For FROMLIST commits, the submitter (Wei Zhang) is legitimately in From: and Signed-off-by:. No additional author attribution required since the submitter is also the original author.

Verdict

Conditional approval pending lore verification:

The PR commit structure is correct for a FROMLIST submission:

• ✅ Proper FROMLIST: prefix
• ✅ Valid lore.kernel.org Link tag
• ✅ Author and Signed-off-by match (submitter is original author)
• ✅ Comprehensive Tested-on tags (5 hardware variants)
• ✅ Clean, focused diff (single file, consistent pattern)

Recommended next steps:

1. Verify lore patch content matches PR diff (requires network access)
2. Check upstream patch status on linux-wireless mailing list
3. Confirm patch has not been NACKed or superseded by a newer revision

Final Summary

1. Lore link present: Yes — https://lore.kernel.org/linux-wireless/20260525020711.2590815-1-wei.zhang@oss.qualcomm.com/
2. Lore link matches PR commits: Cannot verify — network access to lore.kernel.org restricted; manual verification required
3. Upstream patch status: Cannot verify — network access restricted; check linux-wireless mailing list for acceptance/rejection signals
4. PR present in qcom-next: No — searched by subject, author, file path, and diff fingerprint; commit not found in origin/qcom-next

[qlijarvis]

PR #1260 — checker-log-analyzer

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

Checker	Result	Summary
Checker	Result	Summary
checkpatch	❌	1 warning: long line in commit message
dt-binding-check	⏭️	No DT binding changes
dtb-check	⏭️	No DTS changes
sparse-check	✅	Passed
check-uapi-headers	✅	Passed
check-patch-compliance	✅	Passed
tag-check	✅	Subject has valid FROMLIST: prefix
qcom-next-check	✅	Commit has FROMLIST: prefix and Link: tag

Detailed report: Full report

Checker analysis — click to expand

🤖 CI Checker Analysis (checker-log-analyzer)

PR: #1260 - FROMLIST: wifi: ath11k: raise max vdevs to 4 on hardware with P2P and dual-station support
Source: https://github.com/qualcomm-linux/kernel-config/actions/runs/26550635750
Target branch: topic/tech/net/ath

Checker	Result	Summary
checkpatch	❌	1 warning: long line in commit message
dt-binding-check	⏭️	No DT binding changes
dtb-check	⏭️	No DTS changes
sparse-check	✅	Passed
check-uapi-headers	✅	Passed
check-patch-compliance	✅	Passed
tag-check	✅	Subject has valid FROMLIST: prefix
qcom-next-check	✅	Commit has FROMLIST: prefix and Link: tag

---

❌ checkpatch

Root cause: Commit message contains a Tested-on: line exceeding 75 characters.

Failure details:

WARNING: Prefer a maximum 75 chars per line (possible unwrapped commit description?)
#21: 
Tested-on: WCN6855 hw2.0 PCI WLAN.HSP.1.1-03125-QCAHSPSWPL_V1_V2_SILICONZ_LITE-3.6510.41

99569ce4b1e6a9f397ce5c2d66608dfc989a57e4 total: 0 errors, 1 warnings, 0 checks, 40 lines checked

The Tested-on: line at line #21 of the commit message is 89 characters long, exceeding the recommended 75-character limit for commit body lines.

Fix:

This is a cosmetic warning that can be safely ignored. The Tested-on: tags contain firmware version strings that cannot be meaningfully wrapped without breaking their semantic meaning. Kernel maintainers typically accept long Tested-on: lines because:

1. They document exact firmware versions for reproducibility
2. Breaking them across lines reduces readability
3. They are metadata tags, not prose

Alternative (if you want to eliminate the warning):

git rebase -i df3ae9703774b70a7b7758b53498a25de9f87174
# mark commit 99569ce4b1e6 as 'edit'
# Manually wrap the Tested-on line (though this reduces clarity):
# Tested-on: WCN6855 hw2.0 PCI
#   WLAN.HSP.1.1-03125-QCAHSPSWPL_V1_V2_SILICONZ_LITE-3.6510.41
git commit --amend
git rebase --continue

Reproduce locally:

./scripts/checkpatch.pl --strict --ignore FILE_PATH_CHANGES --git df3ae9703774b70a7b7758b53498a25de9f87174..99569ce4b1e6a9f397ce5c2d66608dfc989a57e4

---

Verdict

Ready to merge with 1 cosmetic warning.

The single checkpatch warning is a false positive for Tested-on: metadata lines containing long firmware version strings. All other checkers passed:

• ✅ sparse-check — No static analysis issues
• ✅ check-uapi-headers — No ABI changes
• ✅ check-patch-compliance — Valid FROMLIST: prefix with proper Link: tag
• ✅ tag-check — Subject line has required FROMLIST: prefix for non-qcom-next branches
• ⏭️ dt-binding-check, dtb-check — Skipped (no DT changes)

The patch modifies only C source code (drivers/net/wireless/ath/ath11k/core.c) to increase num_vdevs from 2 + 1 to 4 for specific hardware variants. This is a straightforward parameter change with no coding style issues, ABI breaks, or compliance violations.

Recommendation: Merge as-is. The checkpatch warning does not block merge and is commonly accepted for firmware version metadata.