iwlwifi: mvm: remove debugfs injection limitations

For testing features where the firmware may send some
notifications it can often be a lot easier to do that
from a test script. Remove most injection limitations
from debugfs to be able to do this.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Link: https://lore.kernel.org/r/iwlwifi.20210117130510.9aff3c6b4607.I03b0ae7df094734451445ffcb7f9f0274969f1c0@changeid
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c b/drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c
index 80f848a9ee1354eaf618dc8dcfeb8cba3f9a1e1a..8fb7911cfd6cb845068a9b4c6eeade1e23ee7927 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c
@@ -1117,24 +1117,22 @@ static ssize_t iwl_dbgfs_inject_packet_write(struct iwl_mvm *mvm,
                                             char *buf, size_t count,
                                             loff_t *ppos)
 {
+       struct iwl_op_mode *opmode = container_of((void *)mvm,
+                                                 struct iwl_op_mode,
+                                                 op_mode_specific);
        struct iwl_rx_cmd_buffer rxb = {
                ._rx_page_order = 0,
                .truesize = 0, /* not used */
                ._offset = 0,
        };
        struct iwl_rx_packet *pkt;
-       struct iwl_rx_mpdu_desc *desc;
        int bin_len = count / 2;
        int ret = -EINVAL;
-       size_t mpdu_cmd_hdr_size = (mvm->trans->trans_cfg->device_family >=
-                                   IWL_DEVICE_FAMILY_AX210) ?
-               sizeof(struct iwl_rx_mpdu_desc) :
-               IWL_RX_DESC_SIZE_V1;
 
        if (!iwl_mvm_firmware_running(mvm))
                return -EIO;
 
-       /* supporting only 9000 descriptor */
+       /* supporting only MQ RX */
        if (!mvm->trans->trans_cfg->mq_rx_supported)
                return -ENOTSUPP;
 
@@ -1148,22 +1146,12 @@ static ssize_t iwl_dbgfs_inject_packet_write(struct iwl_mvm *mvm,
                goto out;
 
        /* avoid invalid memory access */
-       if (bin_len < sizeof(*pkt) + mpdu_cmd_hdr_size)
-               goto out;
-
-       /* check this is RX packet */
-       if (WIDE_ID(pkt->hdr.group_id, pkt->hdr.cmd) !=
-           WIDE_ID(LEGACY_GROUP, REPLY_RX_MPDU_CMD))
-               goto out;
-
-       /* check the length in metadata matches actual received length */
-       desc = (void *)pkt->data;
-       if (le16_to_cpu(desc->mpdu_len) !=
-           (bin_len - mpdu_cmd_hdr_size - sizeof(*pkt)))
+       if (bin_len < sizeof(*pkt) ||
+           bin_len < sizeof(*pkt) + iwl_rx_packet_payload_len(pkt))
                goto out;
 
        local_bh_disable();
-       iwl_mvm_rx_mpdu_mq(mvm, NULL, &rxb, 0);
+       iwl_mvm_rx_mq(opmode, NULL, &rxb);
        local_bh_enable();
        ret = 0;
 

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h b/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
index ed0e8b7517378fa9432680f813faafd860cc10ad..28b118f3d73d3ad105372a60996cd3681eb80a50 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
@@ -1547,6 +1547,9 @@ bool iwl_mvm_bcast_filter_build_cmd(struct iwl_mvm *mvm,
  * FW notifications / CMD responses handlers
  * Convention: iwl_mvm_rx_<NAME OF THE CMD>
  */
+void iwl_mvm_rx_mq(struct iwl_op_mode *op_mode,
+                  struct napi_struct *napi,
+                  struct iwl_rx_cmd_buffer *rxb);
 void iwl_mvm_rx_rx_phy_cmd(struct iwl_mvm *mvm, struct iwl_rx_cmd_buffer *rxb);
 void iwl_mvm_rx_rx_mpdu(struct iwl_mvm *mvm, struct napi_struct *napi,
                        struct iwl_rx_cmd_buffer *rxb);

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/ops.c b/drivers/net/wireless/intel/iwlwifi/mvm/ops.c
index 286ae1757fc3679b8cfd005ebabf709373e90aa0..27527a3440af72279bbebfa5067081328ee4d9e2 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/ops.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/ops.c
@@ -1049,9 +1049,9 @@ static void iwl_mvm_rx(struct iwl_op_mode *op_mode,
                iwl_mvm_rx_common(mvm, rxb, pkt);
 }
 
-static void iwl_mvm_rx_mq(struct iwl_op_mode *op_mode,
-                         struct napi_struct *napi,
-                         struct iwl_rx_cmd_buffer *rxb)
+void iwl_mvm_rx_mq(struct iwl_op_mode *op_mode,
+                  struct napi_struct *napi,
+                  struct iwl_rx_cmd_buffer *rxb)
 {
        struct iwl_rx_packet *pkt = rxb_addr(rxb);
        struct iwl_mvm *mvm = IWL_OP_MODE_GET_MVM(op_mode);