wifi: ath12k: use WMI_VDEV_SET_TPC_POWER_CMDID when EXT_TPC_REG_SUPPORT for 6 GHz

When station is connected to a 6 GHz AP, there are 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
includes more parameters for power control.

When firmware advertises WMI_TLV_SERVICE_EXT_TPC_REG_SUPPORT, it supports
WMI_VDEV_SET_TPC_POWER_CMDID, ath12k uses it to send more parameters to
firmware. As chanctx is needed to extract necessary info for this command,
save it beforehand in ath12k_mac_op_assign_vif_chanctx().

Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.0.c5-00481-QCAHMTSWPL_V1.0_V2.0_SILICONZ-3

Signed-off-by: Baochen Qiang <quic_bqiang@quicinc.com>
Reviewed-by: Vasanthakumar Thiagarajan <vasanthakumar.thiagarajan@oss.qualcomm.com>
Link: https://patch.msgid.link/20250418-ath12k-6g-lp-vlp-v1-15-c869c86cad60@quicinc.com
Signed-off-by: Jeff Johnson <jeff.johnson@oss.qualcomm.com>

diff --git a/drivers/net/wireless/ath/ath12k/mac.c b/drivers/net/wireless/ath/ath12k/mac.c
index 0a53885d4f6a68f81f519a6f3ecd3a630450ff15..af0164f088243564c39b71a7e30c1f12ccae26a6 100644 (file)
--- a/drivers/net/wireless/ath/ath12k/mac.c
+++ b/drivers/net/wireless/ath/ath12k/mac.c
@@ -3739,6 +3739,18 @@ static void ath12k_mac_vif_setup_ps(struct ath12k_link_vif *arvif)
                            psmode, arvif->vdev_id, ret);
 }
 
+static bool ath12k_mac_supports_station_tpc(struct ath12k *ar,
+                                           struct ath12k_vif *ahvif,
+                                           const struct cfg80211_chan_def *chandef)
+{
+       return ath12k_wmi_supports_6ghz_cc_ext(ar) &&
+               test_bit(WMI_TLV_SERVICE_EXT_TPC_REG_SUPPORT, ar->ab->wmi_ab.svc_map) &&
+               ahvif->vdev_type == WMI_VDEV_TYPE_STA &&
+               ahvif->vdev_subtype == WMI_VDEV_SUBTYPE_NONE &&
+               chandef->chan &&
+               chandef->chan->band == NL80211_BAND_6GHZ;
+}
+
 static void ath12k_mac_bss_info_changed(struct ath12k *ar,
                                        struct ath12k_link_vif *arvif,
                                        struct ieee80211_bss_conf *info,
@@ -9360,6 +9372,15 @@ ath12k_mac_vdev_start_restart(struct ath12k_link_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 (ath12k_mac_supports_station_tpc(ar, ahvif, chandef)) {
+               ath12k_mac_fill_reg_tpc_info(ar, arvif, ctx);
+               ath12k_wmi_send_vdev_set_tpc_power(ar, arvif->vdev_id,
+                                                  &arvif->reg_tpc_info);
+       }
+
        ar->num_started_vdevs++;
        ath12k_dbg(ab, ATH12K_DBG_MAC,  "vdev %pM started, vdev_id %d\n",
                   ahvif->vif->addr, arvif->vdev_id);

diff --git a/drivers/net/wireless/ath/ath12k/wmi.h b/drivers/net/wireless/ath/ath12k/wmi.h
index 9d4ea4f359a7b12f80701baf422183fae6a55efe..d0a79a907dc752e65e3da852b66e1eda17b705c6 100644 (file)
--- a/drivers/net/wireless/ath/ath12k/wmi.h
+++ b/drivers/net/wireless/ath/ath12k/wmi.h
@@ -2220,6 +2220,8 @@ enum wmi_tlv_service {
 
        WMI_MAX_EXT_SERVICE = 256,
 
+       WMI_TLV_SERVICE_EXT_TPC_REG_SUPPORT = 280,
+
        WMI_TLV_SERVICE_REG_CC_EXT_EVENT_SUPPORT = 281,
 
        WMI_TLV_SERVICE_11BE = 289,