wifi: ath11k: move locking outside of ath11k_mac_get_fw_stats()

Currently ath11k_mac_get_fw_stats() is acquiring/releasing ar->conf_mutex by itself.
In order to reuse this function in a context where that lock is already taken, move
lock handling to its callers, then the function itself only has to assert it.

There is only one caller now, i.e., ath11k_mac_op_sta_statistics(), so add lock handling
there.

Tested-on: WCN6855 hw2.0 PCI WLAN.HSP.1.1-03125-QCAHSPSWPL_V1_V2_SILICONZ_LITE-3.6510.37

Signed-off-by: Baochen Qiang <quic_bqiang@quicinc.com>
Reviewed-by: Vasanthakumar Thiagarajan <vasanthakumar.thiagarajan@oss.qualcomm.com>
Link: https://patch.msgid.link/20250220082448.31039-7-quic_bqiang@quicinc.com
Signed-off-by: Jeff Johnson <jeff.johnson@oss.qualcomm.com>

diff --git a/drivers/net/wireless/ath/ath11k/mac.c b/drivers/net/wireless/ath/ath11k/mac.c
index 1550533b55876ff410dadb105301a795a99cd8bb..18e1d78cac45e0e14a329a935243fd8b38c7e89b 100644 (file)
--- a/drivers/net/wireless/ath/ath11k/mac.c
+++ b/drivers/net/wireless/ath/ath11k/mac.c
@@ -9052,12 +9052,10 @@ static int ath11k_mac_get_fw_stats(struct ath11k *ar, u32 pdev_id,
        struct stats_request_params req_param;
        int ret;
 
-       mutex_lock(&ar->conf_mutex);
+       lockdep_assert_held(&ar->conf_mutex);
 
-       if (ar->state != ATH11K_STATE_ON) {
-               ret = -ENETDOWN;
-               goto err_unlock;
-       }
+       if (ar->state != ATH11K_STATE_ON)
+               return -ENETDOWN;
 
        req_param.pdev_id = pdev_id;
        req_param.vdev_id = vdev_id;
@@ -9071,9 +9069,6 @@ static int ath11k_mac_get_fw_stats(struct ath11k *ar, u32 pdev_id,
                   "debug get fw stat pdev id %d vdev id %d stats id 0x%x\n",
                   pdev_id, vdev_id, stats_id);
 
-err_unlock:
-       mutex_unlock(&ar->conf_mutex);
-
        return ret;
 }
 
@@ -9111,6 +9106,7 @@ static void ath11k_mac_op_sta_statistics(struct ieee80211_hw *hw,
 
        ath11k_mac_put_chain_rssi(sinfo, arsta, "ppdu", false);
 
+       mutex_lock(&ar->conf_mutex);
        if (!(sinfo->filled & BIT_ULL(NL80211_STA_INFO_CHAIN_SIGNAL)) &&
            arsta->arvif->vdev_type == WMI_VDEV_TYPE_STA &&
            ar->ab->hw_params.supports_rssi_stats &&
@@ -9126,6 +9122,7 @@ static void ath11k_mac_op_sta_statistics(struct ieee80211_hw *hw,
            !(ath11k_mac_get_fw_stats(ar, ar->pdev->pdev_id, 0,
                                      WMI_REQUEST_VDEV_STAT)))
                signal = arsta->rssi_beacon;
+       mutex_unlock(&ar->conf_mutex);
 
        ath11k_dbg(ar->ab, ATH11K_DBG_MAC,
                   "sta statistics db2dbm %u rssi comb %d rssi beacon %d\n",