wifi: ath12k: update regulatory rules when interface added

There are two power types for 6 GHz regulatory, one is AP, another is
client. The client power type is used for station interface, and AP
power type is used for AP/mesh point interface.

When firmware boots up, WMI_REG_CHAN_LIST_CC_EXT_EVENTID is sent from
firmware at an early stage, the interface mode is not decided at this
point, then ath12k select reg rules of AP type as default.

After interface created, ath12k needs to update reg rules to the exact
power type matching the interface type.

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-8-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 5cfd50d0c666092f1e1bbc01bf179d5c69433cb0..a603d66a75bd00e1ee8c3feede6f8e86ce884d79 100644 (file)
--- a/drivers/net/wireless/ath/ath12k/mac.c
+++ b/drivers/net/wireless/ath/ath12k/mac.c
@@ -8753,7 +8753,10 @@ static int ath12k_mac_op_add_interface(struct ieee80211_hw *hw,
 {
        struct ath12k_hw *ah = ath12k_hw_to_ah(hw);
        struct ath12k_vif *ahvif = ath12k_vif_to_ahvif(vif);
+       struct ath12k_reg_info *reg_info;
        struct ath12k_link_vif *arvif;
+       struct ath12k_base *ab;
+       struct ath12k *ar;
        int i;
 
        lockdep_assert_wiphy(hw->wiphy);
@@ -8775,6 +8778,18 @@ static int ath12k_mac_op_add_interface(struct ieee80211_hw *hw,
 
        ath12k_mac_determine_vdev_type(vif, ahvif);
 
+       for_each_ar(ah, ar, i) {
+               if (!ath12k_wmi_supports_6ghz_cc_ext(ar))
+                       continue;
+
+               ab = ar->ab;
+               reg_info = ab->reg_info[ar->pdev_idx];
+               ath12k_dbg(ab, ATH12K_DBG_MAC, "interface added to change reg rules\n");
+               ath12k_reg_handle_chan_list(ab, reg_info, ahvif->vdev_type,
+                                           IEEE80211_REG_UNSET_AP);
+               break;
+       }
+
        /* Defer vdev creation until assign_chanctx or hw_scan is initiated as driver
         * will not know if this interface is an ML vif at this point.
         */

diff --git a/drivers/net/wireless/ath/ath12k/wmi.c b/drivers/net/wireless/ath/ath12k/wmi.c
index 80b8cad5bc78ca0cf27383e594ea6f48887a1910..385f59077050ce89aa9aab19b0ffc9af98e35549 100644 (file)
--- a/drivers/net/wireless/ath/ath12k/wmi.c
+++ b/drivers/net/wireless/ath/ath12k/wmi.c
@@ -9819,3 +9819,9 @@ int ath12k_wmi_mlo_teardown(struct ath12k *ar)
 
        return 0;
 }
+
+bool ath12k_wmi_supports_6ghz_cc_ext(struct ath12k *ar)
+{
+       return test_bit(WMI_TLV_SERVICE_REG_CC_EXT_EVENT_SUPPORT,
+                       ar->ab->wmi_ab.svc_map) && ar->supports_6ghz;
+}

diff --git a/drivers/net/wireless/ath/ath12k/wmi.h b/drivers/net/wireless/ath/ath12k/wmi.h
index 3eb57cc8509de3de8ebf6fc7a3d2f68dd7a6f369..5f0f9f120497c5746ae9175c3fa9e119a61ab91c 100644 (file)
--- a/drivers/net/wireless/ath/ath12k/wmi.h
+++ b/drivers/net/wireless/ath/ath12k/wmi.h
@@ -6132,5 +6132,6 @@ int ath12k_wmi_mlo_teardown(struct ath12k *ar);
 void ath12k_wmi_fw_stats_dump(struct ath12k *ar,
                              struct ath12k_fw_stats *fw_stats, u32 stats_id,
                              char *buf);
+bool ath12k_wmi_supports_6ghz_cc_ext(struct ath12k *ar);
 
 #endif