wifi: iwlwifi: mld: Revert "wifi: iwlwifi: mld: add kunit test for emlsr with bt on"

Due to a hw bug, this feature won't be enabled. Revert its tests.
This reverts commit f7cc80b871ee ("wifi: iwlwifi: mld: add kunit test
for emlsr with bt on")

Reviewed-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://patch.msgid.link/20250711183056.5fdf77497ad2.I1160f1dcff734cb42baa8fbf8aac121a1a24a4c5@changeid

diff --git a/drivers/net/wireless/intel/iwlwifi/mld/mlo.c b/drivers/net/wireless/intel/iwlwifi/mld/mlo.c
index be66a71a0fd78128c9ac6efea3e09d4c1fd70b3d..d002d2772a1da15ac1d9aaefbd653ba2dd6a7317 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mld/mlo.c
+++ b/drivers/net/wireless/intel/iwlwifi/mld/mlo.c
@@ -693,8 +693,7 @@ s8 iwl_mld_get_emlsr_rssi_thresh(struct iwl_mld *mld,
 #define IWL_MLD_BT_COEX_ENABLE_EMLSR_RSSI_THRESH       -63
 #define IWL_MLD_BT_COEX_WIFI_LOSS_THRESH               7
 
-VISIBLE_IF_IWLWIFI_KUNIT
-bool
+static bool
 iwl_mld_bt_allows_emlsr(struct iwl_mld *mld, struct ieee80211_bss_conf *link,
                        bool check_entry)
 {
@@ -723,7 +722,6 @@ iwl_mld_bt_allows_emlsr(struct iwl_mld *mld, struct ieee80211_bss_conf *link,
                      link->link_id, bt_penalty);
        return bt_penalty < IWL_MLD_BT_COEX_WIFI_LOSS_THRESH;
 }
-EXPORT_SYMBOL_IF_IWLWIFI_KUNIT(iwl_mld_bt_allows_emlsr);
 
 static u32
 iwl_mld_emlsr_disallowed_with_link(struct iwl_mld *mld,

diff --git a/drivers/net/wireless/intel/iwlwifi/mld/mlo.h b/drivers/net/wireless/intel/iwlwifi/mld/mlo.h
index 704f64134798fbb398bd70ebe3694e00b48c4ddb..d936589fe39dce3f3ce22373ed610294cd2274ff 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mld/mlo.h
+++ b/drivers/net/wireless/intel/iwlwifi/mld/mlo.h
@@ -163,10 +163,6 @@ void iwl_mld_emlsr_block_tmp_non_bss(struct iwl_mld *mld);
 u32 iwl_mld_emlsr_pair_state(struct ieee80211_vif *vif,
                             struct iwl_mld_link_sel_data *a,
                             struct iwl_mld_link_sel_data *b);
-
-bool iwl_mld_bt_allows_emlsr(struct iwl_mld *mld,
-                            struct ieee80211_bss_conf *link,
-                            bool entry_criteria);
 #endif
 
 void iwl_mld_start_ignoring_tpt_updates(struct iwl_mld *mld);

diff --git a/drivers/net/wireless/intel/iwlwifi/mld/tests/Makefile b/drivers/net/wireless/intel/iwlwifi/mld/tests/Makefile
index 3e2ae602061334e2fa37e722b8abbcaf4f91fb41..36317feb923ba02e833d77f56b200889a44b2379 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mld/tests/Makefile
+++ b/drivers/net/wireless/intel/iwlwifi/mld/tests/Makefile
@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause
-iwlmld-tests-y += module.o hcmd.o utils.o link.o rx.o agg.o link-selection.o emlsr_with_bt.o
+iwlmld-tests-y += module.o hcmd.o utils.o link.o rx.o agg.o link-selection.o
 
 ccflags-y += -I$(src)/../
 obj-$(CONFIG_IWLWIFI_KUNIT_TESTS) += iwlmld-tests.o

diff --git a/drivers/net/wireless/intel/iwlwifi/mld/tests/emlsr_with_bt.c b/drivers/net/wireless/intel/iwlwifi/mld/tests/emlsr_with_bt.c
deleted file mode 100644 (file)
index 91556ee..0000000
--- a/drivers/net/wireless/intel/iwlwifi/mld/tests/emlsr_with_bt.c
+++ /dev/null
@@ -1,140 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause
-/*
- * KUnit tests for link selection functions
- *
- * Copyright (C) 2025 Intel Corporation
- */
-#include <kunit/static_stub.h>
-
-#include "utils.h"
-#include "mld.h"
-#include "mlo.h"
-
-static const struct emlsr_with_bt_test_case {
-       const char *desc;
-       struct {
-               struct iwl_bt_coex_profile_notif notif;
-               s32 signal;
-               bool check_entry;
-       } input;
-       bool emlsr_allowed;
-} emlsr_with_bt_cases[] = {
-       {
-               .desc = "BT penalty(exit) with low rssi 4.5: emlsr allowed",
-               .input = {
-                       .notif.wifi_loss_low_rssi[1] = {4, 5},
-                       .notif.wifi_loss_mid_high_rssi[1] = {7, 9},
-                       .signal = -69,
-                       .check_entry = false,
-               },
-               .emlsr_allowed = true,
-       },
-       {
-               .desc = "BT penalty(exit) from high rssi 5: emlsr allowed",
-               .input = {
-                       .notif.wifi_loss_low_rssi[1] = {7, 9},
-                       .notif.wifi_loss_mid_high_rssi[1] = {5, 5},
-                       .signal = -68,
-                       .check_entry = false,
-               },
-               .emlsr_allowed = true,
-       },
-       {
-               .desc = "BT penalty(exit) with low rssi 8: emlsr not allowed",
-               .input = {
-                       .notif.wifi_loss_low_rssi[1] = {7, 9},
-                       .notif.wifi_loss_mid_high_rssi[1] = {4, 5},
-                       .signal = -69,
-                       .check_entry = false,
-               },
-               .emlsr_allowed = false,
-       },
-       {
-               .desc = "BT penalty(exit) from high rssi 9: emlsr not allowed",
-               .input = {
-                       .notif.wifi_loss_low_rssi[1] = {4, 5},
-                       .notif.wifi_loss_mid_high_rssi[1] = {9, 9},
-                       .signal = -68,
-                       .check_entry = false,
-               },
-               .emlsr_allowed = false,
-       },
-       {
-               .desc = "BT penalty(entry) with low rssi 4.5: emlsr allowed",
-               .input = {
-                       .notif.wifi_loss_low_rssi[1] = {4, 5},
-                       .notif.wifi_loss_mid_high_rssi[1] = {7, 9},
-                       .signal = -63,
-                       .check_entry = true,
-               },
-               .emlsr_allowed = true,
-       },
-       {
-               .desc = "BT penalty(entry) from high rssi 5: emlsr allowed",
-               .input = {
-                       .notif.wifi_loss_low_rssi[1] = {7, 9},
-                       .notif.wifi_loss_mid_high_rssi[1] = {5, 5},
-                       .signal = -62,
-                       .check_entry = false,
-               },
-               .emlsr_allowed = true,
-       },
-       {
-               .desc = "BT penalty(entry) with low rssi 8: emlsr not allowed",
-               .input = {
-                       .notif.wifi_loss_low_rssi[1] = {7, 9},
-                       .notif.wifi_loss_mid_high_rssi[1] = {4, 5},
-                       .signal = -63,
-                       .check_entry = false,
-               },
-               .emlsr_allowed = true,
-       },
-       {
-               .desc = "BT penalty(entry) from high rssi 9: emlsr not allowed",
-               .input = {
-                       .notif.wifi_loss_low_rssi[1] = {4, 5},
-                       .notif.wifi_loss_mid_high_rssi[1] = {9, 9},
-                       .signal = -62,
-                       .check_entry = true,
-               },
-               .emlsr_allowed = false,
-       },
-};
-
-KUNIT_ARRAY_PARAM_DESC(emlsr_with_bt, emlsr_with_bt_cases, desc);
-
-static void test_emlsr_with_bt(struct kunit *test)
-{
-       struct iwl_mld *mld = test->priv;
-       const struct emlsr_with_bt_test_case *test_param =
-               (const void *)(test->param_value);
-       struct ieee80211_vif *vif =
-               iwlmld_kunit_add_vif(true, NL80211_IFTYPE_STATION);
-       struct ieee80211_bss_conf *link = iwlmld_kunit_add_link(vif, 1);
-       bool actual_value = false;
-
-       KUNIT_ALLOC_AND_ASSERT(test, link->bss);
-
-       /* Extract test case parameters */
-       link->bss->signal = DBM_TO_MBM(test_param->input.signal);
-       memcpy(&mld->last_bt_notif, &test_param->input.notif,
-              sizeof(struct iwl_bt_coex_profile_notif));
-
-       actual_value = iwl_mld_bt_allows_emlsr(mld, link,
-                                              test_param->input.check_entry);
-       /* Assert that the returned value matches the expected emlsr_allowed */
-       KUNIT_EXPECT_EQ(test, actual_value, test_param->emlsr_allowed);
-}
-
-static struct kunit_case emlsr_with_bt_test_cases[] = {
-       KUNIT_CASE_PARAM(test_emlsr_with_bt, emlsr_with_bt_gen_params),
-       {},
-};
-
-static struct kunit_suite emlsr_with_bt = {
-       .name = "iwlmld-emlsr-with-bt-tests",
-       .test_cases = emlsr_with_bt_test_cases,
-       .init = iwlmld_kunit_test_init,
-};
-
-kunit_test_suite(emlsr_with_bt);