wifi: ath11k: use WMI_VDEV_SET_TPC_POWER_CMDID when EXT_TPC_REG_SUPPORT for 6 GHz

When station is connected to a 6 GHz AP, it has 2 ways to configure
the power limit to firmware. The first way is to send 2 WMI commands
WMI_PDEV_PARAM_TXPOWER_LIMIT2G/WMI_PDEV_PARAM_TXPOWER_LIMIT5G to
firmware, the second way is to send WMI_VDEV_SET_TPC_POWER_CMDID to
firmware which include more parameters for power control.

When firmware supports SERVICE_EXT_TPC_REG, it means firmware supports
WMI_VDEV_SET_TPC_POWER_CMDID, then ath11k selects the second way.

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

Signed-off-by: Wen Gong <quic_wgong@quicinc.com>
Signed-off-by: Baochen Qiang <quic_bqiang@quicinc.com>
Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com>
Link: https://msgid.link/20231218085844.2658-13-quic_bqiang@quicinc.com

diff --git a/drivers/net/wireless/ath/ath11k/mac.c b/drivers/net/wireless/ath/ath11k/mac.c
index f812a6f44b82122d316746a2f44ed55ebea006e9..bf4a97967177e0a6769921d336d30de54829bb2c 100644 (file)
--- a/drivers/net/wireless/ath/ath11k/mac.c
+++ b/drivers/net/wireless/ath/ath11k/mac.c
@@ -3397,6 +3397,18 @@ static int ath11k_mac_config_obss_pd(struct ath11k *ar,
        return 0;
 }
 
+static bool ath11k_mac_supports_station_tpc(struct ath11k *ar,
+                                           struct ath11k_vif *arvif,
+                                           const struct cfg80211_chan_def *chandef)
+{
+       return ath11k_wmi_supports_6ghz_cc_ext(ar) &&
+               test_bit(WMI_TLV_SERVICE_EXT_TPC_REG_SUPPORT, ar->ab->wmi_ab.svc_map) &&
+               arvif->vdev_type == WMI_VDEV_TYPE_STA &&
+               arvif->vdev_subtype == WMI_VDEV_SUBTYPE_NONE &&
+               chandef->chan &&
+               chandef->chan->band == NL80211_BAND_6GHZ;
+}
+
 static void ath11k_mac_op_bss_info_changed(struct ieee80211_hw *hw,
                                           struct ieee80211_vif *vif,
                                           struct ieee80211_bss_conf *info,
@@ -3596,7 +3608,6 @@ static void ath11k_mac_op_bss_info_changed(struct ieee80211_hw *hw,
        if (changed & BSS_CHANGED_TXPOWER) {
                ath11k_dbg(ar->ab, ATH11K_DBG_MAC, "vdev_id %i txpower %d\n",
                           arvif->vdev_id, info->txpower);
-
                arvif->txpower = info->txpower;
                ath11k_mac_txpower_recalc(ar);
        }
@@ -7285,6 +7296,15 @@ ath11k_mac_vdev_start_restart(struct ath11k_vif *arvif,
                return ret;
        }
 
+       /* TODO: For now we only set TPC power here. However when
+        * channel changes, say CSA, it should be updated again.
+        */
+       if (ath11k_mac_supports_station_tpc(ar, arvif, chandef)) {
+               ath11k_mac_fill_reg_tpc_info(ar, arvif->vif, &arvif->chanctx);
+               ath11k_wmi_send_vdev_set_tpc_power(ar, arvif->vdev_id,
+                                                  &arvif->reg_tpc_info);
+       }
+
        if (!restart)
                ar->num_started_vdevs++;
 
@@ -8112,7 +8132,7 @@ ath11k_mac_op_assign_vif_chanctx(struct ieee80211_hw *hw,
                }
 
                ath11k_reg_handle_chan_list(ab, reg_info, power_type);
-
+               arvif->chanctx = *ctx;
                ath11k_mac_parse_tx_pwr_env(ar, vif, ctx);
        }