| Message ID | nycvar.YFH.7.76.2104171112390.18270@cbobk.fhfr.pm (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | e7020bb068d8be50a92f48e36b236a1a1ef9282e |
| Delegated to: | Kalle Valo |
| Headers | show |
| Series | [v2] iwlwifi: Fix softirq/hardirq disabling in iwl_pcie_gen2_enqueue_hcmd() | expand |
Jiri Kosina <jikos@kernel.org> wrote: > From: Jiri Kosina <jkosina@suse.cz> > > Analogically to what we did in 2800aadc18a6 ("iwlwifi: Fix softirq/hardirq > disabling in iwl_pcie_enqueue_hcmd()"), we must apply the same fix to > iwl_pcie_gen2_enqueue_hcmd(), as it's being called from exactly the same > contexts. > > Reported-by: Heiner Kallweit <hkallweit1@gmail.com > Signed-off-by: Jiri Kosina <jkosina@suse.cz> > > diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/tx-gen2.c b/drivers/net/wireless/intel/iwlwifi/pcie/tx-gen2.c > index 4456abb9a074..34bde8c87324 100644 > --- a/drivers/net/wireless/intel/iwlwifi/pcie/tx-gen2.c > +++ b/drivers/net/wireless/intel/iwlwifi/pcie/tx-gen2.c > @@ -40,6 +40,7 @@ int iwl_pcie_gen2_enqueue_hcmd(struct iwl_trans *trans, > const u8 *cmddata[IWL_MAX_CMD_TBS_PER_TFD]; > u16 cmdlen[IWL_MAX_CMD_TBS_PER_TFD]; > struct iwl_tfh_tfd *tfd; > + unsigned long flags; > > copy_size = sizeof(struct iwl_cmd_header_wide); > cmd_size = sizeof(struct iwl_cmd_header_wide); > @@ -108,14 +109,14 @@ int iwl_pcie_gen2_enqueue_hcmd(struct iwl_trans *trans, > goto free_dup_buf; > } > > - spin_lock_bh(&txq->lock); > + spin_lock_irqsave(&txq->lock, flags); > > idx = iwl_txq_get_cmd_index(txq, txq->write_ptr); > tfd = iwl_txq_get_tfd(trans, txq, txq->write_ptr); > memset(tfd, 0, sizeof(*tfd)); > > if (iwl_txq_space(trans, txq) < ((cmd->flags & CMD_ASYNC) ? 2 : 1)) { > - spin_unlock_bh(&txq->lock); > + spin_unlock_irqrestore(&txq->lock, flags); > > IWL_ERR(trans, "No space in command queue\n"); > iwl_op_mode_cmd_queue_full(trans->op_mode); > @@ -250,7 +251,7 @@ int iwl_pcie_gen2_enqueue_hcmd(struct iwl_trans *trans, > spin_unlock(&trans_pcie->reg_lock); > > out: > - spin_unlock_bh(&txq->lock); > + spin_unlock_irqrestore(&txq->lock, flags); > free_dup_buf: > if (idx < 0) > kfree(dup_buf); Patch applied to wireless-drivers.git, thanks. e7020bb068d8 iwlwifi: Fix softirq/hardirq disabling in iwl_pcie_gen2_enqueue_hcmd()
diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/tx-gen2.c b/drivers/net/wireless/intel/iwlwifi/pcie/tx-gen2.c index 4456abb9a074..34bde8c87324 100644 --- a/drivers/net/wireless/intel/iwlwifi/pcie/tx-gen2.c +++ b/drivers/net/wireless/intel/iwlwifi/pcie/tx-gen2.c @@ -40,6 +40,7 @@ int iwl_pcie_gen2_enqueue_hcmd(struct iwl_trans *trans, const u8 *cmddata[IWL_MAX_CMD_TBS_PER_TFD]; u16 cmdlen[IWL_MAX_CMD_TBS_PER_TFD]; struct iwl_tfh_tfd *tfd; + unsigned long flags; copy_size = sizeof(struct iwl_cmd_header_wide); cmd_size = sizeof(struct iwl_cmd_header_wide); @@ -108,14 +109,14 @@ int iwl_pcie_gen2_enqueue_hcmd(struct iwl_trans *trans, goto free_dup_buf; } - spin_lock_bh(&txq->lock); + spin_lock_irqsave(&txq->lock, flags); idx = iwl_txq_get_cmd_index(txq, txq->write_ptr); tfd = iwl_txq_get_tfd(trans, txq, txq->write_ptr); memset(tfd, 0, sizeof(*tfd)); if (iwl_txq_space(trans, txq) < ((cmd->flags & CMD_ASYNC) ? 2 : 1)) { - spin_unlock_bh(&txq->lock); + spin_unlock_irqrestore(&txq->lock, flags); IWL_ERR(trans, "No space in command queue\n"); iwl_op_mode_cmd_queue_full(trans->op_mode); @@ -250,7 +251,7 @@ int iwl_pcie_gen2_enqueue_hcmd(struct iwl_trans *trans, spin_unlock(&trans_pcie->reg_lock); out: - spin_unlock_bh(&txq->lock); + spin_unlock_irqrestore(&txq->lock, flags); free_dup_buf: if (idx < 0) kfree(dup_buf);