Repository navigation
FROMLIST: wifi: ath12k: Fix mlo active links- #2298 - #1476
Open
miaoqing-quic wants to merge 8 commits into
Open
miaoqing-quic wants to merge 8 commits into
miaoqing-quic wants to merge 8 commits into
Conversation
…econnect
In ath12k_mac_op_sta_state(), when transitioning an MLO station from
IEEE80211_STA_NOTEXIST to IEEE80211_STA_NONE, after ath12k_dp_peer_create()
succeeds, on is_sta_assoc_link verification failure, it takes the
'goto exit' path instead of 'goto peer_delete', leaving a stale dp_peer on
the dp_peers_list.
On the next connection attempt, ath12k_dp_peer_create() finds the stale
entry and returns -EEXIST (-17):
wlP4p1s0: failed to insert STA entry for the AP (error -17)
Fix it by changing 'goto exit' to 'goto free_unassign_link'.
Also, there is another error path in ath12k_mac_op_sta_state() that
jumps to peer_delete after ath12k_mac_assign_link_sta() succeeds, without
undoing the assignment through ath12k_mac_free_unassign_link_sta().
As a result, the link RCU pointer remains assigned and a stale bit is
left in ahsta->links_map, which can trigger the same -EEXIST failure
on subsequent reconnect attempts. Fix this by redirecting that error
path to free_unassign_link instead.
Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.1.c7-00108-QCAHMTSWPL_V1.0_V2.0_SILICONZ_UPSTREAM-3
Fixes: 0cd46d1 ("wifi: ath12k: identify assoc link vif in station mode")
Fixes: ee16dcf ("wifi: ath12k: Define ath12k_dp_peer structure & APIs for create & delete")
Signed-off-by: Miaoqing Pan <miaoqing.pan@oss.qualcomm.com>
Reviewed-by: Rameshkumar Sundaram <rameshkumar.sundaram@oss.qualcomm.com>
Reviewed-by: Baochen Qiang <baochen.qiang@oss.qualcomm.com>
Link: https://patch.msgid.link/20260915080053.918500-1-miaoqing.pan@oss.qualcomm.com
Signed-off-by: Jeff Johnson <jeff.johnson@oss.qualcomm.com>
…tive command WMI_MLO_LINK_SET_ACTIVE_CMDID allows the driver to tell firmware which MLO links should be active or inactive. Add parsing and logging of the corresponding firmware response event. Delivery of the response to the sender is added in a subsequent patch. Tested-on: QCC2072 hw1.0 PCI WLAN.COL.1.0.c2-00277-QCACOLSWPL_V1_TO_SILICONZ-1 Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.1.c7-00108-QCAHMTSWPL_V1.0_V2.0_SILICONZ_UPSTREAM-3 Signed-off-by: Miaoqing Pan <miaoqing.pan@oss.qualcomm.com> Link: https://lore.kernel.org/linux-wireless/20261118025520.39269-2-miaoqing.pan@oss.qualcomm.com/
…ink set active When CTRL_F_OVERWRITE_FORCE_ACTIVE_BITMAP or CTRL_F_OVERWRITE_FORCE_INACTIVE_BITMAP is set in ctrl_flags, firmware replaces the existing force link bitmaps rather than OR-ing the new bitmap into the accumulated force state. Without these flags, successive commands accumulate: forcing link A active and then forcing link B active would leave both links forced simultaneously, making it impossible to clear a previously forced link. With the overwrite flags, each command atomically replaces the force bitmap, giving the driver precise control over which links are active. Encode the two overwrite flags in WMI_MLO_LINK_SET_ACTIVE_CMDID, and copy the AP MLD MAC address from the argument into the command. Also fix the CRTL_F_DYNC_FORCE_LINK_NUM typo. ath12k_mac_mlo_sta_set_link_active() takes the AP MLD address and sets both overwrite flags when the mode is FORCE_ACTIVE_INACTIVE. The existing caller passes NULL and uses INACTIVE_LINK_NUM, so its behavior does not change. Tested-on: QCC2072 hw1.0 PCI WLAN.COL.1.0.c2-00277-QCACOLSWPL_V1_TO_SILICONZ-1 Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.1.c7-00108-QCAHMTSWPL_V1.0_V2.0_SILICONZ_UPSTREAM-3 Signed-off-by: Miaoqing Pan <miaoqing.pan@oss.qualcomm.com> Link: https://lore.kernel.org/linux-wireless/20261118025520.39269-3-miaoqing.pan@oss.qualcomm.com/
…ve-link updates Currently, ath12k_mac_op_change_vif_links() derives the links to add and remove from the old_links/new_links arguments: it creates a link vif (arvif) for each link in ~old_links & new_links and frees the arvif of each link in old_links & ~new_links. However, mac80211 invokes drv_change_vif_links() both when the valid links change and when the active links change. In the first case old_links/new_links are the valid links. In the second case they are only the active links, while vif->valid_links is not modified. A link that is deactivated is therefore reported as removed, although it is still a valid link of the MLD. To fix this, derive the arvif lifetime from vif->valid_links, which mac80211 updates before calling the driver and which an active-link change leaves untouched. Create an arvif for each link in valid_links & ~links_map and remove those in links_map & ~valid_links. A link that is only deactivated keeps its arvif. On disconnect (valid_links == 0) every remaining arvif is removed. The WARN_ON() for adding a link that already has an arvif is dropped, since links already in links_map are not selected for creation. Tested-on: QCC2072 hw1.0 PCI WLAN.COL.1.0.c2-00277-QCACOLSWPL_V1_TO_SILICONZ-1 Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.1.c7-00108-QCAHMTSWPL_V1.0_V2.0_SILICONZ_UPSTREAM-3 Fixes: 315d80b ("wifi: ath12k: allocate new links in change_vif_links()") Signed-off-by: Miaoqing Pan <miaoqing.pan@oss.qualcomm.com> Link: https://lore.kernel.org/linux-wireless/20261118025520.39269-4-miaoqing.pan@oss.qualcomm.com/
…mac_get_vif_up() Active-link deactivation releases the channel context of a link while its vdev stays up in firmware. ath12k_mac_get_vif_up() returns the first vdev that is up, and that vdev is used to derive the target pdev. It could pick such a deactivated link, and ath12k_mac_get_target_pdev_id_from_vif() would then find no channel for it. Skip links without a channel context in ath12k_mac_get_vif_up(). The WARN_ON() in ath12k_mac_get_target_pdev_id_from_vif() is kept, since callers reaching it are expected to have a channel context. Tested-on: QCC2072 hw1.0 PCI WLAN.COL.1.0.c2-00277-QCACOLSWPL_V1_TO_SILICONZ-1 Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.1.c7-00108-QCAHMTSWPL_V1.0_V2.0_SILICONZ_UPSTREAM-3 Signed-off-by: Miaoqing Pan <miaoqing.pan@oss.qualcomm.com> Link: https://lore.kernel.org/linux-wireless/20261118025520.39269-5-miaoqing.pan@oss.qualcomm.com/
…annel changed When mac80211 changes the active links on an MLO STA interface it calls assign_vif_chanctx() and unassign_vif_chanctx() on the affected links. A deactivated link has its channel context released, and a link that is activated again gets one assigned. Currently unassign_vif_chanctx() does not stop the vdev of a STA link, but it still clears is_started. The vdev and the BSS peer therefore stay in firmware while the driver believes the vdev is not started. When the link gets a chanctx again, assign_vif_chanctx() starts a vdev that is already running in firmware and counts it twice in num_started_vdevs. Fix this by not clearing is_started for a STA vdev in unassign_vif_chanctx(), so the driver state matches the firmware state and the vdev and the BSS peer stay in firmware across an active links change. Only non-STA vdevs, which are stopped there, clear is_started. A STA vdev may already have been stopped, with is_started cleared, by station removal, so the is_started check at entry is limited to non-STA vdev types. As a result, assign_vif_chanctx() can see a STA vdev that is still started. Compare the new channel with the one the vdev was started on, recorded in started_chandef: - Same channel: nothing to do, the vdev is already running on it. - Channel changed: restart the vdev on the new chanctx (vdev restart if it is up, otherwise stop and start), the same way switch_vif_chanctx() does. A started vdev of any other type still hits WARN_ON() and returns -EBUSY as before. Since unassign_vif_chanctx() no longer clears is_started for a STA vdev, clear it in ath12k_mac_station_remove(), where the STA vdev is actually stopped, but only if the stop succeeded. Otherwise is_started stays set after a disconnect although the vdev is stopped in firmware, and on targets using vdev_start_delay (WCN7850, QCC2072) ath12k_mac_station_add() skips ath12k_start_vdev_delay() on reconnect, so the vdev is never started. Tested-on: QCC2072 hw1.0 PCI WLAN.COL.1.0.c2-00277-QCACOLSWPL_V1_TO_SILICONZ-1 Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.1.c7-00108-QCAHMTSWPL_V1.0_V2.0_SILICONZ_UPSTREAM-3 Signed-off-by: Miaoqing Pan <miaoqing.pan@oss.qualcomm.com> Link: https://lore.kernel.org/linux-wireless/20261118025520.39269-6-miaoqing.pan@oss.qualcomm.com/
…unds check ath12k_mac_mlo_sta_set_link_active() fills the vdev_bitmap and inactive_vdev_bitmap arrays of struct wmi_mlo_link_set_active_arg, and both arrays are sized by WMI_MLO_VDEV_BITMAP_SZ. The bounds checks on entry_idx, however, compared against WMI_MLO_LINK_NUM_SZ, which is the size of link_num[]. Both constants are 2 today, so nothing changes at runtime. The check still has to match the array it guards: if the constants ever diverge, the wrong bound either rejects valid vdev IDs or allows writes past the end of the bitmap arrays. Use WMI_MLO_VDEV_BITMAP_SZ in both the active and the inactive vdev checks. Tested-on: QCC2072 hw1.0 PCI WLAN.COL.1.0.c2-00277-QCACOLSWPL_V1_TO_SILICONZ-1 Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.1.c7-00108-QCAHMTSWPL_V1.0_V2.0_SILICONZ_UPSTREAM-3 Signed-off-by: Miaoqing Pan <miaoqing.pan@oss.qualcomm.com> Link: https://lore.kernel.org/linux-wireless/20261118025520.39269-7-miaoqing.pan@oss.qualcomm.com/
ath12k_mac_op_change_sta_links() handles both valid-link and active-link changes from mac80211. For an active-link change, old_links and new_links are the active sets. The callback returned early whenever new_links was smaller than old_links, and outside connect nothing sends an active-link command to firmware. So when an associated MLO STA deactivates a link, e.g. active links 0x5 -> 0x1, firmware keeps link 2 active while mac80211 has already released its channel context. Sync the active links to firmware from the callback once the STA is AUTHORIZED: - Create link STAs for sta->valid_links instead of new_links. Firmware cannot remove a single link sta, so removals are only logged and are left to STA removal. - Take the active set from channel contexts: a link with a link STA and a link vif is active if it holds a chanctx, inactive otherwise. mac80211 releases the chanctx of a deactivated link and assigns one to a newly activated link before it calls the callback. - Send WMI_MLO_LINK_SET_ACTIVE only when this set differs from the one last programmed, cached per vif. Send it to each device that holds vdevs of the STA, with that device's links, and wait up to 5 seconds for each response. Two active links on the same MAC use INACTIVE_LINK_NUM, as at connect, and that command is not waited for. Update the cache only if all devices succeed, so a failed sync is retried on the next callback. - Reset the cache on ASSOC -> AUTHORIZED, so the first sync after each (re)connect is always sent. This also covers hw restart, where mac80211 replays the station state transitions. If the device crashes while a request is pending, the waiter still holds the wiphy lock. ath12k_core_pre_reconfigure_recovery() therefore releases the waiter before it takes the lock, otherwise recovery stalls until the timeout expires. Tested-on: QCC2072 hw1.0 PCI WLAN.COL.1.0.c2-00277-QCACOLSWPL_V1_TO_SILICONZ-1 Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.1.c7-00108-QCAHMTSWPL_V1.0_V2.0_SILICONZ_UPSTREAM-3 Signed-off-by: Miaoqing Pan <miaoqing.pan@oss.qualcomm.com> Link: https://lore.kernel.org/linux-wireless/20261118025520.39269-8-miaoqing.pan@oss.qualcomm.com/
miaoqing-quic
requested review from
a team,
jingyiwang42,
Dmitry Baryshkov (lumag) and
Shivendra Pratap (quicAspratap)
November 18, 2026 07:31
|
Merge Check Failed: No Change Task Found No associated change tasks found for CR 4705178 on any of the following entities: Entities:
CR: 4705178 Please ensure the CR has a change task associated with at least one of the entities for this branch. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
mac80211 calls drv_change_vif_links() and drv_change_sta_links() for both valid-links and active-links changes. ath12k does not distinguish between the two, causing WARN_ON/incorrect teardown in change_vif_links(), inconsistent vdev state in the chanctx callbacks, and silent firmware miss in change_sta_links().
This series derives link object lifetime from vif->valid_links and sta->valid_links, which mac80211 updates before calling the driver, instead of from the active-links sets. A STA link vdev keeps running when its link is deactivated. The active/inactive link state is programmed to firmware with WMI_MLO_LINK_SET_ACTIVE_CMDID, sent to each device that holds vdevs of the STA, and only when it differs from the state last programmed.
CRs-Fixed: 4705178,4705177,4705171,4604297,4603733