From: Kalle Valo <quic_kvalo@xxxxxxxxxxx> Convert all uses of struct ath12k::conf_mutex to use struct wiphy::mtx, which is already used by mac80211, and remove conf_mutex from ath12k. This way we have one mutex less in ath12k and simpler locking design. I'm submitting this as RFC as I have only tested these patches and need to investigate how this affects MLO implementation. v3: * new patch: wifi: ath12k: fix atomic calls in ath12k_mac_op_set_bitrate_mask() * new patch: wifi: ath12k: ath12k_mac_op_sta_state(): clean up update_wk cancellation * patch 3: ath12k_core_post_reconfigure_recovery(): take wiphy lock before hw_mutex to avoid a lockdep warning * patch 3: ath12k_sta_rc_update_wk(): remove extra wiphy_lock() calls * patch 3: update commit message, especially remove the sparse warning which was already fixed * rebase to ath-202409191620 v2: https://patchwork.kernel.org/project/linux-wireless/cover/20240918181042.91891-1-kvalo@xxxxxxxxxx/ * rebase to ath-202409051620 * patch 1: ath12k_wow_op_suspend(): remove extra wiphy_lock()/unlock() (Baochen) * patch 1: fix clang warnings about unused labels (Johannes) * patch 2: s/no/now/ (Jeff) * patch 4: ath12k_sta_rc_update_wk(): fix wiphy_priv() usage v1: https://patchwork.kernel.org/project/linux-wireless/cover/20240821153728.2121600-1-kvalo@xxxxxxxxxx/ Kalle Valo (6): wifi: ath12k: fix atomic calls in ath12k_mac_op_set_bitrate_mask() wifi: ath12k: convert struct ath12k_sta::update_wk to use struct wiphy_work wifi: ath12k: switch to using wiphy_lock() and remove ar->conf_mutex wifi: ath12k: cleanup unneeded labels wifi: ath12k: ath12k_mac_op_set_key(): remove exit label wifi: ath12k: ath12k_mac_op_sta_state(): clean up update_wk cancellation drivers/net/wireless/ath/ath12k/core.c | 7 +- drivers/net/wireless/ath/ath12k/core.h | 7 +- drivers/net/wireless/ath/ath12k/debugfs.c | 4 +- .../wireless/ath/ath12k/debugfs_htt_stats.c | 26 +- drivers/net/wireless/ath/ath12k/mac.c | 388 +++++++----------- drivers/net/wireless/ath/ath12k/peer.c | 6 +- drivers/net/wireless/ath/ath12k/wow.c | 26 +- 7 files changed, 192 insertions(+), 272 deletions(-) base-commit: d35bb26e150d7fb7434959fad9fcaeaac99906e6 -- 2.39.5