1 files changed, 6 insertions, 55 deletions

diff --git a/drivers/net/wireless/iwlwifi/mvm/debugfs-vif.c b/drivers/net/wireless/iwlwifi/mvm/debugfs-vif.c
index 9b59e1d7ae71..2e90ff795c13 100644
--- a/drivers/net/wireless/iwlwifi/mvm/debugfs-vif.c
+++ b/drivers/net/wireless/iwlwifi/mvm/debugfs-vif.c
@@ -103,10 +103,6 @@ static void iwl_dbgfs_update_pm(struct iwl_mvm *mvm,
                 IWL_DEBUG_POWER(mvm, "tx_data_timeout=%d\n", val);
                 dbgfs_pm->tx_data_timeout = val;
                 break;
-        case MVM_DEBUGFS_PM_DISABLE_POWER_OFF:
-                IWL_DEBUG_POWER(mvm, "disable_power_off=%d\n", val);
-                dbgfs_pm->disable_power_off = val;
-                break;
         case MVM_DEBUGFS_PM_LPRX_ENA:
                 IWL_DEBUG_POWER(mvm, "lprx %s\n", val ? "enabled" : "disabled");
                 dbgfs_pm->lprx_ena = val;
@@ -154,12 +150,6 @@ static ssize_t iwl_dbgfs_pm_params_write(struct ieee80211_vif *vif, char *buf,
                 if (sscanf(buf + 16, "%d", &val) != 1)
                         return -EINVAL;
                 param = MVM_DEBUGFS_PM_TX_DATA_TIMEOUT;
-        } else if (!strncmp("disable_power_off=", buf, 18) &&
-                   !(mvm->fw->ucode_capa.flags &
-                     IWL_UCODE_TLV_FLAGS_DEVICE_PS_CMD)) {
-                if (sscanf(buf + 18, "%d", &val) != 1)
-                        return -EINVAL;
-                param = MVM_DEBUGFS_PM_DISABLE_POWER_OFF;
         } else if (!strncmp("lprx=", buf, 5)) {
                 if (sscanf(buf + 5, "%d", &val) != 1)
                         return -EINVAL;
@@ -185,7 +175,7 @@ static ssize_t iwl_dbgfs_pm_params_write(struct ieee80211_vif *vif, char *buf,
 
         mutex_lock(&mvm->mutex);
         iwl_dbgfs_update_pm(mvm, vif, param, val);
-        ret = iwl_mvm_power_update_mac(mvm, vif);
+        ret = iwl_mvm_power_update_mac(mvm);
         mutex_unlock(&mvm->mutex);
 
         return ret ?: count;
@@ -272,10 +262,9 @@ static ssize_t iwl_dbgfs_mac_params_read(struct file *file,
                         struct iwl_mvm_sta *mvm_sta = (void *)sta->drv_priv;
 
                         pos += scnprintf(buf+pos, bufsz-pos,
-                                         "ap_sta_id %d - reduced Tx power %d force %d\n",
+                                         "ap_sta_id %d - reduced Tx power %d\n",
                                          ap_sta_id,
-                                         mvm_sta->bt_reduced_txpower,
-                                         mvm_sta->bt_reduced_txpower_dbg);
+                                         mvm_sta->bt_reduced_txpower);
                 }
         }
 
@@ -293,41 +282,6 @@ static ssize_t iwl_dbgfs_mac_params_read(struct file *file,
         return simple_read_from_buffer(user_buf, count, ppos, buf, pos);
 }
 
-static ssize_t iwl_dbgfs_reduced_txp_write(struct ieee80211_vif *vif,
-                                           char *buf, size_t count,
-                                           loff_t *ppos)
-{
-        struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);
-        struct iwl_mvm *mvm = mvmvif->mvm;
-        struct iwl_mvm_sta *mvmsta;
-        bool reduced_tx_power;
-        int ret;
-
-        if (mvmvif->ap_sta_id >= ARRAY_SIZE(mvm->fw_id_to_mac_id))
-                return -ENOTCONN;
-
-        if (strtobool(buf, &reduced_tx_power) != 0)
-                return -EINVAL;
-
-        mutex_lock(&mvm->mutex);
-
-        mvmsta = iwl_mvm_sta_from_staid_protected(mvm, mvmvif->ap_sta_id);
-        if (IS_ERR_OR_NULL(mvmsta)) {
-                mutex_unlock(&mvm->mutex);
-                return -ENOTCONN;
-        }
-
-        mvmsta->bt_reduced_txpower_dbg = false;
-        ret = iwl_mvm_bt_coex_reduced_txp(mvm, mvmvif->ap_sta_id,
-                                          reduced_tx_power);
-        if (!ret)
-                mvmsta->bt_reduced_txpower_dbg = true;
-
-        mutex_unlock(&mvm->mutex);
-
-        return ret ? : count;
-}
-
 static void iwl_dbgfs_update_bf(struct ieee80211_vif *vif,
                                 enum iwl_dbgfs_bf_mask param, int value)
 {
@@ -462,9 +416,9 @@ static ssize_t iwl_dbgfs_bf_params_write(struct ieee80211_vif *vif, char *buf,
         mutex_lock(&mvm->mutex);
         iwl_dbgfs_update_bf(vif, param, value);
         if (param == MVM_DEBUGFS_BF_ENABLE_BEACON_FILTER && !value)
-                ret = iwl_mvm_disable_beacon_filter(mvm, vif, CMD_SYNC);
+                ret = iwl_mvm_disable_beacon_filter(mvm, vif, 0);
         else
-                ret = iwl_mvm_enable_beacon_filter(mvm, vif, CMD_SYNC);
+                ret = iwl_mvm_enable_beacon_filter(mvm, vif, 0);
         mutex_unlock(&mvm->mutex);
 
         return ret ?: count;
@@ -568,7 +522,6 @@ MVM_DEBUGFS_READ_FILE_OPS(mac_params);
 MVM_DEBUGFS_READ_WRITE_FILE_OPS(pm_params, 32);
 MVM_DEBUGFS_READ_WRITE_FILE_OPS(bf_params, 256);
 MVM_DEBUGFS_READ_WRITE_FILE_OPS(low_latency, 10);
-MVM_DEBUGFS_WRITE_FILE_OPS(reduced_txp, 10);
 
 void iwl_mvm_vif_dbgfs_register(struct iwl_mvm *mvm, struct ieee80211_vif *vif)
 {
@@ -592,8 +545,7 @@ void iwl_mvm_vif_dbgfs_register(struct iwl_mvm *mvm, struct ieee80211_vif *vif)
                 return;
         }
 
-        if ((mvm->fw->ucode_capa.flags & IWL_UCODE_TLV_FLAGS_PM_CMD_SUPPORT) &&
-            iwlmvm_mod_params.power_scheme != IWL_POWER_SCHEME_CAM &&
+        if (iwlmvm_mod_params.power_scheme != IWL_POWER_SCHEME_CAM &&
             ((vif->type == NL80211_IFTYPE_STATION && !vif->p2p) ||
              (vif->type == NL80211_IFTYPE_STATION && vif->p2p &&
               mvm->fw->ucode_capa.flags & IWL_UCODE_TLV_FLAGS_BSS_P2P_PS_DCM)))
@@ -601,7 +553,6 @@ void iwl_mvm_vif_dbgfs_register(struct iwl_mvm *mvm, struct ieee80211_vif *vif)
                                          S_IRUSR);
 
         MVM_DEBUGFS_ADD_FILE_VIF(mac_params, mvmvif->dbgfs_dir, S_IRUSR);
-        MVM_DEBUGFS_ADD_FILE_VIF(reduced_txp, mvmvif->dbgfs_dir, S_IWUSR);
         MVM_DEBUGFS_ADD_FILE_VIF(low_latency, mvmvif->dbgfs_dir,
                                  S_IRUSR | S_IWUSR);