1 files changed, 67 insertions, 16 deletions

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c b/drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c
index 0e6401cd7ccc..3b6b3d8fb961 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c
@@ -19,11 +19,6 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110,
- * USA
- *
  * The full GNU General Public License is included in this distribution
  * in the file called COPYING.
  *
@@ -671,16 +666,11 @@ iwl_dbgfs_bt_force_ant_write(struct iwl_mvm *mvm, char *buf,
         };
         int ret, bt_force_ant_mode;
 
-        for (bt_force_ant_mode = 0;
-             bt_force_ant_mode < ARRAY_SIZE(modes_str);
-             bt_force_ant_mode++) {
-                if (!strcmp(buf, modes_str[bt_force_ant_mode]))
-                        break;
-        }
-
-        if (bt_force_ant_mode >= ARRAY_SIZE(modes_str))
-                return -EINVAL;
+        ret = match_string(modes_str, ARRAY_SIZE(modes_str), buf);
+        if (ret < 0)
+                return ret;
 
+        bt_force_ant_mode = ret;
         ret = 0;
         mutex_lock(&mvm->mutex);
         if (mvm->bt_force_ant_mode == bt_force_ant_mode)
@@ -1150,6 +1140,10 @@ static ssize_t iwl_dbgfs_inject_packet_write(struct iwl_mvm *mvm,
         struct iwl_rx_mpdu_desc *desc;
         int bin_len = count / 2;
         int ret = -EINVAL;
+        size_t mpdu_cmd_hdr_size =
+                (mvm->trans->cfg->device_family >= IWL_DEVICE_FAMILY_22560) ?
+                sizeof(struct iwl_rx_mpdu_desc) :
+                IWL_RX_DESC_SIZE_V1;
 
         if (!iwl_mvm_firmware_running(mvm))
                 return -EIO;
@@ -1168,7 +1162,7 @@ static ssize_t iwl_dbgfs_inject_packet_write(struct iwl_mvm *mvm,
                 goto out;
 
         /* avoid invalid memory access */
-        if (bin_len < sizeof(*pkt) + sizeof(*desc))
+        if (bin_len < sizeof(*pkt) + mpdu_cmd_hdr_size)
                 goto out;
 
         /* check this is RX packet */
@@ -1179,7 +1173,7 @@ static ssize_t iwl_dbgfs_inject_packet_write(struct iwl_mvm *mvm,
         /* check the length in metadata matches actual received length */
         desc = (void *)pkt->data;
         if (le16_to_cpu(desc->mpdu_len) !=
-            (bin_len - sizeof(*desc) - sizeof(*pkt)))
+            (bin_len - mpdu_cmd_hdr_size - sizeof(*pkt)))
                 goto out;
 
         local_bh_disable();
@@ -1728,6 +1722,56 @@ iwl_dbgfs_send_echo_cmd_write(struct iwl_mvm *mvm, char *buf,
         return ret ?: count;
 }
 
+static ssize_t
+iwl_dbgfs_he_sniffer_params_write(struct iwl_mvm *mvm, char *buf,
+                        size_t count, loff_t *ppos)
+{
+        struct iwl_he_monitor_cmd he_mon_cmd = {};
+        u32 aid;
+        int ret;
+
+        if (!iwl_mvm_firmware_running(mvm))
+                return -EIO;
+
+        ret = sscanf(buf, "%x %2hhx:%2hhx:%2hhx:%2hhx:%2hhx:%2hhx", &aid,
+                     &he_mon_cmd.bssid[0], &he_mon_cmd.bssid[1],
+                     &he_mon_cmd.bssid[2], &he_mon_cmd.bssid[3],
+                     &he_mon_cmd.bssid[4], &he_mon_cmd.bssid[5]);
+        if (ret != 7)
+                return -EINVAL;
+
+        he_mon_cmd.aid = cpu_to_le16(aid);
+
+        mutex_lock(&mvm->mutex);
+        ret = iwl_mvm_send_cmd_pdu(mvm, iwl_cmd_id(HE_AIR_SNIFFER_CONFIG_CMD,
+                                                   DATA_PATH_GROUP, 0), 0,
+                                   sizeof(he_mon_cmd), &he_mon_cmd);
+        mutex_unlock(&mvm->mutex);
+
+        return ret ?: count;
+}
+
+static ssize_t
+iwl_dbgfs_uapsd_noagg_bssids_read(struct file *file, char __user *user_buf,
+                                  size_t count, loff_t *ppos)
+{
+        struct iwl_mvm *mvm = file->private_data;
+        u8 buf[IWL_MVM_UAPSD_NOAGG_BSSIDS_NUM * ETH_ALEN * 3 + 1];
+        unsigned int pos = 0;
+        size_t bufsz = sizeof(buf);
+        int i;
+
+        mutex_lock(&mvm->mutex);
+
+        for (i = 0; i < IWL_MVM_UAPSD_NOAGG_LIST_LEN; i++)
+                pos += scnprintf(buf + pos, bufsz - pos, "%pM\n",
+                                 mvm->uapsd_noagg_bssids[i].addr);
+
+        mutex_unlock(&mvm->mutex);
+
+        return simple_read_from_buffer(user_buf, count, ppos, buf, pos);
+}
+
 MVM_DEBUGFS_READ_WRITE_FILE_OPS(prph_reg, 64);
 
 /* Device wide debugfs entries */
@@ -1762,6 +1806,8 @@ MVM_DEBUGFS_WRITE_FILE_OPS(indirection_tbl,
                            (IWL_RSS_INDIRECTION_TABLE_SIZE * 2));
 MVM_DEBUGFS_WRITE_FILE_OPS(inject_packet, 512);
 
+MVM_DEBUGFS_READ_FILE_OPS(uapsd_noagg_bssids);
+
 #ifdef CONFIG_IWLWIFI_BCAST_FILTERING
 MVM_DEBUGFS_READ_WRITE_FILE_OPS(bcast_filters, 256);
 MVM_DEBUGFS_READ_WRITE_FILE_OPS(bcast_filters_macs, 256);
@@ -1774,6 +1820,8 @@ MVM_DEBUGFS_READ_WRITE_FILE_OPS(d3_sram, 8);
 MVM_DEBUGFS_READ_FILE_OPS(sar_geo_profile);
 #endif
 
+MVM_DEBUGFS_WRITE_FILE_OPS(he_sniffer_params, 32);
+
 static ssize_t iwl_dbgfs_mem_read(struct file *file, char __user *user_buf,
                                   size_t count, loff_t *ppos)
 {
@@ -1962,6 +2010,7 @@ int iwl_mvm_dbgfs_register(struct iwl_mvm *mvm, struct dentry *dbgfs_dir)
 #ifdef CONFIG_ACPI
         MVM_DEBUGFS_ADD_FILE(sar_geo_profile, dbgfs_dir, 0400);
 #endif
+        MVM_DEBUGFS_ADD_FILE(he_sniffer_params, mvm->debugfs_dir, 0200);
 
         if (!debugfs_create_bool("enable_scan_iteration_notif",
                                  0600,
@@ -1972,6 +2021,8 @@ int iwl_mvm_dbgfs_register(struct iwl_mvm *mvm, struct dentry *dbgfs_dir)
                                  mvm->debugfs_dir, &mvm->drop_bcn_ap_mode))
                 goto err;
 
+        MVM_DEBUGFS_ADD_FILE(uapsd_noagg_bssids, mvm->debugfs_dir, S_IRUSR);
+
 #ifdef CONFIG_IWLWIFI_BCAST_FILTERING
         if (mvm->fw->ucode_capa.flags & IWL_UCODE_TLV_FLAGS_BCAST_FILTERING) {
                 bcast_dir = debugfs_create_dir("bcast_filtering",