Commit 542c4095 authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'wireless-drivers-2021-04-21' of... 

Merge tag 'wireless-drivers-2021-04-21' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers



Kalle Valo says:

====================
wireless-drivers fixes for v5.12

As there was -rc8 release, one more important fix for v5.12.

iwlwifi

* fix spinlock warning in gen2 devices
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents d83b8aa5 e7020bb0

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

+4 −3
Original line number Diff line number Diff line
@@ -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);