1 files changed, 109 insertions, 10 deletions

diff --git a/drivers/net/wireless/iwlwifi/mvm/debugfs-vif.c b/drivers/net/wireless/iwlwifi/mvm/debugfs-vif.c
index 0e29cd83a06a..9b59e1d7ae71 100644
--- a/drivers/net/wireless/iwlwifi/mvm/debugfs-vif.c
+++ b/drivers/net/wireless/iwlwifi/mvm/debugfs-vif.c
@@ -185,7 +185,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_mode(mvm, vif);
+        ret = iwl_mvm_power_update_mac(mvm, vif);
         mutex_unlock(&mvm->mutex);
 
         return ret ?: count;
@@ -202,7 +202,7 @@ static ssize_t iwl_dbgfs_pm_params_read(struct file *file,
         int bufsz = sizeof(buf);
         int pos;
 
-        pos = iwl_mvm_power_dbgfs_read(mvm, vif, buf, bufsz);
+        pos = iwl_mvm_power_mac_dbgfs_read(mvm, vif, buf, bufsz);
 
         return simple_read_from_buffer(user_buf, count, ppos, buf, pos);
 }
@@ -225,6 +225,29 @@ static ssize_t iwl_dbgfs_mac_params_read(struct file *file,
 
         ap_sta_id = mvmvif->ap_sta_id;
 
+        switch (ieee80211_vif_type_p2p(vif)) {
+        case NL80211_IFTYPE_ADHOC:
+                pos += scnprintf(buf+pos, bufsz-pos, "type: ibss\n");
+                break;
+        case NL80211_IFTYPE_STATION:
+                pos += scnprintf(buf+pos, bufsz-pos, "type: bss\n");
+                break;
+        case NL80211_IFTYPE_AP:
+                pos += scnprintf(buf+pos, bufsz-pos, "type: ap\n");
+                break;
+        case NL80211_IFTYPE_P2P_CLIENT:
+                pos += scnprintf(buf+pos, bufsz-pos, "type: p2p client\n");
+                break;
+        case NL80211_IFTYPE_P2P_GO:
+                pos += scnprintf(buf+pos, bufsz-pos, "type: p2p go\n");
+                break;
+        case NL80211_IFTYPE_P2P_DEVICE:
+                pos += scnprintf(buf+pos, bufsz-pos, "type: p2p dev\n");
+                break;
+        default:
+                break;
+        }
+
         pos += scnprintf(buf+pos, bufsz-pos, "mac id/color: %d / %d\n",
                          mvmvif->id, mvmvif->color);
         pos += scnprintf(buf+pos, bufsz-pos, "bssid: %pM\n",
@@ -249,9 +272,10 @@ 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\n",
+                                         "ap_sta_id %d - reduced Tx power %d force %d\n",
                                          ap_sta_id,
-                                         mvm_sta->bt_reduced_txpower);
+                                         mvm_sta->bt_reduced_txpower,
+                                         mvm_sta->bt_reduced_txpower_dbg);
                 }
         }
 
@@ -269,6 +293,41 @@ 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)
 {
@@ -403,9 +462,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);
+                ret = iwl_mvm_disable_beacon_filter(mvm, vif, CMD_SYNC);
         else
-                ret = iwl_mvm_enable_beacon_filter(mvm, vif);
+                ret = iwl_mvm_enable_beacon_filter(mvm, vif, CMD_SYNC);
         mutex_unlock(&mvm->mutex);
 
         return ret ?: count;
@@ -460,6 +519,41 @@ static ssize_t iwl_dbgfs_bf_params_read(struct file *file,
         return simple_read_from_buffer(user_buf, count, ppos, buf, pos);
 }
 
+static ssize_t iwl_dbgfs_low_latency_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;
+        u8 value;
+        int ret;
+
+        ret = kstrtou8(buf, 0, &value);
+        if (ret)
+                return ret;
+        if (value > 1)
+                return -EINVAL;
+
+        mutex_lock(&mvm->mutex);
+        iwl_mvm_update_low_latency(mvm, vif, value);
+        mutex_unlock(&mvm->mutex);
+
+        return count;
+}
+
+static ssize_t iwl_dbgfs_low_latency_read(struct file *file,
+                                          char __user *user_buf,
+                                          size_t count, loff_t *ppos)
+{
+        struct ieee80211_vif *vif = file->private_data;
+        struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);
+        char buf[3];
+
+        buf[0] = mvmvif->low_latency ? '1' : '0';
+        buf[1] = '\n';
+        buf[2] = '\0';
+        return simple_read_from_buffer(user_buf, count, ppos, buf, sizeof(buf));
+}
+
 #define MVM_DEBUGFS_WRITE_FILE_OPS(name, bufsz) \
         _MVM_DEBUGFS_WRITE_FILE_OPS(name, bufsz, struct ieee80211_vif)
 #define MVM_DEBUGFS_READ_WRITE_FILE_OPS(name, bufsz) \
@@ -473,6 +567,8 @@ static ssize_t iwl_dbgfs_bf_params_read(struct file *file,
 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)
 {
@@ -496,15 +592,18 @@ void iwl_mvm_vif_dbgfs_register(struct iwl_mvm *mvm, struct ieee80211_vif *vif)
                 return;
         }
 
-        if (iwlmvm_mod_params.power_scheme != IWL_POWER_SCHEME_CAM &&
+        if ((mvm->fw->ucode_capa.flags & IWL_UCODE_TLV_FLAGS_PM_CMD_SUPPORT) &&
+            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_P2P_PS)))
+              mvm->fw->ucode_capa.flags & IWL_UCODE_TLV_FLAGS_BSS_P2P_PS_DCM)))
                 MVM_DEBUGFS_ADD_FILE_VIF(pm_params, mvmvif->dbgfs_dir, S_IWUSR |
                                          S_IRUSR);
 
-        MVM_DEBUGFS_ADD_FILE_VIF(mac_params, mvmvif->dbgfs_dir,
-                                 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);
 
         if (vif->type == NL80211_IFTYPE_STATION && !vif->p2p &&
             mvmvif == mvm->bf_allowed_vif)