]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
wifi: iwlwifi: pcie: don't WARN on bad firmware input
authorJohannes Berg <johannes.berg@intel.com>
Thu, 10 Jul 2025 18:28:31 +0000 (21:28 +0300)
committerMiri Korenblit <miriam.rachel.korenblit@intel.com>
Fri, 11 Jul 2025 15:28:31 +0000 (18:28 +0300)
Don't WARN, which results in a useless backtrace, but just use
IWL_FW_CHECK() instead.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://patch.msgid.link/20250710212632.4aedc0979beb.I3bd4d4296c7245261651603708456b7c67f55539@changeid
drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/tx.c

index 224f4a68c7a8d8e4f1f90cc06af529ae81ccfd91..b38ec90f8342211dc41116f024526293c219d00f 100644 (file)
@@ -25,6 +25,7 @@
 #include "iwl-op-mode.h"
 #include "internal.h"
 #include "fw/api/tx.h"
+#include "fw/dbg.h"
 #include "pcie/utils.h"
 
 /*************** DMA-QUEUE-GENERAL-FUNCTIONS  *****
@@ -1638,13 +1639,11 @@ void iwl_pcie_hcmd_complete(struct iwl_trans *trans,
        /* If a Tx command is being handled and it isn't in the actual
         * command queue then there a command routing bug has been introduced
         * in the queue management code. */
-       if (WARN(txq_id != trans->conf.cmd_queue,
-                "wrong command queue %d (should be %d), sequence 0x%X readp=%d writep=%d\n",
-                txq_id, trans->conf.cmd_queue, sequence, txq->read_ptr,
-                txq->write_ptr)) {
-               iwl_print_hex_error(trans, pkt, 32);
+       if (IWL_FW_CHECK(trans, txq_id != trans->conf.cmd_queue,
+                        "wrong command queue %d (should be %d), sequence 0x%X readp=%d writep=%d pkt=%*phN\n",
+                        txq_id, trans->conf.cmd_queue, sequence, txq->read_ptr,
+                        txq->write_ptr, 32, pkt))
                return;
-       }
 
        spin_lock_bh(&txq->lock);