Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d1273e1a authored by Jiri Kosina's avatar Jiri Kosina Committed by Greg Kroah-Hartman
Browse files

iwlwifi: Fix softirq/hardirq disabling in iwl_pcie_gen2_enqueue_hcmd() 



commit e7020bb068d8be50a92f48e36b236a1a1ef9282e upstream.

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: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/nycvar.YFH.7.76.2104171112390.18270@cbobk.fhfr.pm


Signed-off-by: default avatarJari Ruusu <jariruusu@protonmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0e2dfdc7

drivers/net/wireless/intel/iwlwifi/pcie/tx-gen2.c

+4 −3
Original line number Diff line number Diff line
@@ -654,6 +654,7 @@ static 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 flags2;



	copy_size = sizeof(struct iwl_cmd_header_wide);

	cmd_size = sizeof(struct iwl_cmd_header_wide);
@@ -722,14 +723,14 @@ static int iwl_pcie_gen2_enqueue_hcmd(struct iwl_trans *trans, 
		goto free_dup_buf;

	}



	spin_lock_bh(&txq->lock);

	spin_lock_irqsave(&txq->lock, flags2);



	idx = iwl_pcie_get_cmd_index(txq, txq->write_ptr);

	tfd = iwl_pcie_get_tfd(trans, txq, txq->write_ptr);

	memset(tfd, 0, sizeof(*tfd));



	if (iwl_queue_space(trans, txq) < ((cmd->flags & CMD_ASYNC) ? 2 : 1)) {

		spin_unlock_bh(&txq->lock);

		spin_unlock_irqrestore(&txq->lock, flags2);



		IWL_ERR(trans, "No space in command queue\n");

		iwl_op_mode_cmd_queue_full(trans->op_mode);
@@ -870,7 +871,7 @@ static int iwl_pcie_gen2_enqueue_hcmd(struct iwl_trans *trans, 
	spin_unlock_irqrestore(&trans_pcie->reg_lock, flags);



out:

	spin_unlock_bh(&txq->lock);

	spin_unlock_irqrestore(&txq->lock, flags2);

free_dup_buf:

	if (idx < 0)

		kfree(dup_buf);