wifi: ath12k: Modify set and get antenna mac ops for single wiphy

As multiple radios are combined into a single wiphy, and
the current infrastructure supports only set/get antenna
for the wiphy, the max Tx/Rx antenna capability is advertised
during wiphy register.
Hence, When antenna set/get is received we adjust the set/get
based on max radio capability and set/get antenna accordingly.

Multi radio capability needs to introduced with interface
combination changes to support single wiphy model in cfg80211
which would help extend the wiphy specific get/set configs similar
to this to per hw level.

Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.0.1-00029-QCAHKSWPL_SILICONZ-1
Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.0.c5-00481-QCAHMTSWPL_V1.0_V2.0_SILICONZ-3

Signed-off-by: Sriram R <quic_srirrama@quicinc.com>
Signed-off-by: Rameshkumar Sundaram <quic_ramess@quicinc.com>
Acked-by: Jeff Johnson <quic_jjohnson@quicinc.com>
Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com>
Link: https://msgid.link/20240405194519.1337906-11-quic_ramess@quicinc.com

diff --git a/drivers/net/wireless/ath/ath12k/mac.c b/drivers/net/wireless/ath/ath12k/mac.c
index c3ecf9b62139f3e92a5e8c549971acaab39f8970..77abd46a69d312ae14b9f5826ad8b36bfc4ebdce 100644 (file)
--- a/drivers/net/wireless/ath/ath12k/mac.c
+++ b/drivers/net/wireless/ath/ath12k/mac.c
@@ -5210,6 +5210,13 @@ static int __ath12k_set_antenna(struct ath12k *ar, u32 tx_ant, u32 rx_ant)
        if (ath12k_check_chain_mask(ar, rx_ant, false))
                return -EINVAL;
 
+       /* Since we advertised the max cap of all radios combined during wiphy
+        * registration, ensure we don't set the antenna config higher than the
+        * limits
+        */
+       tx_ant = min_t(u32, tx_ant, ar->pdev->cap.tx_chain_mask);
+       rx_ant = min_t(u32, rx_ant, ar->pdev->cap.rx_chain_mask);
+
        ar->cfg_tx_chainmask = tx_ant;
        ar->cfg_rx_chainmask = rx_ant;
 
@@ -6519,16 +6526,19 @@ static void ath12k_mac_op_configure_filter(struct ieee80211_hw *hw,
 static int ath12k_mac_op_get_antenna(struct ieee80211_hw *hw, u32 *tx_ant, u32 *rx_ant)
 {
        struct ath12k_hw *ah = ath12k_hw_to_ah(hw);
+       int antennas_rx = 0, antennas_tx = 0;
        struct ath12k *ar;
+       int i;
 
-       ar = ath12k_ah_to_ar(ah, 0);
-
-       mutex_lock(&ar->conf_mutex);
-
-       *tx_ant = ar->cfg_tx_chainmask;
-       *rx_ant = ar->cfg_rx_chainmask;
+       for_each_ar(ah, ar, i) {
+               mutex_lock(&ar->conf_mutex);
+               antennas_rx = max_t(u32, antennas_rx, ar->cfg_rx_chainmask);
+               antennas_tx = max_t(u32, antennas_tx, ar->cfg_tx_chainmask);
+               mutex_unlock(&ar->conf_mutex);
+       }
 
-       mutex_unlock(&ar->conf_mutex);
+       *tx_ant = antennas_tx;
+       *rx_ant = antennas_rx;
 
        return 0;
 }
@@ -6537,13 +6547,16 @@ static int ath12k_mac_op_set_antenna(struct ieee80211_hw *hw, u32 tx_ant, u32 rx
 {
        struct ath12k_hw *ah = ath12k_hw_to_ah(hw);
        struct ath12k *ar;
-       int ret;
-
-       ar = ath12k_ah_to_ar(ah, 0);
+       int ret = 0;
+       int i;
 
-       mutex_lock(&ar->conf_mutex);
-       ret = __ath12k_set_antenna(ar, tx_ant, rx_ant);
-       mutex_unlock(&ar->conf_mutex);
+       for_each_ar(ah, ar, i) {
+               mutex_lock(&ar->conf_mutex);
+               ret = __ath12k_set_antenna(ar, tx_ant, rx_ant);
+               mutex_unlock(&ar->conf_mutex);
+               if (ret)
+                       break;
+       }
 
        return ret;
 }