wifi: iwlwifi: cleanup BT Shared Single Antenna code

We don't support such device.

Reviewed-by: Gregory Greenman <gregory.greenman@intel.com>
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://msgid.link/20231219215605.6e6961ac0ac5.I923024eac20efd24a5b42332d8e73ae756e0469a@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-config.h b/drivers/net/wireless/intel/iwlwifi/iwl-config.h
index 02ded22295c1cebbc529275579700a7aeb7c59b9..ae6f1cd4d66050499c50c8dd8645f227a3b70528 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/iwl-config.h
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-config.h
@@ -377,7 +377,6 @@ struct iwl_cfg {
        u16 nvm_calib_ver;
        u32 rx_with_siso_diversity:1,
            tx_with_siso_diversity:1,
-           bt_shared_single_ant:1,
            internal_wimax_coex:1,
            host_interrupt_operation_mode:1,
            high_temp:1,

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/coex.c b/drivers/net/wireless/intel/iwlwifi/mvm/coex.c
index 5a5b1128e75ca36f327d2b040f77dafddc64adeb..9fe1761691ec9313326c443aa181017cf703a2da 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/coex.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/coex.c
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause
 /*
- * Copyright (C) 2013-2014, 2018-2020, 2022 Intel Corporation
+ * Copyright (C) 2013-2014, 2018-2020, 2022-2023 Intel Corporation
  * Copyright (C) 2013-2015 Intel Mobile Communications GmbH
  */
 #include <linux/ieee80211.h>
@@ -116,11 +116,6 @@ iwl_get_coex_type(struct iwl_mvm *mvm, const struct ieee80211_vif *vif)
 
        ret = BT_COEX_TX_DIS_LUT;
 
-       if (mvm->cfg->bt_shared_single_ant) {
-               rcu_read_unlock();
-               return ret;
-       }
-
        phy_ctx_id = *((u16 *)chanctx_conf->drv_priv);
        primary_ch_phy_id = le32_to_cpu(mvm->last_bt_ci_cmd.primary_ch_phy_id);
        secondary_ch_phy_id =
@@ -383,13 +378,12 @@ static void iwl_mvm_bt_notif_per_link(struct iwl_mvm *mvm,
        /*
         * don't reduce the Tx power if one of these is true:
         *  we are in LOOSE
-        *  single share antenna product
         *  BT is inactive
         *  we are not associated
         */
        if (iwl_get_coex_type(mvm, vif) == BT_COEX_LOOSE_LUT ||
-           mvm->cfg->bt_shared_single_ant || !vif->cfg.assoc ||
-           le32_to_cpu(mvm->last_bt_notif.bt_activity_grading) == BT_OFF) {
+           le32_to_cpu(mvm->last_bt_notif.bt_activity_grading) == BT_OFF ||
+           !vif->cfg.assoc) {
                iwl_mvm_bt_coex_reduced_txp(mvm, link_info->ap_sta_id, false);
                /* FIXME: should this be per link? */
                iwl_mvm_bt_coex_enable_rssi_event(mvm, vif, false, 0);
@@ -570,7 +564,7 @@ void iwl_mvm_bt_rssi_event(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
         * Check if rssi is good enough for reduced Tx power, but not in loose
         * scheme.
         */
-       if (rssi_event == RSSI_EVENT_LOW || mvm->cfg->bt_shared_single_ant ||
+       if (rssi_event == RSSI_EVENT_LOW ||
            iwl_get_coex_type(mvm, vif) == BT_COEX_LOOSE_LUT)
                ret = iwl_mvm_bt_coex_reduced_txp(mvm,
                                                  mvmvif->deflink.ap_sta_id,
@@ -639,10 +633,6 @@ bool iwl_mvm_bt_coex_is_mimo_allowed(struct iwl_mvm *mvm,
 
 bool iwl_mvm_bt_coex_is_ant_avail(struct iwl_mvm *mvm, u8 ant)
 {
-       /* there is no other antenna, shared antenna is always available */
-       if (mvm->cfg->bt_shared_single_ant)
-               return true;
-
        if (ant & mvm->cfg->non_shared_ant)
                return true;
 
@@ -652,10 +642,6 @@ bool iwl_mvm_bt_coex_is_ant_avail(struct iwl_mvm *mvm, u8 ant)
 
 bool iwl_mvm_bt_coex_is_shared_ant_avail(struct iwl_mvm *mvm)
 {
-       /* there is no other antenna, shared antenna is always available */
-       if (mvm->cfg->bt_shared_single_ant)
-               return true;
-
        return le32_to_cpu(mvm->last_bt_notif.bt_activity_grading) < BT_HIGH_TRAFFIC;
 }