wifi: iwlwifi: mld: support the new statistics APIs

This new API adds information about Coexistence.
It changes the layout of the notification, adapt the code accordingly.

Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Link: https://patch.msgid.link/20260512082114.04ccf0f3f2c6.Iaff5ac57a53fe62ea7c1313bc57a81b23b1e2fdf@changeid
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>

diff --git a/drivers/net/wireless/intel/iwlwifi/mld/notif.c b/drivers/net/wireless/intel/iwlwifi/mld/notif.c
index f7aeff61d7855188b36f0055ebde623208437d8f..69225125711641a7032e0aa458100104e120c0db 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mld/notif.c
+++ b/drivers/net/wireless/intel/iwlwifi/mld/notif.c
@@ -330,7 +330,8 @@ CMD_VERSIONS(probe_resp_data_notif,
 CMD_VERSIONS(datapath_monitor_notif,
             CMD_VER_ENTRY(1, iwl_datapath_monitor_notif))
 CMD_VERSIONS(stats_oper_notif,
-            CMD_VER_ENTRY(3, iwl_system_statistics_notif_oper_v3))
+            CMD_VER_ENTRY(3, iwl_system_statistics_notif_oper_v3)
+            CMD_VER_ENTRY(4, iwl_system_statistics_notif_oper))
 CMD_VERSIONS(stats_oper_part1_notif,
             CMD_VER_ENTRY(4, iwl_system_statistics_part1_notif_oper))
 CMD_VERSIONS(bt_coex_notif,

diff --git a/drivers/net/wireless/intel/iwlwifi/mld/stats.c b/drivers/net/wireless/intel/iwlwifi/mld/stats.c
index 714d66324e9f4db60cbf7097eb670453da4b1793..6e826797f63732c275ef71d0b8d098f6da9de741 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mld/stats.c
+++ b/drivers/net/wireless/intel/iwlwifi/mld/stats.c
@@ -40,13 +40,21 @@ iwl_mld_fill_stats_from_oper_notif(struct iwl_mld *mld,
                                   struct iwl_rx_packet *pkt,
                                   u8 fw_sta_id, struct station_info *sinfo)
 {
-       const struct iwl_system_statistics_notif_oper_v3 *notif =
-               (void *)&pkt->data;
-       const struct iwl_stats_ntfy_per_sta *per_sta =
-               &notif->per_sta[fw_sta_id];
+       const struct iwl_stats_ntfy_per_sta *per_sta;
        struct ieee80211_link_sta *link_sta;
        struct iwl_mld_link_sta *mld_link_sta;
 
+       if (iwl_fw_lookup_notif_ver(mld->fw, STATISTICS_GROUP,
+                                   STATISTICS_OPER_NOTIF, 3) >= 4) {
+               const struct iwl_system_statistics_notif_oper *notif =
+                       (void *)&pkt->data;
+               per_sta = &notif->per_sta[fw_sta_id];
+       } else {
+               const struct iwl_system_statistics_notif_oper_v3 *notif =
+                       (void *)&pkt->data;
+               per_sta = &notif->per_sta[fw_sta_id];
+       }
+
        /* 0 isn't a valid value, but FW might send 0.
         * In that case, set the latest non-zero value we stored
         */
@@ -483,7 +491,7 @@ static void iwl_mld_fill_chanctx_stats(struct ieee80211_hw *hw,
                                       void *data)
 {
        struct iwl_mld_phy *phy = iwl_mld_phy_from_mac80211(ctx);
-       const struct iwl_stats_ntfy_per_phy_v1 *per_phy = data;
+       const struct iwl_stats_ntfy_per_phy *per_phy = data;
        u32 new_load, old_load;
 
        if (WARN_ON(phy->fw_id >= IWL_STATS_MAX_PHY_OPERATIONAL))
@@ -512,7 +520,7 @@ static void iwl_mld_fill_chanctx_stats(struct ieee80211_hw *hw,
 
 static void
 iwl_mld_process_per_phy_stats(struct iwl_mld *mld,
-                             const struct iwl_stats_ntfy_per_phy_v1 *per_phy)
+                             const struct iwl_stats_ntfy_per_phy *per_phy)
 {
        ieee80211_iter_chan_contexts_mtx(mld->hw,
                                         iwl_mld_fill_chanctx_stats,
@@ -523,17 +531,42 @@ iwl_mld_process_per_phy_stats(struct iwl_mld *mld,
 void iwl_mld_handle_stats_oper_notif(struct iwl_mld *mld,
                                     struct iwl_rx_packet *pkt)
 {
-       const struct iwl_system_statistics_notif_oper_v3 *stats =
+       struct iwl_system_statistics_notif_oper *_notif __free(kfree) = NULL;
+       const struct iwl_system_statistics_notif_oper *notif =
                (void *)&pkt->data;
-       u32 curr_ts_usec = le32_to_cpu(stats->time_stamp);
 
-       BUILD_BUG_ON(ARRAY_SIZE(stats->per_sta) != IWL_STATION_COUNT_MAX);
-       BUILD_BUG_ON(ARRAY_SIZE(stats->per_link) <
+       BUILD_BUG_ON(ARRAY_SIZE(notif->per_sta) != IWL_STATION_COUNT_MAX);
+       BUILD_BUG_ON(ARRAY_SIZE(notif->per_link) <
                     ARRAY_SIZE(mld->fw_id_to_bss_conf));
 
-       iwl_mld_process_per_link_stats(mld, stats->per_link, curr_ts_usec);
-       iwl_mld_process_per_sta_stats(mld, stats->per_sta);
-       iwl_mld_process_per_phy_stats(mld, stats->per_phy);
+       if (iwl_fw_lookup_notif_ver(mld->fw, STATISTICS_GROUP,
+                                   STATISTICS_OPER_NOTIF, 3) == 3) {
+               const struct iwl_system_statistics_notif_oper_v3 *stats =
+                       (void *)&pkt->data;
+               _notif = kzalloc_obj(*_notif);
+
+               if (!_notif)
+                       return;
+
+               _notif->time_stamp = stats->time_stamp;
+               for (int i = 0; i < ARRAY_SIZE(_notif->per_link); i++)
+                       _notif->per_link[i] = stats->per_link[i];
+
+               BUILD_BUG_ON(sizeof(_notif->per_phy[0]) <
+                            sizeof(stats->per_phy[0]));
+               for (int i = 0; i < ARRAY_SIZE(_notif->per_phy); i++)
+                       memcpy(&_notif->per_phy[i], &stats->per_phy[i],
+                              sizeof(stats->per_phy[i]));
+               for (int i = 0; i < ARRAY_SIZE(_notif->per_sta); i++)
+                       _notif->per_sta[i] = stats->per_sta[i];
+
+               notif = _notif;
+       }
+
+       iwl_mld_process_per_link_stats(mld, notif->per_link,
+                                      le32_to_cpu(notif->time_stamp));
+       iwl_mld_process_per_sta_stats(mld, notif->per_sta);
+       iwl_mld_process_per_phy_stats(mld, notif->per_phy);
 }
 
 void iwl_mld_handle_stats_oper_part1_notif(struct iwl_mld *mld,